wangsy пре 4 година
родитељ
комит
58d81cec52

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaifuyao/behospitalized/BEH0378.java

@@ -45,7 +45,7 @@ public class BEH0378 extends QCCatalogue {
                 return;
             }
         }
-        if (maritalLabel != null) {
+        if (maritalLabel != null && maritalLabel.getFamily() != null) {
             familiesMl = maritalLabel.getFamily();
             for (Family family : familiesMl) {
                 if (family.getDead() != null && family.getName() != null) {

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaifuyao/firstcourserecord/FIRC0095.java

@@ -36,7 +36,7 @@ public class FIRC0095 extends QCCatalogue {
     private List<String> filterList = Arrays.asList("心脏病", "低血糖", "急性", ";");
 
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        if (inputInfo.getFirstCourseRecordDoc() == null) {
+        if (inputInfo.getFirstCourseRecordDoc() == null || inputInfo.getBeHospitalizedDoc() == null) {
             status.set("0");
             return;
         }

+ 4 - 0
trans/src/main/java/com/lantone/qc/trans/ninghaifuyao/NingHaiFuYaoBeHospitalizedDocTrans.java

@@ -62,10 +62,14 @@ public class NingHaiFuYaoBeHospitalizedDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
+            "生于=出生日期",
             "出生地=籍贯",
+            "户籍所在地=籍贯",
+            "户口地址=籍贯",
             "联系地址=住址",
             "入院时间=入院日期",
             "月经婚育史=婚育史",
+            "实验室检查=辅助检查",
             "初步诊断医师签名:=初步诊断医师签名",
             "初步诊断医师签名:时 间:=初步诊断签名时间",
             "补充诊断医师签名:时 间:=补充诊断签名时间",

+ 3 - 10
trans/src/main/java/com/lantone/qc/trans/ninghaifuyao/NingHaiFuYaoLeaveHospitalDocTrans.java

@@ -74,19 +74,12 @@ public class NingHaiFuYaoLeaveHospitalDocTrans extends ModelDocTrans {
             "实际住院天数=住院天数",
             "入院情况=入院情况",
             "诊疗经过=诊治经过",
-            "住院经过=诊治经过",
+            "诊治经过(入院情况、治疗经过及重要辅助检查)=诊治经过",
             "入院情况=病史摘要",
             "辅助检查=主要实验室检查及器械检验结果",
-            "出院情况=",
-            "出院医嘱=",
-            "随访计划=",
+            "出院时情况=出院情况",
             "医师签名=记录医生",
-            "时间=记录时间",
-            "其它=其他",
-            "出生年月=出生日期",
-            "床位=床号",
-            "时间=记录时间",
-            "转归情况=治疗结果"
+            "日期=记录时间"
     );
 
 }

+ 4 - 7
trans/src/main/java/com/lantone/qc/trans/ninghaifuyao/util/NingHaiFuYaoBeHospitalizedHtmlAnalysis.java

@@ -49,13 +49,10 @@ public class NingHaiFuYaoBeHospitalizedHtmlAnalysis implements NingHaiFuYaoHtmlA
 
     //宁海第一人民医院
     private void analysisBeHospitalized(Document doc, Map<String, String> map) {
-        NingHaiFuYaoHtmlAnalysisUtil.tableStyle1InsertMap(doc.getElementById("header"), map);
-        map.forEach((key, value) -> map.put(key, value.replace("\n", "")));
-        List<String> titles = Lists.newArrayList("姓 名", "入院时间", "出生日期", "性 别", "性别", "记录时间","年 龄", "出 生 地", "职 业", "职业", "入院时间", "民 族", "民族",
-                "联系地址", "婚 姻", "婚姻", "病史陈述者", "病史可靠度", "家长姓名","住 址","联系电话", "主诉", "主 诉", "现 病 史","现病史", "既 往 史", "个 人 史", "母 孕 史", "出 生 史", "喂 养 史",
-                "既往史", "个人史", "母孕史", "出生史", "喂养史","婚育史","家族史","年龄","姓名","出生地","住址",
-                "末次月经","身份证号","户籍地址","联 系 人","孕/产 次","预 产 期","产前检查","籍贯","",
-                "生长发育史", "预防接种史", "生活习惯史", "婚 育 史", "月经婚育史", "家 族 史", "辅助检查", "记录医生", "初步诊断", "补充诊断");
+        List<String> titles = Lists.newArrayList("姓 名","姓名","身份证号码","性别", "性 别","生于","父母姓名","联系电话","住址", "住 址","年 龄","年龄","电话号码",
+                "出生地", "出 生 地", "职 业", "职业", "入院时间","户籍所在地","户口地址", "入院日期","记录时间","记录日期","民 族", "民族", "病史陈述者","职 业", "联系人及关系",
+                "婚 姻", "婚姻", "联系人电话", "主诉", "主 诉", "现 病 史","现病史", "既 往 史", "既往史", "出生史","个 人 史", "个人史", "婚 育 史",
+                "月 经 史", "月经婚育史", "家 族 史","一般测量","实验室检查", "特殊检查","临床诊断","记录医生", "初步诊断", "补充诊断","医师签名","日 期");
         String htmlContent = NingHaiFuYaoHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0).getElementById("main"), true);
         if (StringUtil.isNotBlank(htmlContent)) {
             htmlContent = htmlContent.replaceAll("[   ]", " ").replace("第 ( ) 页", "");

+ 4 - 4
trans/src/main/java/com/lantone/qc/trans/ninghaifuyao/util/NingHaiFuYaoLeaveHospitalHtmlAnalysis.java

@@ -25,10 +25,10 @@ public class NingHaiFuYaoLeaveHospitalHtmlAnalysis implements NingHaiFuYaoHtmlAn
     public Map<String, String> analysis(String... args) {
         Map<String, String> structureMap = Maps.newLinkedHashMap();
         try {
-            List<String> titles = Lists.newArrayList("姓名", "出生年月", "性别", "年龄", "出生日期", "科室", "床位", "床号", "病区", "住院号 ", "住院号",
-                    "病理号", "B超", "X片号", "CT号", "MRI号", "内镜", "入院诊断", "出院诊断", "入院日期", "出院日期", "地址", "住院天数", "婚姻", "分娩日期",
-                    "分娩方式", "手术指征", "入院情况", "辅助检查","诊治经过", "住院经过", "入院后检查化验结果", "入院后化验检查结果", "诊疗经过", "治疗结果", "转归情况", "出院计划",
-                    "病理检查结果","出院情况","出院时情况", "婴儿情况", "治疗效果", "出院医嘱", "医师签名", "日期", "时 间", "其它", "主治医师", "住院医师");
+            List<String> titles = Lists.newArrayList("性别", "婚姻", "入院日期", "出院日期", "住院天数","入院诊断", "出院诊断","分娩日期",
+                    "分娩方式", "诊治经过(入院情况、治疗经过及重要辅助检查)","手术指征", "入院情况", "辅助检查","诊治经过", "住院经过", "入院后检查化验结果",
+                    "入院后化验检查结果", "诊疗经过", "治疗结果", "转归情况", "出院计划","出院情况","出院时情况", "治疗效果","治疗结果", "出院医嘱",
+                    "特殊资料检查号码","X光拍片","MRI","CT","病理切片","医师签字", "日期","主治医师","住院医师");
             String html = args[0];
             String recTitle = args[1];
             String recTypeId = args[2];