结构调整

src/main/java/com/diagbot/dto/BillMsg.java

@@ -10,6 +10,7 @@ import lombok.Data;
 @Data
 public class BillMsg {
 
+    // 提示信息
     private String msg;
 
     public BillMsg() {

src/main/java/com/diagbot/process/BillProcess.java

@@ -90,32 +90,31 @@ public class BillProcess {
 
         List<BillMsg> drugBill = new ArrayList<>();
         for (BillNeoDTO bill : billNeoDTOList) {
-            List<DrugBillNeoDTO> drugBillNeoDTOList = bill.getDrugBillNeoDTOList();
-            for (DrugBillNeoDTO drug : drugBillNeoDTOList) {
-                // 性别
-                BillMsg sexMsg = SexRule.compareSexWithBill(drug.getGender(), wordCrfDTO, bill.getName());
-                CoreUtil.addBeanToList(drugBill, sexMsg);
-
-                // 诊断
-                BillMsg billMsg_disease = DiagRule.compareDiseaseWithBill(drug.getDisease(), diags, bill.getName());
-                CoreUtil.addBeanToList(drugBill, billMsg_disease);
-
-                //化验
-                BillMsg lisMsg = LisPacsRule.compareLisPacsWithBill(drug.getLis(), lis, bill.getName());
-                CoreUtil.addBeanToList(drugBill, lisMsg);
-
-                //辅检
-                BillMsg pacsMsg = LisPacsRule.compareLisPacsWithBill(drug.getPACS(), pacs, bill.getName());
-                CoreUtil.addBeanToList(drugBill, pacsMsg);
-
-                //临床表现
-                BillMsg clinicalMsg = DiagRule.compareDiseaseWithBill(drug.getClinicfindings(), clinicals, bill.getName());
-                CoreUtil.addBeanToList(drugBill, clinicalMsg);
-
-                // 年龄
-                BillMsg ageMsg = AgeRule.compareAgeWithBill(drug.getAgeNeoDTO(), wordCrfDTO, bill.getName());
-                CoreUtil.addBeanToList(drugBill, ageMsg);
-            }
+            DrugBillNeoDTO drug =  bill.getDrugBillNeoDTO();
+            // 性别
+            BillMsg sexMsg = SexRule.compareSexWithBill(drug.getGender(), wordCrfDTO, bill.getName());
+            CoreUtil.addBeanToList(drugBill, sexMsg);
+
+            // 诊断
+            BillMsg billMsg_disease = DiagRule.compareDiseaseWithBill(drug.getDisease(), diags, bill.getName());
+            CoreUtil.addBeanToList(drugBill, billMsg_disease);
+
+            //化验
+            BillMsg lisMsg = LisPacsRule.compareLisPacsWithBill(drug.getLis(), lis, bill.getName());
+            CoreUtil.addBeanToList(drugBill, lisMsg);
+
+            //辅检
+            BillMsg pacsMsg = LisPacsRule.compareLisPacsWithBill(drug.getPACS(), pacs, bill.getName());
+            CoreUtil.addBeanToList(drugBill, pacsMsg);
+
+            //临床表现
+            BillMsg clinicalMsg = DiagRule.compareDiseaseWithBill(drug.getClinicfindings(), clinicals, bill.getName());
+            CoreUtil.addBeanToList(drugBill, clinicalMsg);
+
+            // 年龄
+            BillMsg ageMsg = AgeRule.compareAgeWithBill(drug.getAgeNeoDTO(), wordCrfDTO, bill.getName());
+            CoreUtil.addBeanToList(drugBill, ageMsg);
+
         }
         billDTO.setDrugBill(drugBill);
     }