急门诊转入不能发送在患者入院之前的费用 了.

src/main/java/thyyxxk/webserver/dao/his/yibao/TransferInOfExpensesDao.java

@@ -6,7 +6,10 @@ import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
 import thyyxxk.webserver.entity.datamodify.MzChargeDetail;
 import thyyxxk.webserver.entity.datamodify.ZyDetailCharge;
 import thyyxxk.webserver.entity.yibao.ZyActpatient;
+import thyyxxk.webserver.entity.yibao.patient.Patient;
 
+import javax.xml.crypto.Data;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -191,6 +194,11 @@ public interface TransferInOfExpensesDao {
     void insertInfoZyDetailCharge(@Param("info") ZyActpatient info,
                                   @Param("list") List<MzChargeDetail> zyFees);
 
+    @Select("select admiss_date " +
+            "from zy_actpatient where inpatient_no = #{patNo}")
+    Date getPatientHospitalStay(String patNo);
+
+
     /**
      * 查询出这个患者的最大流水号，在新增费用的时候要加一
      *

src/main/java/thyyxxk/webserver/service/yibao/TransferInOfExpensesService.java

@@ -3,6 +3,7 @@ package thyyxxk.webserver.service.yibao;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -16,11 +17,14 @@ import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
 import thyyxxk.webserver.entity.datamodify.MzChargeDetail;
 import thyyxxk.webserver.entity.datamodify.ZyDetailCharge;
 import thyyxxk.webserver.entity.yibao.ZyActpatient;
+import thyyxxk.webserver.entity.yibao.patient.Patient;
 import thyyxxk.webserver.service.PublicServer;
+import thyyxxk.webserver.utils.DateUtil;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.TokenUtil;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -134,6 +138,13 @@ public class TransferInOfExpensesService {
         List<MzChargeDetail> list = param.getList();
         //查询流水号
         Integer maxDetailSn = dao.getMaxDetailSn(param.getInpatientNo(), param.getAdmissTimes());
+        Date admissDate = dao.getPatientHospitalStay(param.getInpatientNo());
+        if (admissDate == null) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有找到患者信息");
+        }
+        if (DateUtil.shiJianDaXiao(param.getChargeDate(), admissDate, "<")) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "费用发生时间不能小于入院时间.");
+        }
         // 获取 全部的费用
         BigDecimal sum = new BigDecimal(0);
         // 流水号取出这个患者流水值的最大值 在加 1
@@ -149,6 +160,8 @@ public class TransferInOfExpensesService {
             mzChargeDetail.setDetailSn(maxDetailSn += 1);
             sum = sum.add(pojo.getChargeAmount().multiply(pojo.getAmount()));
         }
+
+
         dao.insertInfoZyDetailCharge(param, list);
         log.info("急门诊费用插入 --> 操作人：{} ， 数据：{}", param.getStaffId(), JSON.toJSONStringWithDateFormat(param, GetDateFormat.DATE_TIME));
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "操作成功。");

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/JianYanJianChaShenQingServer.java

@@ -352,7 +352,6 @@ public class JianYanJianChaShenQingServer {
     }
 
     public ResultVo<String> baoCunJianYanJianCha(TianJiaJianChaJianYan param) {
-        log.info("param:{}", JSON.toJSONString(param));
         if (ListUtil.isBlank(param.getList())) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请选择需要保存的数据。");
         }
@@ -424,8 +423,6 @@ public class JianYanJianChaShenQingServer {
                 publicServer.getInfantFlag(param.getInpatientNo()));
 
         publicServer.faSongXiaoXi(huanZheXinXi, content, param.getReqType().equals("2") ? "新增检查" : "新增检验", TokenUtil.getTokenUserId());
-
-        log.info("数据：{}", param.getList());
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
     }