|
@@ -57,7 +57,7 @@ public class THR0127 extends QCCatalogue {
|
|
int hoursPerWeek = 7 * 24 * 60;
|
|
int hoursPerWeek = 7 * 24 * 60;
|
|
String roundRecordThisWeek = "";
|
|
String roundRecordThisWeek = "";
|
|
List<String> roundRecordEveryWeek = new ArrayList<>();
|
|
List<String> roundRecordEveryWeek = new ArrayList<>();
|
|
- //beginDate = DateUtil.dateZeroClear(DateUtil.addDate(beginDate, 1));从入院记录第二天0点开始算
|
|
|
|
|
|
+ beginDate = DateUtil.dateZeroClear(beginDate);//从入院记录当天0点开始算
|
|
int i = 1;
|
|
int i = 1;
|
|
String lastWardDateRange = "";
|
|
String lastWardDateRange = "";
|
|
List<String> lastWardDateRangeList = new ArrayList<>();
|
|
List<String> lastWardDateRangeList = new ArrayList<>();
|
|
@@ -67,7 +67,7 @@ public class THR0127 extends QCCatalogue {
|
|
if (CatalogueUtil.isEmpty(roundRecordThisWeek)) {
|
|
if (CatalogueUtil.isEmpty(roundRecordThisWeek)) {
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
- lastWardDateRange = DateUtil.formatDateTime(beginDate) + " -> " + DateUtil.formatDateTime(DateUtil.addDate(beginDate, 7));
|
|
|
|
|
|
+ lastWardDateRange = DateUtil.formatDateTime(beginDate) + " -> " + DateUtil.formatDateTime(DateUtil.addDate(beginDate, 6));
|
|
lastWardDateRangeList.add(lastWardDateRange);
|
|
lastWardDateRangeList.add(lastWardDateRange);
|
|
roundRecordEveryWeek.add(roundRecordThisWeek);
|
|
roundRecordEveryWeek.add(roundRecordThisWeek);
|
|
beginDate = DateUtil.addDate(beginDate, 7);
|
|
beginDate = DateUtil.addDate(beginDate, 7);
|