Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/facade/BillFacade.java

@@ -62,7 +62,7 @@ public class BillFacade {
     public BillNeoVO fillBillNeo(IndicationPushVO indicationPushVO) {
         BillNeoVO billNeoVO = new BillNeoVO();
 
-        List<Item> items = indicationPushVO.getDrug();
+        List<Item> items = indicationPushVO.getDrugOrder();
         for (Item item : items) {
             billNeoVO.getDrugList().add(item.getName());
         }

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

@@ -6,6 +6,7 @@ import com.diagbot.model.entity.Diag;
 import com.diagbot.model.entity.Negative;
 import com.diagbot.model.label.DiagLabel;
 import com.diagbot.util.CoreUtil;
+import com.diagbot.util.ListUtil;
 import org.apache.commons.lang3.StringUtils;
 
 import java.lang.annotation.Native;
@@ -28,30 +29,23 @@ public class DiagRule {
      */
     public static <T> BillMsg compareDiseaseWithBill(List<String> drugLises, List<T> inputLises, String name) {
         List<String> reports = new ArrayList<>();
-        if(inputLises != null && inputLises.size() > 0){
+        if(inputLises != null && ListUtil.isNotEmpty(inputLises)){
             for (T d:inputLises) {
                 Negative val = (Negative)CoreUtil.getFieldValue(d, "Negative");
                 if(val == null){
                     String c = (String) CoreUtil.getFieldValue(d, "standName");
+                    String c_name = (String) CoreUtil.getFieldValue(d, "name");
                     if(StringUtils.isNotBlank(c) && drugLises.contains(c)){
-                        reports.add(c);
+                        reports.add(c_name);
                     }
                 }
             }
-            if(reports.size()>0){
-                String message = "";
-                for(int i=0;i<reports.size();i++){
-                    if(i != reports.size()-1){
-                        message +=i+",";
-                    }else {
-                        message += i;
-                    }
-                }
+            if(ListUtil.isNotEmpty(reports)){
+                String message = CoreUtil.listConvertString(reports);
                 BillMsg commonBillMsg = CoreUtil.getCommonBillMsg(message, name);
                 return commonBillMsg;
             }
         }
-
         return null;
     }
 }

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

@@ -7,6 +7,7 @@ import com.diagbot.model.entity.Diag;
 import com.diagbot.model.entity.Negative;
 import com.diagbot.model.label.DiagLabel;
 import com.diagbot.util.CoreUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 
@@ -29,23 +30,17 @@ public class LisPacsRule {
      */
     public static <T> BillMsg compareLisPacsWithBill(List<String> drugLis, List<T> inputLis, String name) {
         List<String> tipDiseases = new ArrayList<>();
-        if(drugLis.size() > 0 && inputLis.size() >0){
+        if(ListUtil.isNotEmpty(drugLis) && ListUtil.isNotEmpty(inputLis)){
             for (T lis:inputLis) {
-                String val = (String)CoreUtil.getFieldValue(lis, "name");
+                String val = (String)CoreUtil.getFieldValue(lis, "uniqueName");
+                String val_name = (String)CoreUtil.getFieldValue(lis, "name");
                 if(StringUtils.isNotBlank(val) && drugLis.contains(val)){
-                    tipDiseases.add(val);
+                    tipDiseases.add(val_name);
                 }
             }
         }
-        if(tipDiseases.size() > 0){
-            String message = "";
-            for(int i=0;i<tipDiseases.size();i++){
-                if(i != tipDiseases.size()-1){
-                    message +=i+",";
-                }else {
-                    message += i;
-                }
-            }
+        if(ListUtil.isNotEmpty(tipDiseases)){
+            String message = CoreUtil.listConvertString(tipDiseases);
             BillMsg commonBillMsg = CoreUtil.getCommonBillMsg(message, name);
             return commonBillMsg;
         }

src/main/java/com/diagbot/util/CoreUtil.java

@@ -210,6 +210,23 @@ public class CoreUtil {
         }
     }
 
+    /**
+     * list 转 string
+     * @param list
+     * @return
+     */
+    public static  String listConvertString(List<String> list){
+        String message = "";
+        for(int i=0;i<list.size();i++){
+            if(i != list.size()-1){
+                message += list.get(i)+",";
+            }else {
+                message += i;
+            }
+        }
+        return message;
+    }
+
     public static void main(String[] args) {
 
         System.out.println(getCommonBillMsg("男性", "尿常规"));