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