Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r32779 -r32782 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 32779) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 32782) @@ -473,14 +473,14 @@ long l0 = System.currentTimeMillis(); List records = getCollectionForUpdate("id", sterilizationRecordIds); //用锁的机制,这里解决并发的完成灭菌操作 if(CollectionUtils.isEmpty(records)){ - return JSONUtil.buildJsonObject(false, "未找到对应的灭菌单"); + throw new SystemException("未找到对应的灭菌单"); } for (SterilizationRecord sterilizationRecord : records) { if(StringUtils.equals(SterilizationRecord.STERILIZATION_STATUS_DRAFT, sterilizationRecord.getStatus())){ - return JSONUtil.buildJsonObject(false, "暂存状态的灭菌记录不能完成灭菌!"); + throw new SystemException("暂存状态的灭菌记录不能完成灭菌!"); } if(SterilizationRecord.STERILIZATION_STATUS_INTERRUPT.equals(sterilizationRecord.getStatus()) && objectDao.countBySql(getOtherSterilizationRecordsSql(sterilizationRecord.getId())) > 0){ - return JSONUtil.buildJsonObject(false, "该灭菌记录里有物品已经存在于新的灭菌记录中,不能操作完成灭菌!"); + throw new SystemException("该灭菌记录里有物品已经存在于新的灭菌记录中,不能操作完成灭菌!"); } } SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");