瀏覽代碼

7岁以下和70岁以上不需要读卡出院

lighter 2 年之前
父節點
當前提交
6e24f6ed11

+ 5 - 0
src/main/java/thyyxxk/webserver/entity/medicalinsurance/inpatient/ZyPatientInfo.java

@@ -17,6 +17,7 @@ public class ZyPatientInfo {
     private String inpatientNo;
     private Integer admissTimes;
     private Integer ledgerSn;
+    private Integer age;
     private Date ybRegisterDate;
     private String referPhysician;
     private String referPhysicianName;
@@ -64,4 +65,8 @@ public class ZyPatientInfo {
     public Boolean getDbg() {
         return null != isDbg && isDbg;
     }
+
+    public Integer getAge() {
+        return null == age ? 0 : age;
+    }
 }

+ 7 - 3
src/main/java/thyyxxk/webserver/service/medicalinsurance/SiZyService.java

@@ -327,10 +327,14 @@ public class SiZyService {
         if (null == p.getStaffId()) {
             p.setStaffId(TokenUtil.getTokenUserId());
         }
-        ReadCardBizType readCardBizType = ReadCardBizType.get(p.getReadCardBizType());
-        if (readCardBizType != ReadCardBizType.SETTLEMENT) {
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请先读卡再做出院结算。");
+
+        if (p.getAge() >= 7 && p.getAge() <= 70) {
+            ReadCardBizType readCardBizType = ReadCardBizType.get(p.getReadCardBizType());
+            if (readCardBizType != ReadCardBizType.SETTLEMENT) {
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请先读卡再做出院结算。");
+            }
         }
+
         dscginfo.setDiseCodg(setlDises.get(0).getDiagCode());
         dscginfo.setDiseName(setlDises.get(0).getDiagName());
         dscginfo.setDscgWay(DscgWay.ORDER_TO_LEAVE_HOSPITAL.getCode());