Merge branch 'shaoyf/dev-wsy' into shaoyf/dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR02986.java

@@ -58,10 +58,12 @@ public class THR02986 extends QCCatalogue {
                 .map(DoctorAdviceDoc::getStructureMap)
                 .filter(x -> StringUtil.isNotBlank(x.get("药品类型")) && x.get("药品类型").contains("激素"))
                 .filter(x -> StringUtil.isNotBlank(x.get("医嘱状态判别")) && !x.get("医嘱状态判别").contains("已停止"))
-                .filter(x -> StringUtil.isNotBlank(x.get("给药方式")) && x.get("给药方式").contains("静脉滴注"))
-                .filter(x -> StringUtil.isNotBlank(x.get("医嘱频率")) && !x.get("医嘱频率").equals("ONCE"))
+//                .filter(x -> StringUtil.isNotBlank(x.get("给药方式")) && x.get("给药方式").contains("静脉滴注"))
+//                .filter(x -> StringUtil.isNotBlank(x.get("医嘱频率")) && !x.get("医嘱频率").equals("ONCE"))
                 .collect(Collectors.toList());
 
+        docAdvStruct.removeIf(x -> StringUtil.isNotBlank(x.get("给药方式")) && !filterKey.contains(x.get("给药方式")));
+
         //记录同一天内是否开过多次同一激素
         Map<String, Map<Date, Integer>> antibioticDateTimes = Maps.newHashMap();
         //记录同一激素同一天内是否开过多次，用于医嘱中需要处理的激素过滤（一天内同一激素开过多次的激素直接过滤）
@@ -82,9 +84,12 @@ public class THR02986 extends QCCatalogue {
                 if (StringUtil.isNotBlank(drugStandardWord)) {
                     drugName = drugStandardWord;
                 }
-                if (!Arrays.asList(JS).contains(drugName)) {
+                if (drugName.contains("甲泼尼龙") || drugName.contains("泼尼松") || drugName.contains("地塞米松") || drugName.contains("可的松")) {
                     doctorAdviceDrugMap.put(startDate, adviceDoc.get("医嘱项目名称"));
                 }
+//                if (!Arrays.asList(JS).contains(drugName)) {
+//                     doctorAdviceDrugMap.put(startDate, adviceDoc.get("医嘱项目名称"));
+//                }
             }
         }
 
@@ -386,7 +391,10 @@ public class THR02986 extends QCCatalogue {
         sb.append(drugKey).append("(").append(date).append(")").append("_");
     }
 
-    private static final String[] JS = {
+    private static final List<String> filterKey = Lists.newArrayList("静脉滴注", "静脉注射", "口服", "皮下注射", "肌注", "静脉注射(泵)",
+            "膀胱持续冲洗", "静脉滴注(泵)", "膀胱冲洗", "腹腔注射", "鞘内注射", "关节腔注射", "胸腔注射", "皮内");
+
+    /*private static final String[] JS = {
             "瑞格列奈",
             "西格列汀",
             "维格列汀",
@@ -456,5 +464,5 @@ public class THR02986 extends QCCatalogue {
             "替勃龙",
             "鲑降钙素",
             "雷洛昔芬"
-    };
+    };*/
 }