Explorar el Código

义乌妇科术后首程和卢燕入院记录修改

fangqw hace 4 años
padre
commit
ee9ef414fd

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/behospitalized/BEH02902.java

@@ -33,11 +33,11 @@ public class BEH02902 extends QCCatalogue {
             return;
         }
 
-        if (StringUtil.isNotBlank(pacsText) && (pacsText.contains("暂缺") || pacsText.contains("暂无")|| pacsText.contains("院"))) {
+        if (StringUtil.isNotBlank(pacsText) && (pacsText.contains("暂缺") || pacsText.contains("暂无")|| pacsText.contains("院")|| pacsText.contains("科"))) {
             status.set("0");
             return;
         }
-        if (StringUtil.isNotBlank(pacsText1) && (pacsText1.contains("暂缺") || pacsText1.contains("暂无")|| pacsText1.contains(""))) {
+        if (StringUtil.isNotBlank(pacsText1) && (pacsText1.contains("暂缺") || pacsText1.contains("暂无")|| pacsText1.contains(""))) {
             status.set("0");
             return;
         }

+ 2 - 2
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuBeHospitalizedDocTrans.java

@@ -51,7 +51,7 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
             sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             List<String> titles = Lists.newArrayList("婚    姻", "婚姻状况", "住      址", "供 史 者", "性      别", "婚  姻", "民  族", "民    族", "个人史", "妇科检查", "产科检查",
-                    "实验室", "初步诊断", "修正诊断", "医生签名","补充诊断", "医师签名", "日    期", "诊断和诊断修正");
+                    "实验室", "初步诊断", "修正诊断", "医生签名","补充诊断", "医师签名", "日    期", "诊断和诊断修正","身份证号","邮政编码","工作单位","病史提供者","主    诉","既往");
             String text = sourceMap.get("原始文本");
             List<String> sortTitles = CommonAnalysisUtil.sortTitlesNoColon(titles, text);
             CommonAnalysisUtil.cutByTitlesNoColon(text, sortTitles, 0, sourceMap);
@@ -133,7 +133,7 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             //入院记录标题部分解析不出的  婚姻和民族处理
             //注意中间的空格是什么字符
             List<String> titletitles = Lists.newArrayList("住      址",
-                    "婚  姻", "民  族", "民    族", "供 史 者", "性      别", "婚    姻", "婚姻状况");
+                    "婚  姻", "民  族", "民    族", "供 史 者", "性      别", "婚    姻", "婚姻状况","病史提供者");
             for (String str : titletitles) {
                 String str1 = str.replaceAll(" ", "").replaceAll(" ", "");
                 if (sourceMap.containsKey(str)) {

+ 2 - 1
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuOperationDocTrans.java

@@ -154,7 +154,8 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "医师签名=记录医生",
             "签名时间=记录时间",
             "会诊日期=手术日期",
-            "记录医师=记录医生"
+            "记录医师=记录医生",
+            "医师签名日期=记录时间"
     );