义乌规则修改bug

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

@@ -37,7 +37,7 @@ public class BEH0044 extends QCCatalogue {
             return;
         }
         String personalText = personalLabel.getText();
-        if (personalText.contains("详见病历") || personalText.contains("疫区")) {
+        if (personalText.contains("详见病历") || personalText.contains("疫区") || personalText.contains("高危地区")) {
             status.set("0");
             return;
         }

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

@@ -33,6 +33,11 @@ public class BEH0073 extends QCCatalogue {
             status.set("0");
             return;
         }
+        String past = structureMap.get("既往史");
+        if (StringUtil.isNotBlank(past) && (past.contains("肝炎") || past.contains("结核"))) {
+            status.set("0");
+            return;
+        }
         FamilyLabel familyLabel = inputInfo.getBeHospitalizedDoc().getFamilyLabel();
         if (familyLabel == null || StringUtil.isBlank(familyLabel.getText())) {
             status.set("0");

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

@@ -39,7 +39,6 @@ public class THR02900 extends QCCatalogue {
         String allTitle = "";
         //病情记录
         String allPathography = "";
-        String[] split = null;
         //一助或助手
         String firstAssistant = "";
         //手术结束时间
@@ -50,18 +49,9 @@ public class THR02900 extends QCCatalogue {
                 continue;
             }
             Map<String, String> structureMap = operationRecordDoc.getStructureMap();
-            String opeAssName = structureMap.get("手术者及助手名称");
-            if (StringUtil.isNotBlank(opeAssName)) {
-                split = opeAssName.split("、");
-                firstAssistant = structureMap.get("助手");
-                opeEndTime = structureMap.get("手术结束时间");
-            } else {
-                firstAssistant = structureMap.get("一助");
-                //取得手术时间截取结束时间（格式 2020-07-24 10:30-2020-07-24 11:45）
-                opeEndTime = structureMap.get("手术时间");
-                opeEndTime = opeEndTime.substring(17);
-            }
             String chiefSurgeon = structureMap.get("主刀医师");
+            firstAssistant = structureMap.get("助手");
+            opeEndTime = structureMap.get("结束时间");
             Date opeEndDate = CatalogueUtil.parseStringDate(opeEndTime);
             if (opeEndDate == null) {
                 continue;
@@ -69,7 +59,7 @@ public class THR02900 extends QCCatalogue {
             if (!CatalogueUtil.compareTime(
                     StringUtil.parseDateTime(opeEndTime),
                     StringUtil.parseDateTime(DateUtil.nowString()),
-                    Long.valueOf(24 * 60))) {//如果接收未超过6小时，规则不判断
+                    24 * 60L)) {//如果接收未超过6小时，规则不判断
                 return;
             } else {
                 if ((StringUtil.isNotEmpty(chiefSurgeon) || StringUtil.isNotEmpty(firstAssistant)) && ListUtil.isEmpty(allDoctorWradDocs)) {
@@ -102,12 +92,6 @@ public class THR02900 extends QCCatalogue {
                     StringUtil.isNotBlank(firstAssistant) && !allTitle.contains(firstAssistant)) {
                 status.set("-1");
                 return;
-            } else if (StringUtil.isBlank(chiefSurgeon) && StringUtil.isBlank(firstAssistant) && split.length > 1) {
-                for (int i = 0; i < split.length; i++) {
-                    if (allTitle.contains(split[i])) {
-                        return;
-                    }
-                }
             }
             //病情记录对比
             if ((StringUtil.isNotBlank(chiefSurgeon) && allPathography.contains(chiefSurgeon)) ||

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

@@ -235,6 +235,7 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "手术简要经过（包括“术中所见”）=手术经过及处理",
             "第一助手=一助",
             "洗手护士=手术护士",
+            "助手医师=助手",
             "手术经过=手术经过及处理"
     );