Merge remote-tracking branch 'origin/beilun/dev' into beilun/dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR02985.java

@@ -411,7 +411,11 @@ public class THR02985 extends QCCatalogue {
             "关节腔注射", "宫颈注射", "皮下注射", "皮下注射(儿童)", "皮下注射(免费)", "皮下注射(成人)", "皮内", "皮内注射",
             "结膜下注射", "肌注", "肌肉注射(儿童)", "肌肉注射(公卫专用)", "肌肉注射(成人)", "胸腔注射", "腹腔内注射", "腹腔注射",
             "静滴(儿童)", "静滴(成人)", "静脉注射", "静脉注射(儿童)", "静脉注射(免费)", "静脉注射(成人)", "静脉注射(泵)",
-            "静脉滴注", "静脉滴注(泵)", "鞘内注射");
+            "静脉滴注", "静脉滴注(泵)", "鞘内注射","口服(餐后)", "冲服", "口服(餐前)", "口服", "术晨口服", "口服(睡前)",
+            "口服自理", "小儿静脉输液（限6住院）", "静脉滴注", "静脉输液", "静脉输液(Q12H)", "小儿静脉输液", "静脉输液(不含DEHP输液器)",
+            "静滴免费", "小儿静脉输液(限6门诊)", "关节腔注", "口服(餐时)", "洗耳", "术前30`静滴", "带手术室", "手术室用", "伤口冲洗", "吞服", "饭后服", "饭前服", "内服",
+            "静脉滴注(不含DEHP输液器)", "术前30`静注"
+    );
 
     private static final String[] KSS = {
             "万古霉素",

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

@@ -416,7 +416,11 @@ public class THR02986 extends QCCatalogue {
     }
 
     private static final List<String> filterKey = Lists.newArrayList("静脉滴注", "静脉注射", "口服", "皮下注射", "肌注", "静脉注射(泵)",
-            "膀胱持续冲洗", "静脉滴注(泵)", "膀胱冲洗", "腹腔注射", "鞘内注射", "关节腔注射", "胸腔注射", "皮内");
+            "膀胱持续冲洗", "静脉滴注(泵)", "膀胱冲洗", "腹腔注射", "鞘内注射", "关节腔注射", "胸腔注射", "皮内"
+            , "口服(餐后)", "冲服", "口服(餐前)", "术晨口服", "口服(睡前)",
+            "口服自理", "小儿静脉输液（限6住院）", "静脉滴注", "静脉输液", "静脉输液(Q12H)", "小儿静脉输液", "静脉输液(不含DEHP输液器)",
+            "静滴免费", "小儿静脉输液(限6门诊)", "关节腔注", "口服(餐时)", "术前30`静滴", "带手术室", "手术室用", "伤口冲洗", "吞服", "饭后服", "饭前服", "内服",
+            "静脉滴注(不含DEHP输液器)", "术前30`静注");
 
     /*private static final String[] JS = {
             "瑞格列奈",

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR03076.java

@@ -323,6 +323,9 @@ public class THR03076 extends QCCatalogue {
             "关节腔注射", "宫颈注射", "皮下注射", "皮下注射(儿童)", "皮下注射(免费)", "皮下注射(成人)", "皮内", "皮内注射",
             "结膜下注射", "肌注", "肌肉注射(儿童)", "肌肉注射(公卫专用)", "肌肉注射(成人)", "胸腔注射", "腹腔内注射", "腹腔注射",
             "静滴(儿童)", "静滴(成人)", "静脉注射", "静脉注射(儿童)", "静脉注射(免费)", "静脉注射(成人)", "静脉注射(泵)",
-            "静脉滴注", "静脉滴注(泵)", "鞘内注射");
+            "静脉滴注", "静脉滴注(泵)", "鞘内注射","口服(餐后)", "冲服", "口服(餐前)", "口服", "术晨口服", "口服(睡前)",
+            "口服自理", "小儿静脉输液（限6住院）", "静脉滴注", "静脉输液", "静脉输液(Q12H)", "小儿静脉输液", "静脉输液(不含DEHP输液器)",
+            "静滴免费", "小儿静脉输液(限6门诊)", "关节腔注", "口服(餐时)", "洗耳", "术前30`静滴", "带手术室", "手术室用", "伤口冲洗", "吞服", "饭后服", "饭前服", "内服",
+            "静脉滴注(不含DEHP输液器)", "术前30`静注");
 
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR03077.java

@@ -113,12 +113,12 @@ public class THR03077 extends QCCatalogue {
             }
         });
         //把同一天内同一个抗生素开过多次的抗生素删除
-//        antibioticDateTimes.forEach((x, y) -> {
-//            if (y > 0) {
-//                antibioticDate.remove(x);
-//                antibioticValue.remove(x);
-//            }
-//        });
+        //        antibioticDateTimes.forEach((x, y) -> {
+        //            if (y > 0) {
+        //                antibioticDate.remove(x);
+        //                antibioticValue.remove(x);
+        //            }
+        //        });
         //抗生素加用过的集合如果为空，则一个抗生素都没有加用过，直接返回0
         if (antibioticDate.size() == 0) {
             return;
@@ -502,6 +502,9 @@ public class THR03077 extends QCCatalogue {
             "关节腔注射", "宫颈注射", "皮下注射", "皮下注射(儿童)", "皮下注射(免费)", "皮下注射(成人)", "皮内", "皮内注射",
             "结膜下注射", "肌注", "肌肉注射(儿童)", "肌肉注射(公卫专用)", "肌肉注射(成人)", "胸腔注射", "腹腔内注射", "腹腔注射",
             "静滴(儿童)", "静滴(成人)", "静脉注射", "静脉注射(儿童)", "静脉注射(免费)", "静脉注射(成人)", "静脉注射(泵)",
-            "静脉滴注", "静脉滴注(泵)", "鞘内注射");
+            "静脉滴注", "静脉滴注(泵)", "鞘内注射", "口服(餐后)", "冲服", "口服(餐前)", "口服", "术晨口服", "口服(睡前)",
+            "口服自理", "小儿静脉输液（限6住院）", "静脉滴注", "静脉输液", "静脉输液(Q12H)", "小儿静脉输液", "静脉输液(不含DEHP输液器)",
+            "静滴免费", "小儿静脉输液(限6门诊)", "关节腔注", "口服(餐时)", "洗耳", "术前30`静滴", "带手术室", "手术室用", "伤口冲洗", "吞服", "饭后服", "饭前服", "内服",
+            "静脉滴注(不含DEHP输液器)", "术前30`静注");
 
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR03079.java

@@ -425,6 +425,10 @@ public class THR03079 extends QCCatalogue {
     private static final List<String> filterKey = Lists.newArrayList("口服", "静脉滴注", "静脉注射(泵)", "静脉注射", "皮下注射", "冲服",
             "肌注", "关节腔注射", "饭后口服", "饭前口服", "饭中口服", "嚼服", "局部注射", "术中宫体注射",
             "含服", "饭后冲服", "皮内注射", "饭后嚼服", "饭前嚼服", "泡服", "动脉注射",
-            "IG", "PO", "SC", "IM", "IV", "IP", "JB", "GT", "OWH", "ACI", "XX");
+            "IG", "PO", "SC", "IM", "IV", "IP", "JB", "GT", "OWH", "ACI", "XX"
+            , "口服(餐后)", "冲服", "口服(餐前)", "口服", "术晨口服", "口服(睡前)",
+            "口服自理", "小儿静脉输液（限6住院）", "静脉滴注", "静脉输液", "静脉输液(Q12H)", "小儿静脉输液", "静脉输液(不含DEHP输液器)",
+            "静滴免费", "小儿静脉输液(限6门诊)", "关节腔注", "口服(餐时)", "术前30`静滴", "带手术室", "手术室用", "伤口冲洗", "吞服", "饭后服", "饭前服", "内服",
+            "静脉滴注(不含DEHP输液器)", "术前30`静注");
 
 }