Browse Source

药品列表更新

zhaops 3 years ago
parent
commit
74a26942f1

+ 8 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03236.java

@@ -4,7 +4,6 @@ package com.lantone.qc.kernel.catalogue.threelevelward;
 import com.google.common.collect.Lists;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.kernel.util.RegexUtil;
-import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.DoctorAdviceDoc;
@@ -12,6 +11,7 @@ import com.lantone.qc.pub.model.doc.FirstCourseRecordDoc;
 import com.lantone.qc.pub.model.doc.LeaveHospitalDoc;
 import com.lantone.qc.pub.model.doc.ThreeLevelWardDoc;
 import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.PropertiesUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -57,7 +57,12 @@ public class THR03236 extends QCCatalogue {
 
 
         String regex1 = "口服|静滴|静推";
-        List<String> chineseMedicine = Content.CHINESEMEDICINE;
+        List<String> chineseMedicine = Lists.newArrayList();
+        PropertiesUtil propertiesUtil = new PropertiesUtil("medicine.properties");
+        String medicineStr = propertiesUtil.getProperty("chinesemedicine");
+        if (StringUtil.isNotBlank(medicineStr)) {
+            chineseMedicine = Arrays.stream(medicineStr.split(",")).collect(Collectors.toList());
+        }
         Boolean isRecord = false;
         List<DoctorAdviceDoc> recordList = Lists.newLinkedList();
         for (DoctorAdviceDoc item : doctorAdviceDocs) {
@@ -156,4 +161,4 @@ public class THR03236 extends QCCatalogue {
         status.set("-1");
         return;
     }
-}
+}

File diff suppressed because it is too large
+ 1 - 0
kernel/src/main/resources/medicine.properties


File diff suppressed because it is too large
+ 0 - 13
public/src/main/java/com/lantone/qc/pub/Content.java