妇幼解析和质控规则修改

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaifuyao/operationdiscussion/OPE0369.java

@@ -105,8 +105,12 @@ public class OPE0369 extends QCCatalogue {
                         if (StringUtil.isNotBlank(recordDateStr) && date != null
                                 && StringUtil.parseDateTime(recordDateStr).before(date)) {
                             if (!CatalogueUtil.compareTime(StringUtil.parseDateTime(recordDateStr), date, Long.valueOf(24 * 60))
-                                    && (((StringUtil.isNotBlank(makeTitle) && makeTitle.contains("主刀")) || (StringUtil.isNotBlank(writTitle) && writTitle.contains("主刀")))
-                                    || ((StringUtil.isNotBlank(makeTitle) && makeTitle.contains("术前")) || (StringUtil.isNotBlank(writTitle) && writTitle.contains("术前"))))) {
+                                    && (
+                                    ((StringUtil.isNotBlank(makeTitle) && makeTitle.contains("主刀")) || (StringUtil.isNotBlank(writTitle) && writTitle.contains("主刀")))
+                                    ||((StringUtil.isNotBlank(makeTitle) && makeTitle.contains("主任")) || (StringUtil.isNotBlank(writTitle) && writTitle.contains("主任")))
+                                    ||((StringUtil.isNotBlank(makeTitle) && makeTitle.contains("三级")) || (StringUtil.isNotBlank(writTitle) && writTitle.contains("三级")))
+                                    || ((StringUtil.isNotBlank(makeTitle) && makeTitle.contains("术前"))|| (StringUtil.isNotBlank(writTitle) && writTitle.contains("术前")))
+                            )) {
                                 operateCount++;
                             }
                         }

trans/src/main/java/com/lantone/qc/trans/ninghaifuyao/NingHaiFuYaoOperationDocTrans.java

@@ -133,8 +133,8 @@ public class NingHaiFuYaoOperationDocTrans extends ModelDocTrans {
     private List<String> operationDiscussion_keyContrasts = Lists.newArrayList(
             "病历标题=标题",
             "手术前诊断=术前诊断",
-            "手术中诊断=术中诊断",
-            "手术后诊断=术后诊断",
+            "手术中诊断=术中后诊断",
+            "手术后诊断=术中后诊断",
             "病情记录=病程内容"
     );
 
@@ -215,7 +215,10 @@ public class NingHaiFuYaoOperationDocTrans extends ModelDocTrans {
             "患者手术后情况=患者术后情况",
             "麻醉人员=麻醉医师",
             "麻醉方法=麻醉方式",
-            "时间=记录时间"
+            "时间=记录时间",
+            "手术前诊断=术前诊断",
+            "手术中诊断=术中后诊断",
+            "手术后诊断=术中后诊断"
     );
 
 
@@ -336,7 +339,8 @@ public class NingHaiFuYaoOperationDocTrans extends ModelDocTrans {
             "主刀医师签名=主刀医生签名",
             "签字时间=记录时间",
             "手术前诊断=术前诊断",
-            "手术中诊断=术中诊断"
+            "手术中诊断=术中后诊断",
+            "手术后诊断=术中后诊断"
     );
 
     /**********************************************手术知情同意书****************************************************/

trans/src/main/java/com/lantone/qc/trans/ninghaifuyao/util/NingHaiFuYaoBeHospitalizedHtmlAnalysis.java

@@ -49,7 +49,7 @@ public class NingHaiFuYaoBeHospitalizedHtmlAnalysis implements NingHaiFuYaoHtmlA
 
     //宁海第一人民医院
     private void analysisBeHospitalized(Document doc, Map<String, String> map) {
-        List<String> titles = Lists.newArrayList("姓 名","姓名","身份证号码","性别", "性 别","生于","父母姓名","联系电话","住址", "住 址","年 龄","年龄","电话号码",
+        List<String> titles = Lists.newArrayList("姓 名","姓名","现 住 址","身份证号码","性别", "性 别","生于","父母姓名","联系电话","住址", "住 址","年 龄","年龄","电话号码",
                 "出生地", "出 生 地", "职 业", "职业", "入院时间","户籍所在地","户口地址", "入院日期","记录时间","记录日期","民 族", "民族", "病史陈述者","职 业", "联系人及关系",
                 "婚 姻", "婚姻", "联系人电话","联 系 人", "主诉", "主 诉", "现 病 史","现病史", "既 往 史", "既往史", "出生史","个 人 史", "个人史", "婚 育 史",
                 "月 经 史", "月经婚育史", "家 族 史","一般测量","实验室检查", "特殊检查","临床诊断","记录医生", "初步诊断", "补充诊断","医师签名","日 期");