Merge remote-tracking branch 'origin/dev-1.2' into dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0144.java

@@ -48,7 +48,9 @@ public class THR0144 extends QCCatalogue {
         //主任或主治查房 标题需要包含“主任”或“主治”，内容需要包含“出院”
         if ((conditionRecord.contains("出院") || treatmentPlan.contains("出院") || conditionRecord.contains("转上级医院"))
                 && StringUtil.isNotBlank(title)
-                && (CatalogueUtil.subTitle(title).contains(Content.attend) || CatalogueUtil.subTitle(title).contains(Content.director))) {
+                && (CatalogueUtil.subTitle(title).contains(Content.attend)
+                || CatalogueUtil.subTitle(title).contains(Content.director)
+                || CatalogueUtil.subTitle(title).contains("主刀"))) {
             status.set("0");
         }
         //普通查房 内容需要包含“上级”和“出院”

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0681.java

@@ -27,7 +27,7 @@ public class THR0681 extends QCCatalogue {
         }
         for (RescueDoc rescueDoc : rescueDocs) {
             Map<String, String> rescueStructureMap = rescueDoc.getStructureMap();
-            if (CatalogueUtil.isEmpty(rescueStructureMap.get("医师签名-时间"))) {
+            if (CatalogueUtil.isEmpty(rescueStructureMap.get("病历日期"))) {
                 status.set("-1");
                 return;
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0683.java

@@ -27,7 +27,7 @@ public class THR0683 extends QCCatalogue {
         }
         for (RescueDoc rescueDoc : rescueDocs) {
             Map<String, String> rescueStructureMap = rescueDoc.getStructureMap();
-            if (CatalogueUtil.isEmpty(rescueStructureMap.get("抢救时间"))) {
+            if (CatalogueUtil.isEmpty(rescueStructureMap.get("抢救开始时间"))) {
                 status.set("-1");
                 return;
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0685.java

@@ -27,7 +27,7 @@ public class THR0685 extends QCCatalogue {
         }
         for (RescueDoc rescueDoc : rescueDocs) {
             Map<String, String> rescueStructureMap = rescueDoc.getStructureMap();
-            if (CatalogueUtil.isEmpty(rescueStructureMap.get("参加抢救的医务人员姓名及专业技术职称"))) {
+            if (CatalogueUtil.isEmpty(rescueStructureMap.get("参加人员及职称"))) {
                 status.set("-1");
                 return;
             }