Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java =================================================================== diff -u -r41338 -r41350 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 41338) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 41350) @@ -196,6 +196,8 @@ Map sqlWhereParamMap = gridManager .getParamFromView(parameterMap); String sql = "where 1=1 "; + //查询的日期字段 生物监测日期或者灭菌日期 + String dateName = "生物监测日期".equals(sqlWhereParamMap.get("dateType"))?"po.biologicalMonitoringStartDate":"po.startDate"; if (StringUtils.isNotBlank(sqlWhereParamMap.get("queryType"))) {// 当天灭菌记录也包括历史灭菌中记录 Date out_beginTime = new Date(); Date out_endTime = new Date(); @@ -216,7 +218,7 @@ out_endTime = ForgonDateUtils.safelyParseDate(timeArr[1]); } } - sql += " and ((po.startDate between " + sql += " and (("+ dateName +" between " + dateQueryAdapter.dateAdapter(out_beginTime) + " and " + dateQueryAdapter.dateAdapter(out_endTime) + ") or po.status = '"