Browse Source

规则&解析

zhaops 3 years atrás
parent
commit
ed665240d6

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC03230.java

@@ -41,7 +41,7 @@ public class FIRC03230 extends QCCatalogue {
             return;
         }
         String regex1 = "辨证|辨病|论治|中医辨病辨证依据";
-        String regex2 = "(中医辨病辨证依据|(辨[^。,;。,;]{0,5}证[^。,;。,;]{0,5}依据))[。,;:,;:\\d]{0,}[\\u4E00-\\u9FA5A-Za-z]+";
+        String regex2 = "(中医辨病辨证依据|(辨[^。,;。,;]{0,5}证[^。,;。,;]{0,5}依据))[^。。;]{0,}[\\u4E00-\\u9FA5A-Za-z]+";
 
         if ((StringUtil.isNotBlank(text) && RegexUtil.getRegexRes(text, regex1))
                 || (StringUtil.isNotBlank(diagnoseText) && RegexUtil.getRegexRes(diagnoseText, regex2))) {

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC03231.java

@@ -41,7 +41,7 @@ public class FIRC03231 extends QCCatalogue {
             return;
         }
         String regex1 = "中医鉴别诊断|(中医[^。,;。,;]{0,5}鉴别)";
-        String regex2 = "(中医鉴别诊断|(中医[^。,;。,;]{0,5}鉴别))[。,;:,;:\\d]{0,}[\\u4E00-\\u9FA5A-Za-z]+";
+        String regex2 = "(中医鉴别诊断|(中医[^。,;。,;]{0,5}鉴别))[^。。;]{0,}[\\u4E00-\\u9FA5A-Za-z]+";
 
         if ((StringUtil.isNotBlank(text) && RegexUtil.getRegexRes(text, regex1))
                 || (StringUtil.isNotBlank(diagText) && RegexUtil.getRegexRes(diagText, regex2))) {
@@ -53,4 +53,4 @@ public class FIRC03231 extends QCCatalogue {
         }
 
     }
-}
+}

+ 2 - 2
trans/src/main/java/com/lantone/qc/trans/ningbozhenhai/util/FirstCourseRecordHtmlAnalysis.java

@@ -25,8 +25,8 @@ public class FirstCourseRecordHtmlAnalysis implements HtmlAnalysis {
     public Map<String, String> analysis(String... args) {
         Map<String, String> structureMap = Maps.newLinkedHashMap();
         try {
-            List<String> titles = Lists.newArrayList("病例特点", "拟诊讨论", "中医辨病辨证依据", "中医鉴别诊断", "西医鉴别诊断",
-                    "鉴别诊断", "西医诊断依据", "诊断依据", "初步诊断", "病情评估", "诊疗计划", "医生签名");
+            List<String> titles = Lists.newArrayList("病例特点", "拟诊讨论", "中医辨病辨证依据", "鉴别诊断","中医鉴别诊断", "西医鉴别诊断",
+                     "西医诊断依据", "诊断依据", "初步诊断", "病情评估", "诊疗计划", "医生签名");
             String html = args[0];
             String recTitle = args[1];
             Document doc = Jsoup.parse(html);