宁海县第一医院医疗健康集团北部医院解析更新

kernel/src/main/java/com/lantone/qc/kernel/catalogue/nhdiyibeiyuan/behospitalized/BEH0042.java

@@ -28,7 +28,7 @@ public class BEH0042 extends QCCatalogue {
             return;
         }
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
-        if (StringUtils.isNotEmpty(structureMap.get("出生地"))) {
+        if (StringUtils.isNotEmpty(structureMap.get("籍贯"))) {
             status.set("0");
             return;
         }

trans/src/main/java/com/lantone/qc/trans/nhdiyibeiyuan/NHDiYiBeiYuanBeHospitalizedDocTrans.java

@@ -66,8 +66,8 @@ public class NHDiYiBeiYuanBeHospitalizedDocTrans extends ModelDocTrans {
             "联系地址=住址",
             "入院时间=入院日期",
             "月经婚育史=婚育史",
-            "初步诊断医师签名:=初步诊断医师签名",
-            "初步诊断医师签名:时 间:=初步诊断签名时间",
+            "初步诊断医师签名:=记录医生",
+            "初步诊断医师签名:时 间:=记录时间",
             "补充诊断医师签名:时 间:=补充诊断签名时间",
             "补充诊断医师签名:=补充诊断医师签名"
     );

trans/src/main/java/com/lantone/qc/trans/nhdiyibeiyuan/util/NHDiYiBeiYuanCriticallyIllNoticeHtmlAnalysis.java

@@ -28,8 +28,8 @@ public class NHDiYiBeiYuanCriticallyIllNoticeHtmlAnalysis implements NHDiYiBeiYu
         try {
             List<String> titles = Lists.newArrayList("姓名", "性别", "年龄", "出生日期", "科室", "科别", "病区", "床号", "住院号",
                     "单位或地址", "联系电话", "初步诊断", "临床诊断", "病情摘要", "主要症状", "体格检查", "辅助检查", "告知医师签名",
-                    "告知时间", "患方意见", "患方签名", "手印说明", "与患者关系", "患者（或被授权人）签名与患方关系", "医师签名", "时间", "签字时间");
-            String html = args[0].replace("&nbsp;"," ");
+                    "告知时间", "患方意见", "患方签名", "手印说明", "患者（或被授权人）签名", "与患者关系", "与患方关系", "患者（或被授权人）签名与患方关系", "医师签名", "时间", "时 间", "签字时间");
+            String html = args[0].replace("&nbsp;", " ");
             String recTitle = args[1];
             String recTypeId = args[2];
             Document doc = Jsoup.parse(html);
@@ -37,12 +37,16 @@ public class NHDiYiBeiYuanCriticallyIllNoticeHtmlAnalysis implements NHDiYiBeiYu
             structureMap.forEach((key, value) -> structureMap.put(key, value.replace("\n", "")));
             String htmlContent = NHDiYiBeiYuanHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0).getElementById("main"), true);
             if (StringUtil.isNotBlank(htmlContent)) {
-                if (htmlContent.contains("宁海县第一医院重、危病员通知单（交患方）")) {
-                    htmlContent = htmlContent.substring(0, htmlContent.indexOf("宁海县第一医院重、危病员通知单（交患方）"));
+                if (htmlContent.contains("宁海县第一医院医疗健康集团北部医院重、危病员通知单（交患方）")) {
+                    htmlContent = htmlContent.substring(0, htmlContent.indexOf("宁海县第一医院医疗健康集团北部医院重、危病员通知单（交患方）"));
                 }
                 htmlContent = htmlContent.replaceAll("[   ]", " ").replace("--", "");
                 CommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
             }
+            if (structureMap.containsKey("时间") && structureMap.get("时间").replace(" ", "").contains("时间")) {
+                String dateStr = structureMap.get("时间").replace(" ", "");
+                structureMap.put("医生签名时间", dateStr.substring(0, dateStr.indexOf("时间")));
+            }
             CommonAnalysisUtil.extractDateByTitle(structureMap, "告知时间");
             NHDiYiBeiYuanHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
         } catch (Exception e) {

trans/src/main/java/com/lantone/qc/trans/nhdiyibeiyuan/util/NHDiYiBeiYuanOperationRecordHtmlAnalysis.java

@@ -25,7 +25,7 @@ public class NHDiYiBeiYuanOperationRecordHtmlAnalysis implements NHDiYiBeiYuanHt
     public Map<String, String> analysis(String... args) {
         Map<String, String> map = Maps.newLinkedHashMap();
         try {
-            String html = args[0].replace("&nbsp;"," ");
+            String html = args[0].replace("&nbsp;", " ");
             String recTitle = args[1];
             String recTypeId = args[2];
             NHDiYiBeiYuanHtmlAnalysisUtil.tableStyle1InsertMap(Jsoup.parse(html).selectFirst("body").child(0).getElementById("header"), map);
@@ -105,7 +105,7 @@ public class NHDiYiBeiYuanOperationRecordHtmlAnalysis implements NHDiYiBeiYuanHt
                 "姓名", "性别", "出生日期", "出生年月", "科别", "科室", "病区", "床号", "床位", "住院号", "手术开始时间", "手术结束时间",
                 "手术时间", "手术日期", "术前诊断", "手术指征", "手术人员", "外邀指导专家", "麻醉方式", "麻醉人员", "麻 醉 者", "洗手护士", "本次手术是否属于非计划再次手术", "接生者",
                 "术前胎心", "手术名称", "术后诊断", "手术者及助手名称", "术中取病理标本", "麻醉方法", "手术经过（包括病人体位、切口处理、病灶所见及手术步骤等）",
-                "诊断手术/操作简要经过（包括术中有无并发症及具体描述和处理）", "手术经过", "主刀医师签名",
+                "诊断手术/操作简要经过（包括术中有无并发症及具体描述和处理）", "手术经过", "主刀医师签名", "医师签名",
                 "医生签名", "手术/操作医生", "记录者", "记录时间", "术中输血", "术前宫颈准备日期", "药物名称及用法", "导管或其他", "插入深度",
                 "阴道填塞纱布条", "准备者", "取出日期", "手术方法", "术中特殊情况", "病理检查", "其他", "手术者",
                 "检查子宫位置", "开始", "结束"