Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java =================================================================== diff -u -r16286 -r16294 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 16286) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 16294) @@ -151,7 +151,10 @@ String needFinishConfirm = sqlWhereParamMap.get("needFinishConfirm"); String comfirmSql = ""; if(StringUtils.isNotBlank(needFinishConfirm)){ - comfirmSql = " or po.isSituationComfirm = 0 or po.isSituationComfirm is null "; +// comfirmSql = " or (po.isSituationComfirm = 0 or po.isSituationComfirm is null)"; + + comfirmSql = " or ((po.isSituationComfirm = 0 or po.isSituationComfirm is null) and po.status = '" + + SterilizationRecord.STERILIZATION_STATUS_END + "')"; } sql += " and ((po.startDate between " + dateQueryAdapter.dateAdapter(out_beginTime) + " and "