Merge remote-tracking branch 'origin/master'

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,17 +29,18 @@ 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){
+            if(ListUtil.isNotEmpty(reports)){
                 String message = "";
                 for(int i=0;i<reports.size();i++){
                     if(i != reports.size()-1){

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,15 +30,16 @@ 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){
+        if(ListUtil.isNotEmpty(tipDiseases)){
             String message = "";
             for(int i=0;i<tipDiseases.size();i++){
                 if(i != tipDiseases.size()-1){