Merge remote-tracking branch 'origin/dev-1.2' into dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0011.java

@@ -61,7 +61,11 @@ public class BEH0011 extends QCCatalogue {
                         }
                         /* 现病史中一般情况之后的疾病名称 */
                         if (presentText.indexOf(presentDiag.getHospitalDiagName()) > lastGeneralIndex) {
-                            presentPastDiags.add(presentDiag.getHospitalDiagName());
+                            if (presentDiag.getHospitalDiagName().contains("心")
+                                    || presentDiag.getHospitalDiagName().contains("糖")
+                                    || presentDiag.getHospitalDiagName().contains("血")) {
+                                presentPastDiags.add(presentDiag.getHospitalDiagName());
+                            }
                         }
                     }
                 }
@@ -88,7 +92,7 @@ public class BEH0011 extends QCCatalogue {
                 String symptom = jsonArray.getString(0);
                 /* 相似度分数 */
                 double likeRate = jsonArray.getDoubleValue(1);
-                if (likeRate > 0.9) {
+                if (likeRate > 0.85) {
                     matchSum++;
                 } else {
                     infoStr = concatInfo(infoStr, presentPastDiag);
@@ -124,7 +128,11 @@ public class BEH0011 extends QCCatalogue {
             if (pastDiag.getNegative() != null) {
                 continue;
             }
-            presentPastDiag.add(pastDiag.getHospitalDiagName());
+            if (pastDiag.getHospitalDiagName().contains("心")
+                    || pastDiag.getHospitalDiagName().contains("糖")
+                    || pastDiag.getHospitalDiagName().contains("血")) {
+                presentPastDiag.add(pastDiag.getHospitalDiagName());
+            }
         }
     }
     /* 原逻辑

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC0095.java

@@ -58,7 +58,11 @@ public class FIRC0095 extends QCCatalogue {
                         }
                         /* 现病史中一般情况之后的疾病名称 */
                         if (presentText.indexOf(presentDiag.getHospitalDiagName()) > lastGeneralIndex) {
-                            presentPastDiags.add(presentDiag.getHospitalDiagName());
+                            if (presentDiag.getHospitalDiagName().contains("心")
+                                    || presentDiag.getHospitalDiagName().contains("糖")
+                                    || presentDiag.getHospitalDiagName().contains("血")) {
+                                presentPastDiags.add(presentDiag.getHospitalDiagName());
+                            }
                         }
                     }
                 }
@@ -85,7 +89,7 @@ public class FIRC0095 extends QCCatalogue {
                 String symptom = jsonArray.getString(0);
                 /* 相似度分数 */
                 double likeRate = jsonArray.getDoubleValue(1);
-                if (likeRate > 0.9) {
+                if (likeRate > 0.85) {
                     matchSum++;
                 } else {
                     infoStr = concatInfo(infoStr, presentPastDiag);
@@ -121,7 +125,11 @@ public class FIRC0095 extends QCCatalogue {
             if (pastDiag.getNegative() != null) {
                 continue;
             }
-            presentPastDiag.add(pastDiag.getHospitalDiagName());
+            if (pastDiag.getHospitalDiagName().contains("心")
+                    || pastDiag.getHospitalDiagName().contains("糖")
+                    || pastDiag.getHospitalDiagName().contains("血")) {
+                presentPastDiag.add(pastDiag.getHospitalDiagName());
+            }
         }
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP02972.java

@@ -26,7 +26,7 @@ public class FIRP02972 extends QCCatalogue {
             String address = firstpageStructureMap.get(Content.current_address);
             if (!CatalogueUtil.isEmpty(address)) {
                 String suffix = (address.length()<=5)?address:(address.substring(address.length()-5));
-                Pattern p = Pattern.compile("[0-9一二三四五六七八九]");
+                Pattern p = Pattern.compile("[0-9一二三四五六七八九０１２３４５６７８９]");
                 Matcher m = p.matcher(suffix);
                 if (!m.find()) {
                     status.set("-1");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0148.java

@@ -35,13 +35,12 @@ public class LEA0148 extends QCCatalogue {
         if (StringUtil.isNotBlank(timeQm) && StringUtil.isNotBlank(timeCy)) {
             Date timeQmDate = StringUtil.parseDateTime(timeQm);
             Date timeCyDate = StringUtil.parseDateTime(timeCy);
-            if (timeQmDate == null && timeCyDate == null) {
-                status.set("0");
-                return;
-            }
             if (!CatalogueUtil.compareTime(timeCyDate, timeQmDate, 24 * 60L)) {
                 status.set("0");
             }
+        }else {
+            status.set("0");
+            return;
         }
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/process/EntityProcessDiag.java

@@ -5,6 +5,7 @@ import com.lantone.qc.kernel.structure.ai.model.EntityEnum;
 import com.lantone.qc.kernel.structure.ai.model.Lemma;
 import com.lantone.qc.kernel.util.DiagEnhancer;
 import com.lantone.qc.pub.model.entity.Diag;
+import com.lantone.qc.pub.model.entity.PD;
 import com.lantone.qc.pub.model.entity.Possible;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,6 +27,7 @@ public class EntityProcessDiag extends EntityProcess {
                 if (lemma.isHaveChildren()) {
                     diag.setNegative(findNegative(lemma));//阴性
                     diag.setPossible(findT(lemma, new Possible(), EntityEnum.POSSIBLE.toString()));//可能的
+                    diag.setPd(findT(lemma, new PD(), EntityEnum.TIME.toString()));//时间
                 }
                 diags.add(diag);
             }

public/src/main/java/com/lantone/qc/pub/model/entity/Diag.java

@@ -16,5 +16,6 @@ public class Diag extends General {
     private String hospitalDiagName;    //医院疾病名称
     private Possible possible;
     private Negative negative;
+    private PD pd;
     private String ICD;
 }