Forráskód Böngészése

1.每周缺查房次数修改时间提示bug

hujing 5 éve
szülő
commit
46d1ca9b6e

+ 6 - 4
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0127.java

@@ -60,6 +60,7 @@ public class THR0127 extends QCCatalogue {
             beginDate = DateUtil.dateZeroClear(DateUtil.addDate(beginDate, 1));
             int i = 1;
             String lastWardDateRange = "";
+            List<String> lastWardDateRangeList = new ArrayList<>();
             //每周的病历记录
             while (i >= 1) {
                 roundRecordThisWeek = extractWardRecord(allDoctorWradDocs, beginDate, hoursPerWeek, lastRecordDate);
@@ -67,6 +68,7 @@ public class THR0127 extends QCCatalogue {
                     break;
                 }
                 lastWardDateRange = DateUtil.formatDate(beginDate) + "    ->    " + DateUtil.formatDate(DateUtil.addDate(beginDate, 6));
+                lastWardDateRangeList.add(lastWardDateRange);
                 roundRecordEveryWeek.add(roundRecordThisWeek);
                 beginDate = DateUtil.addDate(beginDate, 7);
                 i++;
@@ -75,13 +77,13 @@ public class THR0127 extends QCCatalogue {
                 status.set("0");
                 return;
             }
-            for (String roundRecord : roundRecordEveryWeek) {
-                int directorNum = CatalogueUtil.appearNumber(roundRecord.split(","), Content.director);
-                int dept_doctorNum = CatalogueUtil.appearNumber(roundRecord.split(","), Content.dept_doctor);
+            for (int j = 0; j < roundRecordEveryWeek.size(); j++) {
+                int directorNum = CatalogueUtil.appearNumber(roundRecordEveryWeek.get(j).split(","), Content.director);
+                int dept_doctorNum = CatalogueUtil.appearNumber(roundRecordEveryWeek.get(j).split(","), Content.dept_doctor);
                 if (directorNum + dept_doctorNum < 2) {
                     //每周无2次主任医师查房记录/科主任查房记录
                     status.set("-1");
-                    info.set(lastWardDateRange);
+                    info.set(lastWardDateRangeList.get(j));
                     return;
                 }
             }

+ 5 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0128.java

@@ -67,6 +67,7 @@ public class THR0128 extends QCCatalogue {
             beginDate = DateUtil.dateZeroClear(DateUtil.addDate(beginDate, 1));
             int i = 1;
             String lastWardDateRange = "";
+            List<String> lastWardDateRangeList = new ArrayList<>();
             //每周的病历记录
             while (i >= 1) {
                 roundRecordThisWeek = extractWardRecord(allDoctorWradDocs, beginDate, hoursPerWeek, lastRecordDate);
@@ -74,6 +75,7 @@ public class THR0128 extends QCCatalogue {
                     break;
                 }
                 lastWardDateRange = DateUtil.formatDate(beginDate) + "    ->    " + DateUtil.formatDate(DateUtil.addDate(beginDate, 6));
+                lastWardDateRangeList.add(lastWardDateRange);
                 roundRecordEveryWeek.add(roundRecordThisWeek);
                 beginDate = DateUtil.addDate(beginDate, 7);
                 i++;
@@ -95,12 +97,12 @@ public class THR0128 extends QCCatalogue {
                     return;
                 }
             }
-            for (String roundRecord : roundRecordEveryWeek) {
-                int indicationsNum = CatalogueUtil.appearNumber(roundRecord.split(","), Content.attend);
+            for (int j = 0; j < roundRecordEveryWeek.size(); j++) {
+                int indicationsNum = CatalogueUtil.appearNumber(roundRecordEveryWeek.get(j).split(","), Content.attend);
                 if (indicationsNum < 3) {
                     //每周无3次主治医师查房记录
                     status.set("-1");
-                    info.set(lastWardDateRange);
+                    info.set(lastWardDateRangeList.get(j));
                     return;
                 }
             }