Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r29561 -r29578 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 29561) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 29578) @@ -3745,15 +3745,14 @@ JSONArray arr = tousseInstanceManager.getTousseInsArrByTd(td, "", " and status = '"+TousseInstance.STATUS_REVIEWED+"'", 0); Integer stockAmount = 0; int toussesAmount = arr.size(); - if (toussesAmount > 0) { + if (toussesAmount > 0 && CollectionUtils.isNotEmpty(toussesOfToday)) { //设置的数量大于0时才做限制 if(scanAmount != null && scanAmount.intValue() > 0){ if (toussesAmount > scanAmount) { toussesAmount = scanAmount; } } JSONArray tousseInstanceArr = new JSONArray(); - JSONObject obj = (JSONObject)arr.get(0); TousseInstance tousseInstance1 = toussesOfToday.get(0); String typeForSterilizationStatistics = getTypeForSterilizationStatistics(tousseInstance1.getProxyDisinfection_id() , tousseInstance1.getTousseDefinition().getTousseType() , tousseInstance1.getTousseDefinition().getIsForeignTousse()); String reviewTime = ForgonDateUtils.safelyFormatDate(tousseInstance1.getReviewTime(), Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "");