Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r30260 -r30278 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 30260) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 30278) @@ -3595,6 +3595,15 @@ sr.setSrSituationComfirmer(srSituationComfirmer); } saveOrUpdate(sr); + // 验证是否需要扫描监测包条码 + Boolean enableScanSterilizationMonitoringPackage = + ConfigUtils.getSystemSetConfigByNameBool("enableScanSterilizationMonitoringPackage"); + if(enableScanSterilizationMonitoringPackage){ + isNeedScanMonitoringTousse(sr); + } + }catch(UnScanSterilizationMonitoringPackageException e) { + e.printStackTrace(); + throw e; }catch(Exception e) { e.printStackTrace(); } @@ -5560,6 +5569,12 @@ updateSterilizationRecordForUrgentLevel(sr,null); } updateSterilizationRecordStatisticsInfo(sterilizationRecord); + // 验证是否需要扫描监测包条码 + Boolean enableScanSterilizationMonitoringPackage = + ConfigUtils.getSystemSetConfigByNameBool("enableScanSterilizationMonitoringPackage"); + if(enableScanSterilizationMonitoringPackage){ + isNeedScanMonitoringTousse(sterilizationRecord); + } result.put(JSONUtil.JSON_KEY_SUCCESS, true); result.put(JSONUtil.JSON_KEY_MESSAGE, "保存成功"); return result; Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r30209 -r30278 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 30209) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 30278) @@ -77,6 +77,7 @@ import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; import com.forgon.exception.SterilingModeNotTheSameException; import com.forgon.exception.SystemException; +import com.forgon.exception.UnScanSterilizationMonitoringPackageException; import com.forgon.exception.service.ExceptionHandler; import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; @@ -1958,6 +1959,8 @@ startDate, endDate, sterilizerName, status,sterilizationPurpose,sterilizationMethod,frequency, sterilizationUser,sterilizationRecordFinishConfirm, finishComfirmer, srSituationComfirmer); response = StrutsParamUtils.getResponse(); + } catch (UnScanSterilizationMonitoringPackageException e) { + obj = JSONUtil.buildJsonObject(false, "干预失败," + e.getMessage()); } catch (Exception e) { obj = JSONUtil.buildJsonObject(false, "干预出现异常失败."); }