Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r33046 -r33165 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 33046) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 33165) @@ -3809,16 +3809,25 @@ */ @SuppressWarnings("unused") private String getInfoByBarcode_ProxyDisinfectionList(JSONObject params) { - //代理灭菌记录的流水号 - final String serialNumber = params.optString("barcode"); - if (StringUtils.isBlank(serialNumber)) { + //代理灭菌记录的流水号或器械包条码 + final String barcode = params.optString("barcode"); + if (StringUtils.isBlank(barcode)) { return JSONUtil.buildErrorMsgJsonResult("缺失代理灭菌记录流水号参数."); } - - ProxyDisinfection proxyDisinfection = proxyDisinfectionManager.getProxyDisinfectionBySerialNumber(serialNumber); - if(proxyDisinfection == null){ - return new JSONStringer().object().key("success").value(false).key("message").value(String.format("未找到流水号为%s的代理灭菌单",serialNumber)) - .endObject().toString(); + ProxyDisinfection proxyDisinfection = null; + BarcodeDevice barcodeDevice = barcodeManager.getBarcodeByBarcode(barcode); + if(barcodeDevice != null && barcodeDevice instanceof TousseInstance){ + TousseInstance tousseInstance = (TousseInstance) barcodeDevice; + proxyDisinfection = proxyDisinfectionManager.get(tousseInstance.getProxyDisinfection_id()); + if(proxyDisinfection == null){ + throw new SystemException("未找到" + tousseInstance.getTousseDefinitionName() + "(条码" + tousseInstance.getBarcode() + ")所属的代理灭菌单"); + } + }else{ + proxyDisinfection = proxyDisinfectionManager.getProxyDisinfectionBySerialNumber(barcode); + if(proxyDisinfection == null){ + return new JSONStringer().object().key("success").value(false).key("message").value(String.format("未找到流水号为%s的代理灭菌单",barcode)) + .endObject().toString(); + } } JSONObject result = JSONUtil.buildJsonObject(true); JSONObject data = new JSONObject();