义乌规则修改bug

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/behospitalized/BEH0075.java

@@ -28,6 +28,10 @@ public class BEH0075 extends QCCatalogue {
             if (ListUtil.isEmpty(families)) {
                 return;
             }
+            String familyText = familyLabel.getText();
+            if (StringUtil.isNotBlank(familyText) && familyText.contains("类似疾病")) {
+                return;
+            }
             boolean findSimilarDiag = false;
             for (Family family : families) {
                 if (family.getSimilarDiag() != null && StringUtil.isNotBlank(family.getSimilarDiag().getName())) {
@@ -35,7 +39,7 @@ public class BEH0075 extends QCCatalogue {
                     break;
                 }
             }
-            if (!findSimilarDiag){
+            if (!findSimilarDiag) {
                 status.set("-1");
             }
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR02967.java

@@ -38,7 +38,7 @@ public class THR02967 extends QCCatalogue {
                     "宫缩", "宫口", "输卵管", "卵巢", "输卵管", "阴唇", "阴蒂", "阴道前庭", "前庭大腺", "处女膜");
         } else if (gender.contains("女")) {
             /* 女性不合理词 */
-            noMatchWords = Lists.newArrayList("睾丸", "阴茎", "精索", "包皮", "附睾", "输精管",
+            noMatchWords = Lists.newArrayList("睾丸", "阴茎", "精索", "包皮", "输精管",
                     "射精管", "尿道海绵体", "冠状沟", "精阜", "精囊腺");
         }
 

trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuOperationDocTrans.java

@@ -105,7 +105,7 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             List<String> titles = Lists.newArrayList("手术开始时间", "术中诊断", "麻醉方式", "手术方式",
                     "手术简要经过（包括术中所见）", "术后诊疗计划（处理措施）", "术后注意观察事项", "医师签名",
-                    "签名时间", "患者或代理人签名", "签名时间","术中见","术后诊断","术后谈话");
+                    "签名时间", "患者或代理人签名", "签名时间", "术中见", "术后诊断", "术后谈话");
             String text = sourceMap.get("原始文本");
             List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
             CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
@@ -184,10 +184,10 @@ public class YiWuOperationDocTrans 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.sortTitles(titles, text);
             CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
@@ -225,8 +225,9 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "手术步骤=手术经过及处理",
             "记录者签名=记录医生",
             "记录日期=记录时间",
-            "手术人员=主刀医师",
-            "手术医师=主刀医师",
+//            "手术人员=主刀医师",
+//            "手术医师=主刀医师",
+            "主刀医生=主刀医师",
             "失血量=出血",
             "术中失血量=出血",
             "医师签名时间=记录时间",