Bladeren bron

extData传数据统一

wangsy 4 jaren geleden
bovenliggende
commit
1fa4dc8705

+ 7 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR02986.java

@@ -184,6 +184,7 @@ public class THR02986 extends QCCatalogue {
             /**********************************************先文本匹配************************************************/
             String missDrug = "";
             for (Map.Entry<String, Date> map : info.entrySet()) {
+                doctorAdviceDate = DateUtil.dateZeroClear(doctorAdviceDate);
                 missDrug = getMissDrug(map.getKey(), map.getValue(), doctorAdviceDate, splitDrugs, 2, missDrug, existDrug);
                 //当前激素药(drugs)在info中已找到,直接跳出当前循环
                 if (StringUtil.isBlank(missDrug)) {
@@ -216,8 +217,12 @@ public class THR02986 extends QCCatalogue {
                 }
             }
             if (StringUtil.isNotBlank(missDrug) && !modelFind && CatalogueUtil.compareTime(doctorAdviceDate, new Date(), 48 * 60L)) {
-                infoAppend(sb, drugs, DateUtil.formatDateTime(doctorAdviceDate));
-                data.put(doctorAdviceDate, splitDrugs.toString().replaceAll("[\\[\\]]", ""));
+                infoAppend(sb, drugs, DateUtil.formatDateTime(doctorAdviceDrug.getKey()));
+                String drugStandardWord = similarityUtil.getDrugStandardWord(drugs);
+                if (StringUtil.isNotBlank(drugStandardWord)) {
+                    drugs = drugStandardWord;
+                }
+                data.put(doctorAdviceDrug.getKey(), drugs);
             }
         }
         if (StringUtil.isNotBlank(sb.toString())) {