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

dbanaly/src/main/java/com/lantone/qc/dbanaly/facade/comsis/XmlDataAnalysisFacade.java

@@ -130,11 +130,11 @@ public class XmlDataAnalysisFacade {
         //根据文书记录id集合，分批次找出文书内容，有的文书记录可能没有对应文书内容，如果文书的xml是加密过的，还需要解密
         List<MedicalRecordContent> medicalRecordContentList = Lists.newArrayList();
         int index = 0;
-        QueryWrapper<MedicalRecordContent> medicalRecordContentQe = new QueryWrapper<>();
-        medicalRecordContentQe.eq("is_deleted", "N");
-        medicalRecordContentQe.eq("hospital_id", hospitalId);
         medicalRecordQe.select("rec_id", "xml_text");
         while (index <= recIds.size() - 1) {
+            QueryWrapper<MedicalRecordContent> medicalRecordContentQe = new QueryWrapper<>();
+            medicalRecordContentQe.eq("is_deleted", "N");
+            medicalRecordContentQe.eq("hospital_id", hospitalId);
             if (index + 1000 > recIds.size() - 1) {
                 medicalRecordContentQe.in("rec_id", recIds.subList(index, recIds.size()));
             } else {

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

@@ -28,9 +28,18 @@ public class BEH0414 extends QCCatalogue {
         String contactAddress_bh = structureMap.get("年龄");
         String contactAddress_first = firstStructMap.get(Content.age);
         if (StringUtil.isNotBlank(contactAddress_bh) && StringUtil.isNotBlank(contactAddress_first)) {
+            contactAddress_bh = removeUnit(contactAddress_bh);
+            contactAddress_first = removeUnit(contactAddress_first);
             if (!contactAddress_first.equals(contactAddress_bh)) {
                 status.set("-1");
             }
         }
     }
+
+    private String removeUnit(String str) {
+        if (str.contains("岁")) {
+            return str.replace("岁", "");
+        }
+        return str;
+    }
 }