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

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/threelevelward/THR0127.java

@@ -180,14 +180,14 @@ public class THR0127 extends QCCatalogue {
             }
             /* 替换查房标题中主刀/一助的职称 */
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-            if (title.contains("主刀")) {
+            if (title.contains("主刀") || title.contains("术后第")) {
                 String doctorTitle = CatalogueUtil.getDoctorTitle(operationDocs, recordDate, "主刀医师");
-                title = title.replace("主刀", doctorTitle);
+                title = title.replace("主刀", doctorTitle).replace("术后第", doctorTitle);
             } else if (title.contains("一助")) {
                 String doctorTitle = CatalogueUtil.getDoctorTitle(operationDocs, recordDate, "一助");
                 title = title.replace("一助", doctorTitle);
             }
-            if (admisDate.before(recordDate) && !CatalogueUtil.compareTime(admisDate, recordDate, Long.valueOf(duration))) {
+            if (admisDate.before(recordDate) && !CatalogueUtil.compareTime(admisDate, DateUtil.dateZeroClear(recordDate), Long.valueOf(duration))) {
                 recordTitle += title + ",";
                 dateList.add(recordDate);
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/threelevelward/THR0128.java

@@ -187,14 +187,14 @@ public class THR0128 extends QCCatalogue {
             }
             /* 替换查房标题中主刀/一助的职称 */
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-            if (title.contains("主刀")) {
+            if (title.contains("主刀") || title.contains("术后第")) {
                 String doctorTitle = CatalogueUtil.getDoctorTitle(operationDocs, recordDate, "主刀医师");
-                title = title.replace("主刀", doctorTitle);
+                title = title.replace("主刀", doctorTitle).replace("术后第", doctorTitle);
             } else if (title.contains("一助")) {
                 String doctorTitle = CatalogueUtil.getDoctorTitle(operationDocs, recordDate, "一助");
                 title = title.replace("一助", doctorTitle);
             }
-            if (admisDate.before(recordDate) && !CatalogueUtil.compareTime(admisDate, recordDate, (long) duration)) {
+            if (admisDate.before(recordDate) && !CatalogueUtil.compareTime(admisDate, DateUtil.dateZeroClear(recordDate), (long) duration)) {
                 recordTitle += title + ",";
                 dateList.add(recordDate);
             }

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

@@ -91,14 +91,14 @@ public class THR0144 extends QCCatalogue {
             //普通查房 内容需要包含“上级”和“出院”
             if (StringUtil.isBlank(title)
                     || (title.contains("日常查房记录") || title.contains("普通查房记录") || title.contains("日常病程记录"))
-                    && conditionRecord.contains("上级")
+                    && (title.contains("上级") || conditionRecord.contains("上级"))
                     && (conditionRecord.contains("出院") || treatmentPlan.contains("出院"))) {
                 status.set("0");
                 return;
             }
             // 添加硬规则，最后一个记录包含“医院”或 “离院”就不报错
             if (lastFlag == true) {
-                if (conditionRecord.contains("医院") || conditionRecord.contains("离院")) {
+                if (conditionRecord.contains("医院") || conditionRecord.contains("离院") || conditionRecord.contains("出院")) {
                     status.set("0");
                     return;
                 }

trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunThreeLevelWardDocTrans.java

@@ -140,9 +140,9 @@ public class BeiLunThreeLevelWardDocTrans extends ModelDocTrans {
         //标题有代字
         DirectorDoctorWardDoc directorDoctorWardDoc = null;
         if (StringUtil.isNotBlank(title)) {
-            if (title.contains("主刀")) {
+            if (title.contains("主刀") || title.contains("术后第")) {
                 String doctorTitle = getDoctorTitle(operationDocs, recordDate, "主刀医师");
-                title = title.replace("主刀", doctorTitle);
+                title = title.replace("主刀", doctorTitle).replace("术后第", doctorTitle);
             } else if (title.contains("一助")) {
                 String doctorTitle = getDoctorTitle(operationDocs, recordDate, "一助");
                 title = title.replace("一助", doctorTitle);
@@ -156,9 +156,9 @@ public class BeiLunThreeLevelWardDocTrans extends ModelDocTrans {
         }
 
         if (StringUtil.isNotBlank(writTitle)) {
-            if (writTitle.contains("主刀")) {
+            if (writTitle.contains("主刀") || writTitle.contains("术后第")) {
                 String doctorTitle = getDoctorTitle(operationDocs, recordDate, "主刀医师");
-                writTitle = writTitle.replace("主刀", doctorTitle);
+                writTitle = writTitle.replace("主刀", doctorTitle).replace("术后第", doctorTitle);
             } else if (writTitle.contains("一助")) {
                 String doctorTitle = getDoctorTitle(operationDocs, recordDate, "一助");
                 writTitle = writTitle.replace("一助", doctorTitle);
@@ -187,9 +187,9 @@ public class BeiLunThreeLevelWardDocTrans extends ModelDocTrans {
         AttendingDoctorWardDoc attendingDoctorWardDoc = null;
         //标题有代字
         if (StringUtil.isNotBlank(title)) {
-            if (title.contains("主刀")) {
+            if (title.contains("主刀") || title.contains("术后第")) {
                 String doctorTitle = getDoctorTitle(operationDocs, recordDate, "主刀医师");
-                title = title.replace("主刀", doctorTitle);
+                title = title.replace("主刀", doctorTitle).replace("术后第", doctorTitle);
             } else if (title.contains("一助")) {
                 String doctorTitle = getDoctorTitle(operationDocs, recordDate, "一助");
                 title = title.replace("一助", doctorTitle);
@@ -204,9 +204,9 @@ public class BeiLunThreeLevelWardDocTrans extends ModelDocTrans {
 
         //文书标题和模板标题不一致
         if (StringUtil.isNotBlank(writTitle)) {
-            if (writTitle.contains("主刀")) {
+            if (writTitle.contains("主刀") || writTitle.contains("术后第")) {
                 String doctorTitle = getDoctorTitle(operationDocs, recordDate, "主刀医师");
-                writTitle = writTitle.replace("主刀", doctorTitle);
+                writTitle = writTitle.replace("主刀", doctorTitle).replace("术后第", doctorTitle);
             } else if (writTitle.contains("一助")) {
                 String doctorTitle = getDoctorTitle(operationDocs, recordDate, "一助");
                 writTitle = writTitle.replace("一助", doctorTitle);