七院解析代码修改

dbanaly/src/main/java/com/lantone/qc/dbanaly/facade/yiwu/QiYuanXmlUtil.java

@@ -36,12 +36,12 @@ public class QiYuanXmlUtil {
                     });
                 });
             });
-            findElement(root,"XInputField").forEach(fieldElement ->{
-                String tablePreTxt = getElementPreVal(fieldElement);
-                findElement(fieldElement.element("XElements"),"XInputField").forEach(element -> {
-                    xInputField(map,element,tablePreTxt);
-                });
-            });
+//            findElement(root,"XInputField").forEach(fieldElement ->{
+//                String tablePreTxt = getElementPreVal(fieldElement);
+//                findElement(fieldElement.element("XElements"),"XInputField").forEach(element -> {
+//                    xInputField(map,element,tablePreTxt);
+//                });
+//            });
             Element bodyTextElement = (Element) doc.selectSingleNode("//XTextDocument/BodyText");
             String bodyText = bodyTextElement.getText();
             map.put("原始文本", bodyText);

trans/src/main/java/com/lantone/qc/trans/hangzhoudiqi/QiYuanBeHospitalizedDocTrans.java

@@ -43,7 +43,7 @@ public class QiYuanBeHospitalizedDocTrans extends ModelDocTrans {
                     replaceAll("■", "").replaceAll("\n","").replaceAll("\t","");
             Map<String, String> cutMap = Maps.newHashMap();
             sourceMap.remove("记录时间");
-            List<String> titles = Lists.newArrayList("记录时间","身份证号","病史陈述者","记录日期","主诉","认知活动",
+            List<String> titles = Lists.newArrayList("记录时间","身份证号","病史陈述者","记录日期","主  诉","主诉","认知活动",
                     "情感活动","意志行为","谈话记录","辅助检查","初步诊断","诊断","医师签名","日期","现年龄","发病年龄",
                     "父母近亲婚姻","修正诊断","修复术后","诊断","家系谱图");
             titles = CommonAnalysisUtil.sortTitles(titles, text);
@@ -60,6 +60,7 @@ public class QiYuanBeHospitalizedDocTrans extends ModelDocTrans {
             if (sourceMap.containsKey("患者出生地址")) {
                 sourceMap.put("患者出生地址", sourceMap.get("患者出生地址").split(" ")[0]);
             }
+
             //患者出生地址A+A问题解决
             if (sourceMap.containsKey("体格检查")) {
                 sourceMap.put("体格检查", sourceMap.get("体格检查").split(" ")[0]);
@@ -67,6 +68,9 @@ public class QiYuanBeHospitalizedDocTrans extends ModelDocTrans {
             if (sourceMap.containsKey("婚姻状况")){
                 sourceMap.put("婚姻状况", sourceMap.get("婚姻状况").split(" ")[0]);
             }
+            if (!sourceMap.containsKey("专科检查")) {
+                sourceMap.put("专科检查", sourceMap.get("无"));
+            }
 
             //检查问题
             List<String> titleList = Lists.newArrayList("体格检查(右上角有*的项目根据需要进行检查)"
@@ -199,7 +203,7 @@ public class QiYuanBeHospitalizedDocTrans extends ModelDocTrans {
             "时间=记录时间",
             "诊断和诊断修正=修正诊断",
             "体格检查(右上角有*的项目根据需要进行检查)=体格检查表",
-            "家庭地址=籍贯",
+            "家庭地址=住址",
             "患者现住址=住址",
             "记录时间=记录日期"
     );