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

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

@@ -37,10 +37,11 @@ public class AuditMidDetailListResponse implements Serializable {
 //    @ApiModelProperty(value = "违反规则代码")
 //    private String violationRuleCode;
 
-    @ApiModelProperty(value = "违反规则代码")
+
+    @ApiModelProperty(value = "医保规则编码")
     private String medicalInsRuleInfoCode;
 
-    @ApiModelProperty(value = "违反规则名称")
+    @ApiModelProperty(value = "医保规则名称")
     private String medicalInsRuleInfoName;
 
     @ApiModelProperty(value = "规则管理级别")

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

@@ -28,7 +28,7 @@ public class MidAuditDetailResponse implements Serializable {
     private String violationLevel;
     @ApiModelProperty(value = "违反规则编码")
     private String medicalInsRuleInfoCode;
-    @ApiModelProperty(value = "违反规则名称")
+    @ApiModelProperty(value = "医保规则名称")
     private String medicalInsRuleInfoName;
     @ApiModelProperty(value = "提醒时间")
     private Date createTime;

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

@@ -136,6 +136,7 @@
             ,reminder_level
             ,medical_ins_rule_info_code
             ,medical_ins_rule_info_name
+        ,medical_ins_rule_info_name
             ,medical_insurance_mark
             ,price
             ,medical_number

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

@@ -130,7 +130,6 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
         }
         result.setDescription(detailInfo.getDescription());
         result.setViolationLevel(detailInfo.getReminderLevel());
-        result.setMedicalInsRuleInfoCode(detailInfo.getMedicalInsRuleInfoCode());
         // 构建违规项目/药品明细
         ViolationsProjectMedicinesDetail v = new ViolationsProjectMedicinesDetail();
         v.setMedicalProjectCode(detailInfo.getMedicalInsRuleInfoCode());
@@ -203,6 +202,7 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
         result.setDescription(detailInfo.getDescription());
         result.setViolationLevel(detailInfo.getReminderLevel());
         result.setMedicalInsRuleInfoCode(detailInfo.getMedicalInsRuleInfoCode());
+        result.setMedicalInsRuleInfoName(detailInfo.getMedicalInsRuleInfoName());
         List<PrescriptionDetail> prescriptionDetails = advanceWarningAuditService.listPrescriptionsByCase(detailInfo.getOutpatientNumber(), detailInfo.getTreatmentType());
         if (oConvertUtils.isNotEmpty(prescriptionDetails)) {
             result.setPrescriptionDetail(prescriptionDetails);