Prechádzať zdrojové kódy

修改是否医保,住院时间

0027005599 2 rokov pred
rodič
commit
02184e5bc2

+ 4 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/AfterIncidentLog.java

@@ -78,6 +78,10 @@ public class AfterIncidentLog implements Serializable {
     @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "入院日期")
     private java.util.Date inHospDate;
+
+    @Excel(name = "是否医保", width = 15)
+    @ApiModelProperty(value = "是否医保,1=是,0=否")
+    private Integer medicalInsurance;
 	/**诊断编码*/
 	@Excel(name = "诊断编码", width = 15)
     @ApiModelProperty(value = "诊断编码")

+ 1 - 1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/AfterwardsAudit.java

@@ -141,7 +141,7 @@ public class AfterwardsAudit implements Serializable {
 
     @Excel(name = "是否医保", width = 15)
     @ApiModelProperty(value = "是否医保,1=是,0=否")
-    private int medicalInsurance;
+    private Integer medicalInsurance;
 
     @JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")

+ 2 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/ruleengine/RuleEngine.java

@@ -487,6 +487,8 @@ public class RuleEngine {
         afterwardsAudit.setOutpatientNumber(afterIncidentLog.getVisitNo());
         afterwardsAudit.setNoticeType("事后预警");
         afterwardsAudit.setAmount((double) 0);
+        afterwardsAudit.setVisitTime(afterIncidentLog.getInHospDate());
+        afterwardsAudit.setMedicalInsurance(afterIncidentLog.getMedicalInsurance());
         afterwardsAuditService.save(afterwardsAudit);
         if (StringUtils.isNotBlank(afterIncidentLog.getDiagnoses())) {
             List<String> diagonseCodeList = Arrays.asList(afterIncidentLog.getDiagnoses().split(","));

+ 5 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/AfterIncidentLogServiceImpl.java

@@ -36,6 +36,11 @@ public class AfterIncidentLogServiceImpl extends ServiceImpl<AfterIncidentLogMap
         afterIncidentLog.setVisitType(Constant.TREAMENT_TYPE_HOSP);
         afterIncidentLog.setInHospDate(masterAdmissionBill.getAdmissionDate());
         afterIncidentLog.setState(Constant.WATING);
+        Integer medicalINsurance = 0;
+        if(!"0".equals(masterAdmissionBill.getPayMethod())){
+            medicalINsurance = 1;
+        }
+        afterIncidentLog.setMedicalInsurance(medicalINsurance);
         this.save(afterIncidentLog);
         return afterIncidentLog;
     }