Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java =================================================================== diff -u -r27137 -r28801 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java (.../SterileLoadingTableManager.java) (revision 27137) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java (.../SterileLoadingTableManager.java) (revision 28801) @@ -404,14 +404,23 @@ return json.toString(); } TousseInstance tousseInstance = (TousseInstance)barcodeDevice; + boolean correct = false; String status = tousseInstance.getStatus(); + if(tousseInstance.getUnTraceableTousse() && tousseInstance.getTousseFixedBarcode()){ + //不追溯的器械包,固定条码。检查当前固定条码下的已审核的包实例的数量是否大于0,如果大于0可以灭菌装载,否则不可以 + return buildMultiTousseReturnJson(sterileLoadingManager.getUnTraceableTousseInstanceList( + AcegiHelper.getLoginUser().getCurrentOrgUnitCode(), extraParam, + tousseInstance.getTousseDefinition())).toString(); + }else{ + correct = Arrays.asList(TousseInstance.STATUS_PACKED, + TousseInstance.STATUS_REVIEWED).contains(status); + } //未审核的包禁止载入到篮筐内 if(!StringUtils.equals(TousseInstance.STATUS_REVIEWED, status) && !tousseInstance.getUnTraceableTousse() && !tousseInstance.getTousseFixedBarcode()){ JSONUtil.addProperty(json, "returnType", "erroeStatus"); JSONUtil.addProperty(json, "status", status); return json.toString(); } - boolean correct = false; String orgUnitCoding = tousseInstance.getOrgUnitCoding(); if(StringUtils.isEmpty(orgUnitCoding)){ @@ -457,15 +466,6 @@ JSONUtil.addProperty(json, "returnType", result.get("returnType")); } } - if(tousseInstance.getUnTraceableTousse() && tousseInstance.getTousseFixedBarcode()){ - //不追溯的器械包,固定条码。检查当前固定条码下的已审核的包实例的数量是否大于0,如果大于0可以灭菌装载,否则不可以 - return buildMultiTousseReturnJson(sterileLoadingManager.getUnTraceableTousseInstanceList( - AcegiHelper.getLoginUser().getCurrentOrgUnitCode(), extraParam, - tousseInstance.getTousseDefinition())).toString(); - }else{ - correct = Arrays.asList(TousseInstance.STATUS_PACKED, - TousseInstance.STATUS_REVIEWED).contains(status); - } if(!correct){ JSONUtil.addProperty(json, "returnType", "erroeStatus");