Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r29554 -r29563 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 29554) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 29563) @@ -412,6 +412,33 @@ } } +//启用灭菌炉生物监测间隔时间提醒验证 +function sterilizerBioMonitoringIntervalReminder(params){ + Ext.Ajax.request( { + url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!sterilizerBioMonitoringIntervalReminder.do', + params : { + sterilizerName : params.sterilizerName, + isSave:params.isSave + }, + success : function(response, options) { + var result = Ext.decode(response.responseText); + if(result.success){ + if(result.message && (params.biologicalMonitoring || '') == ''){ + showResult(result.message); + }else { + if(params.saveType == 1 && params.button){ + saveData(params.saveType,params.button); + }else if(params.saveType == 2){ + saveData(params.saveType); + }else if(params.saveType == 3){ + saveMonitorData(); + } + } + } + } + }); +} + /** * 扫描灭菌炉 */ @@ -452,20 +479,11 @@ }); } if(sstsConfig.enableSterilizerBioMonitoringIntervalReminder){ - Ext.Ajax.request( { - url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!sterilizerBioMonitoringIntervalReminder.do', - params : { - sterilizerName : sterilizerName - }, - success : function(response, options) { - var result = Ext.decode(response.responseText); - if(result.success){ - if(result.message){ - showResult(result.message) - } - } - } - }); + var params = { + sterilizerName:sterilizerName, + isSave:false + } + sterilizerBioMonitoringIntervalReminder(params) } }else{ showResult(resultArray[1], null , sstsConfig.messagePauseTimeOnSterilizationRecordPage); @@ -2844,20 +2862,11 @@ } }); if(sstsConfig.enableSterilizerBioMonitoringIntervalReminder){ - Ext.Ajax.request( { - url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!sterilizerBioMonitoringIntervalReminder.do', - params : { - sterilizerName : combo.value - }, - success : function(response, options) { - var result = Ext.decode(response.responseText); - if(result.success){ - if(result.message){ - showResult(result.message) - } - } - } - }); + var params = { + sterilizerName:combo.value, + isSave:false + } + sterilizerBioMonitoringIntervalReminder(params) } } } @@ -4337,7 +4346,7 @@ } //保存表单 -function daveData(dataType,that){ +function saveData(dataType,that){ if (!formObj.form.isValid()) { showResult('请正确填写表单各值', null , sstsConfig.messagePauseTimeOnSterilizationRecordPage); that.enable(); @@ -4509,29 +4518,19 @@ } if(sstsConfig.enableSterilizerBioMonitoringIntervalReminder){ - Ext.Ajax.request( { - url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!sterilizerBioMonitoringIntervalReminder.do', - params : { - sterilizerName : sterilizerName, - isSave:true - }, - async:false, - success : function(response, options) { - var result = Ext.decode(response.responseText); - if(result.success){ - if(result.message && biologicalMonitoring == ''){ - showResult(result.message); - }else { - daveData(1,that); - } - } - } - }); + var params = { + sterilizerName:sterilizerName, + isSave:true, + biologicalMonitoring:biologicalMonitoring, + button:that, + saveType:1 + } + sterilizerBioMonitoringIntervalReminder(params); }else { - daveData(1,that); + saveData(1,that); } }else { - daveData(1,that); + saveData(1,that); } } @@ -4562,29 +4561,18 @@ } if(sstsConfig.enableSterilizerBioMonitoringIntervalReminder){ - Ext.Ajax.request( { - url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!sterilizerBioMonitoringIntervalReminder.do', - params : { - sterilizerName : sterilizerName, - isSave:true - }, - async:false, - success : function(response, options) { - var result = Ext.decode(response.responseText); - if(result.success){ - if(result.message && biologicalMonitoring == ''){ - showResult(result.message); - }else { - daveData(2); - } - } - } - }); + var params = { + sterilizerName:sterilizerName, + isSave:true, + biologicalMonitoring:biologicalMonitoring, + saveType:2 + } + sterilizerBioMonitoringIntervalReminder(params); }else { - daveData(2); + saveData(2); } }else { - daveData(2); + saveData(2); } } Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js =================================================================== diff -u -r29476 -r29563 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js (.../sterilizationMonitoring.js) (revision 29476) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js (.../sterilizationMonitoring.js) (revision 29563) @@ -2,48 +2,7 @@ * 保存灭菌监测（物理、化学、生物监测） * @returns {Boolean} */ -function saveMonitor(){ - if(sstsConfig.enableScanSterilizationMonitoringPackage){ - var biologicalMonitoring = top.Ext.getCmp('biologicalMonitoring').getValue(); - var monitorTousseDisplay = top.Ext.getCmp('monitorTousseDisplay').getValue(); - var foreignTousseAmount = parseInt(top.Ext.getCmp('foreignTousseAmount').getValue()); - var implantAmount = parseInt(top.Ext.getCmp('implantAmount').getValue()); - var frequency = parseInt(top.Ext.getCmp('frequency').getValue()); - var recordId = top.Ext.getCmp('recordId').getValue(); - if(sstsConfig.enableSterilizerBioMonitoringIntervalReminder){ - Ext.Ajax.request( { - url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!sterilizerBioMonitoringIntervalReminder.do', - params : { - sterilizerId : recordId - }, - success : function(response, options) { - var result = Ext.decode(response.responseText); - if(result.success){ - if(result.message){ - showResult(result.message) - } - } - } - }); - } - if(monitorTousseDisplay !== ''){ - var monitorTousseDisplayArray = monitorTousseDisplay.split(';'); - if(monitorTousseDisplayArray.indexOf('每炉') >=0 && biologicalMonitoring == ''){ - showResult('当前灭菌记录需要扫描监测包条编码，否则不能提交保存。', null); - return; - }else if(monitorTousseDisplayArray.indexOf('每天第一炉') >=0 && frequency == 1 && biologicalMonitoring == ''){ - showResult('当前灭菌记录每天第一炉需要扫描监测包条编码，否则不能提交保存。', null); - return; - }else if(monitorTousseDisplayArray.indexOf('有植入物时') >=0 && implantAmount > 0 && biologicalMonitoring == ''){ - showResult('当前灭菌记录有植入物时需要扫描监测包条编码，否则不能提交保存。', null); - return; - }else if(monitorTousseDisplayArray.indexOf('有外来器械包时') >=0 && foreignTousseAmount > 0 && biologicalMonitoring == ''){ - showResult('当前灭菌记录有外来器械包时需要扫描监测包条编码，否则不能提交保存。', null); - return; - } - } - } - +function saveMonitorData(){ if (!formObj.getForm().isValid()) { showResult('请正确填写表单各值'); return false; @@ -158,4 +117,45 @@ showResult("保存失败！"); } }); +} +function saveMonitor(){ + if(sstsConfig.enableScanSterilizationMonitoringPackage){ + var biologicalMonitoring = top.Ext.getCmp('biologicalMonitoring').getValue(); + var monitorTousseDisplay = top.Ext.getCmp('monitorTousseDisplay').getValue(); + var foreignTousseAmount = parseInt(top.Ext.getCmp('foreignTousseAmount').getValue()); + var implantAmount = parseInt(top.Ext.getCmp('implantAmount').getValue()); + var frequency = parseInt(top.Ext.getCmp('frequency').getValue()); + var sterilizerName = top.Ext.getCmp('sterilizerName').getValue(); + + if(monitorTousseDisplay !== ''){ + var monitorTousseDisplayArray = monitorTousseDisplay.split(';'); + if(monitorTousseDisplayArray.indexOf('每炉') >=0 && biologicalMonitoring == ''){ + showResult('请扫描生物监测包条码：每炉必须做生物监测！', null); + return; + }else if(monitorTousseDisplayArray.indexOf('每天第一炉') >=0 && frequency == 1 && biologicalMonitoring == ''){ + showResult('请扫描生物监测包条码：每天第一炉必须做生物监测！', null); + return; + }else if(monitorTousseDisplayArray.indexOf('有植入物时') >=0 && implantAmount > 0 && biologicalMonitoring == ''){ + showResult('请扫描生物监测包条码：待灭菌物品包含有植入物！', null); + return; + }else if(monitorTousseDisplayArray.indexOf('有外来器械包时') >=0 && foreignTousseAmount > 0 && biologicalMonitoring == ''){ + showResult('请扫描生物监测包条码：待灭菌物品含有外来器械包！', null); + return; + } + } + + if(sstsConfig.enableSterilizerBioMonitoringIntervalReminder){ + var params = { + sterilizerName:sterilizerName, + isSave:true, + biologicalMonitoring:biologicalMonitoring, + saveType:3 + } + sterilizerBioMonitoringIntervalReminder(params); + }else { + saveMonitorData(); + } + }else { + saveMonitorData(); + } } \ No newline at end of file