义乌妇保：患者年龄与入院记录不一致

dbanaly/src/main/resources/application-local.yml

@@ -5,9 +5,9 @@ spring:
     druid:
       lantone:
         driver-class-name: com.mysql.jdbc.Driver
-        url: jdbc:mysql://192.168.2.121:3306/qc?useUnicode=true&characterEncoding=utf8&useSSL=false
+        url: jdbc:mysql://172.17.14.227:3306/qc?useUnicode=true&characterEncoding=utf8&useSSL=false
         username: root
-        password: QuGDHNG35r
+        password: lantone
         initial-size: 8
         min-idle: 1
         max-active: 20
@@ -28,7 +28,7 @@ spring:
     database:
       cache: 10 # cache索引
       token: 10 # Token索引
-    host: 192.168.2.121  #Redis服务器地址
+    host: 172.17.14.227  #Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
     lettuce:
@@ -42,16 +42,16 @@ spring:
 xml-is-encryped: true
 
 CRF:
-  url: http://192.168.2.234:3456/api/mr_info_ex/entity_predict
+  url: http://172.17.14.227:3456/api/mr_info_ex/entity_predict
 
 Similarity:
-  url: http://192.168.2.234:3456/api/mr_info_ex/similarity
+  url: http://172.17.14.227:3456/api/mr_info_ex/similarity
 
 NewSimilarity:
-  url: http://192.168.2.234:23232/api/similarity
+  url: http://172.17.14.227:23232/api/similarity
 
 NewBatchSimilarity:
-  url: http://192.168.2.234:23232/api/similarity_batch
+  url: http://172.17.14.227:23232/api/similarity_batch
 
 ChiefPresentSimilarity:
-  url: http://192.168.2.234:3456/api/mr_info_ex/chief_present_similarity
+  url: http://172.17.14.227:3456/api/mr_info_ex/chief_present_similarity

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/firstpagerecord/FIRP0161.java

@@ -49,12 +49,24 @@ public class FIRP0161 extends QCCatalogue {
             if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("天")) {
                 admissAge = admissionAge.substring(0, admissionAge.indexOf("天"));
             }
+            if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("分")) {
+                admissAge = admissionAge.substring(0, admissionAge.indexOf("分"));
+            }
+            if (StringUtil.isNotBlank(admissionAge) && (admissionAge.contains("时") || admissionAge.contains("小时"))) {
+                admissAge = admissionAge.contains("小时") ? admissionAge.substring(0, admissionAge.indexOf("小")) : admissionAge.substring(0, admissionAge.indexOf("时"));
+            }
             if (StringUtil.isNotBlank(firstAdmissionAge) && firstAdmissionAge.contains("岁")) {
                 firstAdmissionAge = firstAdmissionAge.substring(0, firstAdmissionAge.indexOf("岁"));
             }
             if (StringUtil.isNotBlank(firstAdmissionAge) && firstAdmissionAge.contains("天")) {
                 firstAdmissionAge = firstAdmissionAge.substring(0, firstAdmissionAge.indexOf("天"));
             }
+            if (StringUtil.isNotBlank(firstAdmissionAge) && (firstAdmissionAge.contains("小时") || firstAdmissionAge.contains("时"))) {
+                firstAdmissionAge = firstAdmissionAge.contains("小时") ? firstAdmissionAge.substring(0, firstAdmissionAge.indexOf("小")) : firstAdmissionAge.substring(0, firstAdmissionAge.indexOf("时"));
+            }
+            if (StringUtil.isNotBlank(firstAdmissionAge) && firstAdmissionAge.contains("分")) {
+                firstAdmissionAge = firstAdmissionAge.substring(0, firstAdmissionAge.indexOf("分"));
+            }
             // int firstAdmissionAgeNum = removalUnit(firstAdmissionAge);
             // int admissionAgeNum = removalUnit(admissionAge);
             // 只比较年龄前的数值

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/firstpagerecord/FIRP0202.java

@@ -22,7 +22,7 @@ public class FIRP0202 extends QCCatalogue {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String newbornAdmisWeightStr = firstpageStructureMap.get(Content.newbornAdmisWeight);
-            if (CatalogueUtil.isEmpty(newbornAdmisWeightStr) || !CatalogueUtil.numbersOnly(newbornAdmisWeightStr)) {
+            if ("-".equals(newbornAdmisWeightStr) || CatalogueUtil.isEmpty(newbornAdmisWeightStr) || !CatalogueUtil.numbersOnly(newbornAdmisWeightStr)) {
                 return;
             }
             double newbornAdmisWeight = Double.parseDouble(newbornAdmisWeightStr);