Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/specialInfection/service/SpecialInfectionManagerImpl.java =================================================================== diff -u -r35346 -r35425 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/specialInfection/service/SpecialInfectionManagerImpl.java (.../SpecialInfectionManagerImpl.java) (revision 35346) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/specialInfection/service/SpecialInfectionManagerImpl.java (.../SpecialInfectionManagerImpl.java) (revision 35425) @@ -8,6 +8,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import com.forgon.Constants; import com.forgon.directory.model.BarcodeDevice; import com.forgon.disinfectsystem.barcode.service.BarcodeManager; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; @@ -290,12 +291,15 @@ } BarcodeDevice barcodeDevice = barcodeManager.getBarcodeByBarcode(barcode); if(barcodeDevice == null){ - throw new SystemException("条码无效"); + throw new SystemException("找不到该条码对应的特殊感染类型!"); } if(!(barcodeDevice instanceof SpecialInfection)){ throw new SystemException("请扫描特殊感染类型条码!"); } SpecialInfection specialInfection = (SpecialInfection) barcodeDevice; + if(StringUtils.equals(specialInfection.getEnable(), Constants.STR_NO)){ + throw new SystemException(specialInfection.getName() + "(" + specialInfection.getBarcode() + ")已经被停用,请先启用。"); + } return specialInfection; }