Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r33319 -r33324 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 33319) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 33324) @@ -1379,11 +1379,12 @@ //验证审核时间 function validReviewTime(type, time) { //兼容IE - var newTime = time.replace(/-/g, '/'); + var newTime2 = time.replace(/-/g, '/'); var newDate2 = newDate.replace(/-/g, '/'); var startDate; var endDate = new Date(newDate2 + ' 23:59:59'); var endDateStr = endDate.getTime(); + var newTimeStr = new Date(newTime).getTime(); if ((dayStartTime || '') !== '') { startDate = new Date(newDate2 + ' ' + dayStartTime + ':00'); var h = dayStartTime.split(":")[0]; @@ -1395,16 +1396,28 @@ } var startDateStr = startDate.getTime(); if (type == '今天') { - var currentDate = new Date(newTime); + var currentDate = new Date(newTime2); var currentDateStr = currentDate.getTime(); + if(newTimeStr < startDateStr){ + startDateStr = startDateStr - 24*60*60*1000; + endDateStr = endDateStr - 24*60*60*1000; + } if (currentDateStr >= startDateStr && currentDateStr <= endDateStr) { return true; } } else if (type == '非今天(七天内)') {//7天内 var newStartDateStr = startDateStr - 6 * 24 * 60 * 60 * 1000; var newEndDateStr = endDateStr - 24 * 60 * 60 * 1000; - var currentDate = new Date(newTime); + var currentDate = new Date(newTime2); var currentDateStr = currentDate.getTime(); + if(newTimeStr < newStartDateStr){ + newStartDateStr = newStartDateStr - 24*60*60*1000; + newEndDateStr = newEndDateStr - 24*60*60*1000; + } + if(newTimeStr < newEndDateStr){ + newStartDateStr = newStartDateStr - 24*60*60*1000; + newEndDateStr = newEndDateStr - 24*60*60*1000; + } if (currentDateStr >= newStartDateStr && currentDateStr <= newEndDateStr) { return true; } Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp =================================================================== diff -u -r33300 -r33324 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp (.../sterilizationRecordView.jsp) (revision 33300) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp (.../sterilizationRecordView.jsp) (revision 33324) @@ -21,8 +21,10 @@ request.setAttribute("orgUnitCoding",userData.getOrgUnitCodingFromSupplyRoomConfig()); request.setAttribute("hospitalName", userData.getHospitalName()); SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager"); - SimpleDateFormat dateFormat =new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat dateFormat =new SimpleDateFormat("yyyy/MM/dd"); + SimpleDateFormat timeFormat =new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); request.setAttribute("newDate", dateFormat.format(new Date())); + request.setAttribute("newTime", timeFormat.format(new Date())); %> @@ -32,6 +34,7 @@