|
@@ -71,7 +71,7 @@ public class THR0128 extends QCCatalogue {
|
|
|
int hoursPerWeek = 7 * 24 * 60;
|
|
|
String roundRecordThisWeek = "";
|
|
|
List<String> roundRecordEveryWeek = new ArrayList<>();
|
|
|
- beginDate = DateUtil.dateZeroClear(beginDate);//从入院记录当天天0点开始算
|
|
|
+ beginDate = DateUtil.dateZeroClear(DateUtil.addDay(beginDate, 1));//从入院记录当天天0点开始算
|
|
|
int i = 1;
|
|
|
String lastWardDateRange = "";
|
|
|
List<String> lastWardDateRangeList = new ArrayList<>();
|
|
@@ -148,10 +148,10 @@ public class THR0128 extends QCCatalogue {
|
|
|
/* 替换查房标题中主刀/一助的职称 */
|
|
|
List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
|
|
|
if (title.contains("主刀")) {
|
|
|
- String doctorTitle = CatalogueUtil.getDoctorTitle(operationDocs, recordDate,"主刀医师");
|
|
|
+ String doctorTitle = CatalogueUtil.getDoctorTitle(operationDocs, recordDate, "主刀医师");
|
|
|
title = title.replace("主刀", doctorTitle);
|
|
|
- } else if (title.contains("一助")){
|
|
|
- String doctorTitle = CatalogueUtil.getDoctorTitle(operationDocs, recordDate,"一助");
|
|
|
+ } else if (title.contains("一助")) {
|
|
|
+ String doctorTitle = CatalogueUtil.getDoctorTitle(operationDocs, recordDate, "一助");
|
|
|
title = title.replace("一助", doctorTitle);
|
|
|
}
|
|
|
if (admisDate.before(recordDate) && !CatalogueUtil.compareTime(admisDate, recordDate, (long) duration)) {
|