1、电子出院医嘱药品未见于文书出院带药中

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA02987.java

@@ -11,10 +11,7 @@ import com.lantone.qc.pub.model.doc.LeaveHospitalDoc;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * @ClassName : LEA02987
@@ -56,9 +53,24 @@ public class LEA02987 extends QCCatalogue {
         }
 
         String infoStr = "";
+        List<String> notContainsDrugs = new ArrayList<>();
         for (String drug:drugs) {
             if (!dischargeOrder.contains(drug)){
-                infoStr = CatalogueUtil.concatInfo(infoStr,drug);
+                notContainsDrugs.add(drug);
+            }
+        }
+
+        //没有包含的药品再次查看商品名或化学名在出院医嘱书写
+        for (String drug : notContainsDrugs) {
+            List<String> splitDrugs = new ArrayList<>();
+            boolean isFind = false;
+            for (String sd : splitDrugs) {
+                if (dischargeOrder.contains(sd)){
+                    isFind = true;
+                }
+            }
+            if (!isFind) {
+                infoStr = CatalogueUtil.concatInfo(infoStr, drug);
             }
         }
         if (StringUtil.isNotBlank(infoStr)){