jianghaodi 2 سال پیش
والد
کامیت
1371324e16

+ 1 - 0
.gitignore

@@ -25,3 +25,4 @@ target/
 *.jar
 *.war
 *.ear
+rebel.xml

+ 1 - 1
dbanaly/src/main/resources/application-test.yml

@@ -5,7 +5,7 @@ spring:
     druid:
       lantone:
         driver-class-name: com.mysql.jdbc.Driver
-        url: jdbc:mysql://192.168.2.237:3307/qc_wenfuyi?useUnicode=true&characterEncoding=utf8&useSSL=false
+        url: jdbc:mysql://192.168.2.237:3307/qc_hzfy2?useUnicode=true&characterEncoding=utf8&useSSL=false
         username: root
         password: lantone
         initial-size: 8

+ 1 - 1
dbanaly/src/main/resources/rebel.xml

@@ -9,7 +9,7 @@
 	<id>dbanaly</id>
 
 	<classpath>
-		<dir name="C:/Users/10185/Desktop/work/后端/aiPlat/qc/dbanaly/target/classes">
+		<dir name="${rebel.projectpath.dbanaly}/target\classes">
 		</dir>
 	</classpath>
 

+ 46 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH02903.java

@@ -8,7 +8,10 @@ import com.lantone.qc.pub.model.label.PacsLabel;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * @ClassName : BEH02903
@@ -52,5 +55,48 @@ public class BEH02903 extends QCCatalogue {
                 }
             }
         }
+
+        //如果算法识别不到
+        ArrayList<Pattern> patterns = new ArrayList<>();
+        Pattern pattern1 = Pattern.compile("[0-9]{4}[-][0-9]{1,2}[-][0-9]{1,2}");
+        Pattern pattern2 = Pattern.compile("[0-9]{4}[/][0-9]{1,2}[/][0-9]{1,2}");
+        Pattern pattern3 = Pattern.compile("[0-9]{4}[0-9]{1,2}[0-9]{1,2}");
+        Pattern pattern4 = Pattern.compile("[0-9]{4}[年][0-9]{1,2}[月][0-9]{1,2}");
+        patterns.add(pattern1);
+        patterns.add(pattern2);
+        patterns.add(pattern3);
+        patterns.add(pattern4);
+        for (Pattern pattern : patterns) {
+            Matcher matcher = pattern.matcher(pacsText);
+            if (matcher.find()) {
+                status.set("0");
+                return;
+            }
+        }
+
+
+
+    }
+
+    public static void main(String[] args) {
+        String pacsText = "20220819";
+        ArrayList<Pattern> patterns = new ArrayList<>();
+        Pattern pattern1 = Pattern.compile("[0-9]{4}[-][0-9]{1,2}[-][0-9]{1,2}");
+        Pattern pattern2 = Pattern.compile("[0-9]{4}[/][0-9]{1,2}[/][0-9]{1,2}");
+        Pattern pattern3 = Pattern.compile("[0-9]{4}[0-9]{1,2}[0-9]{1,2}");
+        Pattern pattern4 = Pattern.compile("[0-9]{4}[年][0-9]{1,2}[月][0-9]{1,2}");
+        //Pattern pattern5 = Pattern.compile("[0-9]{4}年[0-9]+月[0-9]+日");
+        patterns.add(pattern1);
+        patterns.add(pattern2);
+        patterns.add(pattern3);
+        patterns.add(pattern4);
+      //  patterns.add(pattern5);
+        for (Pattern pattern : patterns) {
+            Matcher matcher = pattern.matcher(pacsText);
+            if (matcher.find()) {
+                System.out.println(matcher.group(0));
+                return;
+            }
+        }
     }
 }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/hangzhoufubao/behospitalized/BEH02902.java

@@ -66,9 +66,9 @@ public class BEH02902 extends QCCatalogue {
         }
 
         /* 如果模型没找到时间实体,则直接取辅助检查前20个字,判断有没有院字 */
+        /*直接有院字就行*/
         if (!findPlace) {
-            String prefixText = pacsText.substring(0, Math.min(20, pacsText.length()));
-            if (prefixText.contains("院")) {
+            if (pacsText.contains("院")) {
                 findPlace = true;
             }
         }

+ 1 - 1
kernel/src/main/resources/bootstrap.yml

@@ -18,7 +18,7 @@ spring:
   resources:
     static-locations: classpath:/
   profiles:
-    active: master
+    active: test
 
 qc:
   hospital_id: 1,2,3,4,5,6,7,8,10,11,13,15,20,21,22,23,24,34,35,36

+ 1 - 1
kernel/src/main/resources/rebel.xml

@@ -9,7 +9,7 @@
 	<id>kernel</id>
 
 	<classpath>
-		<dir name="C:/Users/10185/Desktop/work/后端/aiPlat/qc/kernel/target/classes">
+		<dir name="${rebel.projectpath.kernel}/target\classes">
 		</dir>
 	</classpath>
 

+ 1 - 1
nlp/src/main/java/rebel.xml

@@ -9,7 +9,7 @@
 	<id>nlp</id>
 
 	<classpath>
-		<dir name="C:/Users/10185/Desktop/work/后端/aiPlat/qc/nlp/target/classes">
+		<dir name="${rebel.projectpath.nlp}/target\classes">
 		</dir>
 	</classpath>
 

+ 1 - 1
public/src/main/java/rebel.xml

@@ -9,7 +9,7 @@
 	<id>public</id>
 
 	<classpath>
-		<dir name="C:/Users/10185/Desktop/work/后端/aiPlat/qc/public/target/classes">
+		<dir name="${rebel.projectpath.public}/target\classes">
 		</dir>
 	</classpath>
 

+ 1 - 1
security/src/main/java/rebel.xml

@@ -9,7 +9,7 @@
 	<id>security</id>
 
 	<classpath>
-		<dir name="C:/Users/10185/Desktop/work/后端/aiPlat/qc/security/target/classes">
+		<dir name="${rebel.projectpath.security}/target\classes">
 		</dir>
 	</classpath>
 

+ 8 - 5
trans/src/main/java/com/lantone/qc/trans/comsis/CommonAnalysisUtil.java

@@ -257,11 +257,14 @@ public class CommonAnalysisUtil {
     public static List<String> sortTitlesNoColon(List<String> titles, String content) {
         Map<Integer, String> titleIndex = new TreeMap<>();
         int index;
-        for (String title : titles) {
-            index = content.indexOf(title);
-            if (index != -1) {
-                titleIndex.put(index, title);
-                content = content.replace(title, "");
+        if (titles != null) {
+
+            for (String title : titles) {
+                index = content.indexOf(title);
+                if (index != -1) {
+                    titleIndex.put(index, title);
+                    content = content.replace(title, "");
+                }
             }
         }
         titles = Lists.newArrayList(titleIndex.values());

+ 1 - 1
trans/src/main/resources/rebel.xml

@@ -9,7 +9,7 @@
 	<id>trans</id>
 
 	<classpath>
-		<dir name="C:/Users/10185/Desktop/work/后端/aiPlat/qc/trans/target/classes">
+		<dir name="${rebel.projectpath.trans}/target\classes">
 		</dir>
 	</classpath>