Merge branch 'beilun/dev-fqw' into beilun/dev

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

@@ -67,7 +67,7 @@ public class THR0126 extends QCCatalogue {
         /* 首次病程录如果是主治或者主任写的，也算主治查房 */
         FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
         if (firstCourseRecordDoc != null) {
-            String doctorSign = firstCourseRecordDoc.getStructureMap().get("医生签名");
+            String doctorSign = firstCourseRecordDoc.getStructureMap().get("记录医生");
             String firstCourseProfessor = getFirstCourseProfessor(doctorSign);
             if (firstCourseProfessor.contains("主治") || firstCourseProfessor.contains("主任")) {
                 String recordDateStr = firstCourseRecordDoc.getStructureMap().get("记录时间");

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

@@ -43,7 +43,7 @@ public class THR0144 extends QCCatalogue {
         }
         int j = 0; //最后两次查房记录
         Boolean lastFlag = true;
-        for (int i = allDoctorWradDocs.size() - 1; i > 0 && j < 2; i--) {
+        for (int i = allDoctorWradDocs.size() - 1; i >= 0 && j < 2; i--) {
             j++;
             ThreeLevelWardDoc lastWardDoc = allDoctorWradDocs.get(i);
             Map<String, String> structureMap = lastWardDoc.getStructureMap();
@@ -74,7 +74,7 @@ public class THR0144 extends QCCatalogue {
             }
             // 添加硬规则，最后一个记录包含“医院”或 “离院”就不报错
             if (lastFlag == true) {
-                if (conditionRecord.contains("医院") || conditionRecord.contains("离院")) {
+                if (conditionRecord.contains("医院") || conditionRecord.contains("离院") || conditionRecord.contains("出院")) {
                     status.set("0");
                     return;
                 }