Merge remote-tracking branch 'origin/shaoyf/dev-wsy' into shaoyf/dev-wsy

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

@@ -73,19 +73,17 @@ public class THR02985 extends QCCatalogue {
             String drugName = adviceDoc.get("医嘱项目名称");
             String startDateStr = adviceDoc.get("医嘱开始时间");
             if (StringUtil.isNotBlank(drugName)) {
+                startDate = DateUtil.dateZeroClear(StringUtil.parseDateTime(startDateStr));
+                if (antibioticDateTimes.get(drugName).get(startDate) > 0) {
+                    continue;   //一天内同一抗生素开过多次的抗生素直接过滤
+                }
                 drugName = removeBracket(drugName).replaceAll("[^\u4e00-\u9fa5]", "");
                 String drugStandardWord = similarityUtil.getDrugStandardWord(drugName);
                 if (StringUtil.isNotBlank(drugStandardWord)) {
                     drugName = drugStandardWord;
                 }
-
-                startDate = DateUtil.dateZeroClear(StringUtil.parseDateTime(startDateStr));
-                if (antibioticDateTimes.get(drugName).get(startDate) > 0) {
-                    continue;   //一天内同一抗生素开过多次的抗生素直接过滤
-                }
-
                 if (Arrays.asList(KSS).contains(drugName)) {
-                    doctorAdviceDrugMap.put(startDate, drugName);
+                    doctorAdviceDrugMap.put(startDate, adviceDoc.get("医嘱项目名称"));
                 }
             }
         }