Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java =================================================================== diff -u -r32996 -r32997 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java (.../ProxyDisinfectionManagerImpl.java) (revision 32996) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java (.../ProxyDisinfectionManagerImpl.java) (revision 32997) @@ -833,6 +833,7 @@ json.put("produceDeptCode", tousseInstance.getOrgUnitCoding()); json.put("produceDeptName", tousseInstance.getOrgUnitName()); json.put("status", tousseInstance.getStatus()); + json.put("sterilizationMode", tousseInstance.getSterilingMode()); json.put("type", BarcodeDevice.BARCODE_TYPE_PACKAGE); json.put("receiveTousse", true); success = true; @@ -1056,11 +1057,15 @@ */ private void isSameSterilizationMode(TousseInstance ti, String sterilizationMode) { if(ti != null && !StringUtils.equals(ti.getSterilingMode(), sterilizationMode)){ + String tiSterilingModeMessage = ""; + if(StringUtils.isNotBlank(ti.getSterilingMode())){ + tiSterilingModeMessage = "属于【" + ti.getSterilingMode() + "】物品"; + } + String oldSterilingModeMessage = ""; if(StringUtils.isNotBlank(sterilizationMode)){ - throw new SystemException("【" + ti.getTousseName() + "】属于【" + ti.getSterilingMode() + "】物品与原有【" + sterilizationMode + "】物品的灭菌方式不一致,不能录入。"); - }else{ - throw new SystemException("【" + ti.getTousseName() + "】属于【" + ti.getSterilingMode() + "】物品与原有物品的灭菌方式不一致,不能录入。"); + oldSterilingModeMessage = "【" + sterilizationMode + "】"; } + throw new SystemException("【" + ti.getTousseName() + "】" + tiSterilingModeMessage + "与原有" + oldSterilingModeMessage + "物品的灭菌方式不一致,不能录入。"); } }