excel 编码、关联编码循环嵌套

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/bo/mid/AuditMidDetailListResponse.java

@@ -24,6 +24,12 @@ public class AuditMidDetailListResponse implements Serializable {
     @ApiModelProperty(value = "项目名称")
     private String projectName;
 
+    @ApiModelProperty(value = "项目编码")
+    private String proejctCode;
+
+    @ApiModelProperty(value = "项目名称")
+    private String proejctName;
+
     @ApiModelProperty(value = "事中工单id")
     private Integer id;
 

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

@@ -221,15 +221,15 @@
     <select id="loadDiagnosticInfo" resultType="org.jeecg.modules.medical.common.bo.DiagnosticInfoResponse">
         SELECT
             ad.id,
-            ad.outpatient_number as outpatientNumber, -- "住院号",
-            h.icd10_code_basy as mainDiagnosisCode, -- "主要诊断编码",
-            h.icd10_name_basy as mainDiagnosisName, -- "主要诊断名称",
-            h.disease_id1 as subDiagnosisCode, -- "副诊断编码",
-            h.disease_name1 as subDiagnosisName, -- "副诊断名称"
+            h.outpatient_number as outpatientNumber, -- "住院号",
+            h.diagnose_code as mainDiagnosisCode, -- "主要诊断编码",
+            h.diagnose_desc as mainDiagnosisName, -- "主要诊断名称",
+            h.med_diagnose_code as subDiagnosisCode, -- "副诊断编码",
+            h.diagnose_desc as subDiagnosisName, -- "副诊断名称"
             "" as subDiagnosis2Code -- 这个等后面确认
         FROM
-            afterwards_audit as ad
-            RIGHT JOIN medical_record_homepage as h ON ad.outpatient_number = h.zyh
+            mid_incident_audit as ad
+                RIGHT JOIN mid_incident_audit_diagnose as h ON ad.id = h.mid_incident_audit_id
         WHERE ad.id = #{id, jdbcType=INTEGER}
     </select>
 

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

@@ -205,7 +205,9 @@
         mid.medical_number,
         mid.mid_incident_audit_id,
         mid.proejct_code as project_code,
-        mid.proejct_name as project_name
+        mid.proejct_name as project_name,
+        mid.proejct_code ,
+        mid.proejct_name
 
         FROM
         mid_incident_audit_detail AS mid
@@ -220,15 +222,15 @@
     <select id="loadDiagnosticInfo" resultType="org.jeecg.modules.medical.common.bo.DiagnosticInfoResponse">
         SELECT
             ad.id,
-            ad.outpatient_number as outpatientNumber, -- "住院号",
-            h.icd10_code_basy as mainDiagnosisCode, -- "主要诊断编码",
-            h.icd10_name_basy as mainDiagnosisName, -- "主要诊断名称",
-            h.disease_id1 as subDiagnosisCode, -- "副诊断编码",
-            h.disease_name1 as subDiagnosisName, -- "副诊断名称"
+            h.outpatient_number as outpatientNumber, -- "住院号",
+            h.diagnose_code as mainDiagnosisCode, -- "主要诊断编码",
+            h.diagnose_desc as mainDiagnosisName, -- "主要诊断名称",
+            h.med_diagnose_code as subDiagnosisCode, -- "副诊断编码",
+            h.diagnose_desc as subDiagnosisName, -- "副诊断名称"
             "" as subDiagnosis2Code -- 这个等后面确认
         FROM
             mid_incident_audit as ad
-                RIGHT JOIN medical_record_homepage as h ON ad.outpatient_number = h.zyh
+                RIGHT JOIN mid_incident_audit_diagnose as h ON ad.id = h.mid_incident_audit_id
         WHERE ad.id = #{id, jdbcType=INTEGER}
     </select>