Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r40954 -r40986 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 40954) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 40986) @@ -4947,7 +4947,14 @@ Date stDate = null; stDate = sdf.parse(startDate); String cDateStr = sdf1.format(stDate); - String beginStr = cDateStr + " 00:00:00"; + //获取当天开始时间 + SupplyRoomConfig systemParamsObj = supplyRoomConfigManager.getSystemParamsObj(); + String beginStr = null; + if(systemParamsObj != null && StringUtils.isNotBlank(systemParamsObj.getDayStartTime())){ + beginStr = cDateStr + " " + systemParamsObj.getDayStartTime() +":00"; + }else{ + beginStr = cDateStr + " 00:00:00"; + } String endStr = cDateStr + " 23:59:59"; Date bDate = sdf.parse(beginStr); Date eDate = sdf.parse(endStr);