中医规则

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

@@ -16,10 +16,9 @@ import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -61,9 +60,21 @@ public class THR03234 extends QCCatalogue {
             return;
         }
 
+        List<String> chinesemedicineyinpian = Lists.newArrayList();
+        Properties properties = new Properties();
+        InputStream in = Thread.currentThread().getContextClassLoader()
+                .getResourceAsStream("medicine.properties");
+        try {
+            properties.load(new InputStreamReader(in, "UTF-8"));
+        } catch (Exception e) {
+
+        }
+        String medicineStr = properties.getProperty("chinesemedicineyinpian");
+        if (StringUtil.isNotBlank(medicineStr)) {
+            chinesemedicineyinpian = Arrays.stream(medicineStr.split(",")).collect(Collectors.toList());
+        }
         Boolean isRecord = false;
         List<DoctorAdviceDoc> recordList = Lists.newLinkedList();
-        List<String> chinesemedicineyinpian = Content.CHINESEMEDICINEYINPIAN;
         for (DoctorAdviceDoc item : doctorAdviceDocs) {
             if (null != item.getStructureMap()) {
                 if (RegexUtil.getRegexListRes(item.getStructureMap().get("医嘱项目名称"), chinesemedicineyinpian)) {

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

@@ -16,10 +16,9 @@ import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -61,12 +60,25 @@ public class THR03235 extends QCCatalogue {
             return;
         }
 
-        List<String> chineseMedicineyinpian = Content.CHINESEMEDICINEYINPIAN;
+        List<String> chinesemedicineyinpian = Lists.newArrayList();
+        Properties properties = new Properties();
+        InputStream in = Thread.currentThread().getContextClassLoader()
+                .getResourceAsStream("medicine.properties");
+        try {
+            properties.load(new InputStreamReader(in, "UTF-8"));
+        } catch (Exception e) {
+
+        }
+        String medicineStr = properties.getProperty("chinesemedicineyinpian");
+        if (StringUtil.isNotBlank(medicineStr)) {
+            chinesemedicineyinpian = Arrays.stream(medicineStr.split(",")).collect(Collectors.toList());
+        }
+
         Boolean isRecord = false;
         List<DoctorAdviceDoc> recordList = Lists.newLinkedList();
         for (DoctorAdviceDoc item : doctorAdviceDocs) {
             if (null != item.getStructureMap()) {
-                if (RegexUtil.getRegexListRes(item.getStructureMap().get("医嘱项目名称"), chineseMedicineyinpian)) {
+                if (RegexUtil.getRegexListRes(item.getStructureMap().get("医嘱项目名称"), chinesemedicineyinpian)) {
                     if (!recordList.contains(item)) {
                         recordList.add(item);
                     }

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

@@ -60,8 +60,8 @@ public class THR03236 extends QCCatalogue {
 
 
         String regex1 = "口服|静滴|静推";
-        List<String> chineseMedicine = Content.CHINESEMEDICINE;
-        /*Lists.newArrayList();
+        List<String> chineseMedicine = Lists.newArrayList();//Content.CHINESEMEDICINE;
+
         Properties properties = new Properties();
         InputStream in = Thread.currentThread().getContextClassLoader()
                 .getResourceAsStream("medicine.properties");
@@ -74,7 +74,7 @@ public class THR03236 extends QCCatalogue {
         if (StringUtil.isNotBlank(medicineStr)) {
             chineseMedicine = Arrays.stream(medicineStr.split(",")).collect(Collectors.toList());
         }
-        */
+
 
         Boolean isRecord = false;
         List<DoctorAdviceDoc> recordList = Lists.newLinkedList();