Browse Source

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

lenovodn 1 year ago
parent
commit
572902527a

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

@@ -5,9 +5,9 @@
     <select id="loadPatientInfoById"
             resultType="org.jeecg.modules.medical.common.bo.before.PatientInformationResponse">
         SELECT
-            ad.patient_id AS patientId, -- 患者编码
-            ad.patient_name AS patientName, -- 患者姓名
-            ad.gender AS gender, -- 性别
+            ad.patient_id , -- 患者编码
+            ad.patient_name , -- 患者姓名
+            p.gender AS gender, -- 性别
             p.birthday AS birthday, -- 生日
             "" AS age, -- 年龄
             "" AS medicalInsurance, -- 是否医保(从主表查询)
@@ -23,8 +23,8 @@
     <select id="beforeLoadPatientInfoById"
             resultType="org.jeecg.modules.medical.common.bo.before.PatientInformationResponse">
         SELECT
-            ad.patient_id AS patientId, -- 患者编码
-            ad.patient_name AS patientName, -- 患者姓名
+            ad.patient_id , -- 患者编码
+            ad.patient_name , -- 患者姓名
             p.gender AS gender, -- 性别
             p.birthday AS birthday, -- 生日
             "" AS age, -- 年龄

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

@@ -298,6 +298,8 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
         result.setDescription(detailInfo.getDescription());
         result.setViolationLevel(detailInfo.getReminderLevel());
         result.setMedicalInsRuleInfoCode(detailInfo.getMedicalInsRuleInfoCode());
+        result.setProjectName(detailInfo.getProejctName());
+        result.setProjectCode(detailInfo.getProejctCode());
         // 构建违规项目/药品明细
         ViolationsProjectMedicinesDetail v = new ViolationsProjectMedicinesDetail();
         v.setMedicalProjectCode(detailInfo.getMedicalInsRuleInfoCode());