Merge remote-tracking branch 'origin/master'

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

@@ -12,8 +12,7 @@ import com.diagbot.model.entity.Diag;
 import com.diagbot.model.label.ChiefLabel;
 import com.diagbot.model.label.DiagLabel;
 import com.diagbot.model.label.PresentLabel;
-import com.diagbot.rule.AgeRule;
-import com.diagbot.rule.SexRule;
+import com.diagbot.rule.*;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
@@ -82,20 +81,20 @@ public class BillProcess {
             CoreUtil.addBeanToList(billMsgList, sexMsg);
 
             // 诊断
-            // BillMsg billMsg_disease = DiagRule.compareDiseaseWithBill(bill.getDisease(), diags, bill);
-            // CoreUtil.addBeanToList(billMsgList, billMsg_disease);
+            BillMsg billMsg_disease = DiagRule.compareDiseaseWithBill(bill.getDisease(), diags, bill);
+            CoreUtil.addBeanToList(billMsgList, billMsg_disease);
 
-            // //化验
-            // BillMsg lisMsg = LisRule.compareLisWithBill(bill.getLis(), lis, bill.getName());
-            // CoreUtil.addBeanToList(billMsgList, lisMsg);
-            // //
-            // //辅检
-            // BillMsg pacsMsg = PacsRule.comparePacsWithBill(bill.getPacs(), pacs, bill.getName());
-            // CoreUtil.addBeanToList(billMsgList, pacsMsg);
-            //
-            // //临床表现
-            // BillMsg clinicalMsg = DiagRule.compareDiseaseWithBill(bill.getClinicfindings(), clinicals, bill.getName());
-            // CoreUtil.addBeanToList(billMsgList, clinicalMsg);
+             //化验
+             BillMsg lisMsg = LisRule.compareLisWithBill(bill.getLis(), lis, bill);
+             CoreUtil.addBeanToList(billMsgList, lisMsg);
+
+             //辅检
+            BillMsg pacsMsg = PacsRule.comparePacsWithBill(bill.getPacs(), pacs, bill);
+            CoreUtil.addBeanToList(billMsgList, pacsMsg);
+
+            //临床表现
+            BillMsg clinicalMsg = DiagRule.compareDiseaseWithBill(bill.getClinicfindings(), clinicals, bill);
+            CoreUtil.addBeanToList(billMsgList, clinicalMsg);
 
             // 年龄
             BillMsg ageMsg = AgeRule.compareAgeWithBill(bill.getAgeNeoDTO(), wordCrfDTO, bill);

src/main/java/com/diagbot/rule/DiagRule.java

@@ -1,6 +1,7 @@
 package com.diagbot.rule;
 
 import com.diagbot.dto.BillMsg;
+import com.diagbot.dto.BillNeoMaxDTO;
 import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.model.entity.Negative;
 import com.diagbot.util.CoreUtil;
@@ -28,7 +29,7 @@ public class DiagRule {
      * @param inputLises
      * @return
      */
-    public static <T> BillMsg compareDiseaseWithBill(List<NodeNeoDTO> drugLises, List<T> inputLises, String name) {
+    public static <T> BillMsg compareDiseaseWithBill(List<NodeNeoDTO> drugLises, List<T> inputLises, BillNeoMaxDTO billNeoMaxDTO) {
         Map<String,String> old_stand = new HashMap<>();
         if(ListUtil.isNotEmpty(drugLises) && ListUtil.isNotEmpty(inputLises)){
             List<String> dl = drugLises.stream().map(x -> x.getName()).collect(Collectors.toList());
@@ -45,7 +46,7 @@ public class DiagRule {
             if(old_stand.size() > 0){
                 String message = StringUtils.join(old_stand.keySet(), ",");
                 String standNames = StringUtils.join(old_stand.values().stream().collect(Collectors.toList()),",");
-                BillMsg commonBillMsg = CoreUtil.getCommonBillMsg(message, name,standNames);
+                BillMsg commonBillMsg = CoreUtil.getCommonBillMsg(billNeoMaxDTO.getOrderName(),billNeoMaxDTO.getOrderStandName(),message,standNames);
                 return commonBillMsg;
             }
         }

src/main/java/com/diagbot/rule/LisRule.java

@@ -2,6 +2,7 @@ package com.diagbot.rule;
 
 import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.dto.BillMsg;
+import com.diagbot.dto.BillNeoMaxDTO;
 import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
@@ -26,7 +27,7 @@ public class LisRule {
      * @param inputLis
      * @return
      */
-    public static BillMsg compareLisWithBill(List<NodeNeoDTO> drugLis, List<Lis> inputLis, String name) {
+    public static BillMsg compareLisWithBill(List<NodeNeoDTO> drugLis, List<Lis> inputLis, BillNeoMaxDTO billNeoMaxDTO) {
 
         Map<String,String> old_stand = new HashMap<>();
         if(ListUtil.isNotEmpty(drugLis) && ListUtil.isNotEmpty(inputLis)){
@@ -55,7 +56,7 @@ public class LisRule {
             }
 //            String message = StringUtils.join(old_stand.keySet(), ",");
 //            String standNames = StringUtils.join(old_stand.values().stream().collect(Collectors.toList()),",");
-            BillMsg commonBillMsg = CoreUtil.getCommonBillMsg(message, name,null);
+            BillMsg commonBillMsg = CoreUtil.getCommonBillMsg(billNeoMaxDTO.getOrderName(),billNeoMaxDTO.getOrderStandName(),message,null);
             return commonBillMsg;
         }
         return null;

src/main/java/com/diagbot/rule/PacsRule.java

@@ -1,6 +1,7 @@
 package com.diagbot.rule;
 
 import com.diagbot.dto.BillMsg;
+import com.diagbot.dto.BillNeoMaxDTO;
 import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
@@ -24,7 +25,7 @@ public class PacsRule {
      * @param inputLis
      * @return
      */
-    public static <T> BillMsg comparePacsWithBill(List<NodeNeoDTO> drugLis, List<T> inputLis, String name) {
+    public static <T> BillMsg comparePacsWithBill(List<NodeNeoDTO> drugLis, List<T> inputLis, BillNeoMaxDTO billNeoMaxDTO) {
 
         Map<String,String> old_stand = new HashMap<>();
         if(ListUtil.isNotEmpty(drugLis) && ListUtil.isNotEmpty(inputLis)){
@@ -40,7 +41,7 @@ public class PacsRule {
         if(old_stand.size() > 0){
             String message = StringUtils.join(old_stand.keySet(), ",");
             String standNames = StringUtils.join(old_stand.values().stream().collect(Collectors.toList()),",");
-            BillMsg commonBillMsg = CoreUtil.getCommonBillMsg(message, name,standNames);
+            BillMsg commonBillMsg = CoreUtil.getCommonBillMsg(billNeoMaxDTO.getOrderName(),billNeoMaxDTO.getOrderStandName(),message,standNames);
             return commonBillMsg;
         }
         return null;