Merge remote-tracking branch 'origin/master'

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/SystemEventAttrConstant.java

@@ -216,6 +216,6 @@ public class SystemEventAttrConstant {
     /**
      * his接口性别属性
      */
-    public static final String PATIENT_GENDER_KEY = "patient_age";
+    public static final String PATIENT_GENDER_KEY = "patient_gender";
 }
 

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

@@ -97,6 +97,10 @@ public class AfterIncidentLog implements Serializable {
 	@Excel(name = "诊断编码", width = 15)
     @ApiModelProperty(value = "诊断编码")
     private java.lang.String diagnoses;
+    /**诊断名称*/
+    @Excel(name = "诊断名称", width = 15)
+    @ApiModelProperty(value = "诊断名称")
+    private String diagnosesName;
 	/**状态;WAITING,DEALING,SUCCESS,FAIL*/
 	@Excel(name = "状态;WAITING,DEALING,SUCCESS,FAIL", width = 15)
     @ApiModelProperty(value = "状态;WAITING,DEALING,SUCCESS,FAIL")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/AfterwardsAuditDetailMapper.xml

@@ -10,7 +10,7 @@
             ad.patient_gender AS gender, -- 性别
             ad.patient_birthday AS birthday, -- 生日
             ad.patient_age AS age, -- 年龄
-            ad.medicalInsurance, -- 是否医保(从主表查询）
+            ad.medical_insurance as medicalInsurance, -- 是否医保(从主表查询）
             ad.visit_time AS visitDate, -- 就诊日期
             ad.outpatient_number AS visitSerialNumber, -- 就诊流水号（从主表查询）
             ad.medical_dept_name AS medicalDeptName, -- 科室名称

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/AfterwardsAuditMapper.xml

@@ -244,7 +244,7 @@
             h.diagnose_code as mainDiagnosisCode, -- "主要诊断编码",
             h.diagnose_desc as mainDiagnosisName, -- "主要诊断名称",
             h.med_diagnose_code as subDiagnosisCode, -- "副诊断编码",
-            h.diagnose_desc as subDiagnosisName, -- "副诊断名称"
+            h.med_diagnose_desc as subDiagnosisName, -- "副诊断名称"
             "" as subDiagnosis2Code -- 这个等后面确认
         FROM
             afterwards_audit as ad

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

@@ -1082,6 +1082,7 @@ public class RuleEngine {
         afterwardsAuditService.save(afterwardsAudit);
         if (StringUtils.isNotBlank(afterIncidentLog.getDiagnoses())) {
             List<String> diagonseCodeList = Arrays.asList(afterIncidentLog.getDiagnoses().split(","));
+            List<String> diagnoseNameList = Arrays.asList(afterIncidentLog.getDiagnosesName().split(","));
             List<AfterwardsIncidentAuditDiagnose> afterIncidentAuditDiagnoseList = new ArrayList<>();
             for (int i = 0; i < diagonseCodeList.size(); i++) {
                 String diagonseCode = diagonseCodeList.get(i);
@@ -1092,7 +1093,8 @@ public class RuleEngine {
                 AfterwardsIncidentAuditDiagnose afterIncidentAuditDiagnose = new AfterwardsIncidentAuditDiagnose();
                 afterIncidentAuditDiagnose.setAfterwardsAuditId(afterwardsAudit.getId());
                 afterIncidentAuditDiagnose.setDiagnoseCode(diagonseCode);
-//                afterIncidentAuditDiagnose.setDiagnoseDesc(diagonseName);
+                String name = diagnoseNameList.get(i);
+                afterIncidentAuditDiagnose.setDiagnoseDesc(name);
                 afterIncidentAuditDiagnose.setMedDiagnoseCode(medicalDiagonseCode);
                 afterIncidentAuditDiagnose.setMedDiagnoseDesc(medicalDiagnoseName);
                 afterIncidentAuditDiagnose.setCreateTime(date);