Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js =================================================================== diff -u -r41012 -r41016 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 41012) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 41016) @@ -33,173 +33,173 @@ //物理监测结果 var monitorResutlStore = new Ext.data.SimpleStore({ - fields: ['value'], - data: [['无'], ['合格'], ['不合格']] + fields: ['value'], + data: [['无'], ['合格'], ['不合格']] }); var listStore; var monitorResultListWin; //显示多条灭菌完成的记录 -function showMonitorResultList(){ +function showMonitorResultList() { listStore = new Ext.data.Store({ - reader : new Ext.data.JsonReader({ - fields : ['id','sterilizerNname'] + reader: new Ext.data.JsonReader({ + fields: ['id', 'sterilizerNname'] }) }) var cm = new Ext.grid.ColumnModel([{ menuDisabled: true, - header : "灭菌炉名称", - width:200, - dataIndex : 'sterilizerNname' - },{ - header: "操作", + header: "灭菌炉名称", + width: 200, + dataIndex: 'sterilizerNname' + }, { + header: "操作", width: 100, - renderer : gotoPage + renderer: gotoPage }]); var listGrid = new Ext.grid.GridPanel({ - store : listStore, - cm : cm, + store: listStore, + cm: cm, height: 200, - frame : false, - bodyStyle : 'border:1px solid #afd7af', - anchor : '100%' + frame: false, + bodyStyle: 'border:1px solid #afd7af', + anchor: '100%' }); var records = grid.getSelectionModel().getSelections(); var listData = []; - for(var i = 0;i < records.length;i++){ + for (var i = 0; i < records.length; i++) { listData.push({ - id:records[i].get('id'), - sterilizerNname:records[i].get("sterilizer.name") + id: records[i].get('id'), + sterilizerNname: records[i].get("sterilizer.name") }); } listStore.loadData(listData); var winG = new Ext.WindowGroup(); winG.zseed = 8900; monitorResultListWin = new Ext.Window({ - autoHeight:true, - title : '监测结果填写', - width:400, - draggable:true, - modal:true, + autoHeight: true, + title: '监测结果填写', + width: 400, + draggable: true, + modal: true, manager: winG, - closable:false, - items:[listGrid] + closable: false, + items: [listGrid] }); monitorResultListWin.show(); } //刷新监测列表的数据 -function reloadMonitorResultList(id){ +function reloadMonitorResultList(id) { var listData = []; - for(var i = 0;i < listStore.data.items.length;i++){ - if(id !== listStore.data.items[i].get('id')){ + for (var i = 0; i < listStore.data.items.length; i++) { + if (id !== listStore.data.items[i].get('id')) { listData.push({ - id:listStore.data.items[i].get('id'), - sterilizerNname:listStore.data.items[i].get("sterilizerNname") + id: listStore.data.items[i].get('id'), + sterilizerNname: listStore.data.items[i].get("sterilizerNname") }); } } - if(listData.length > 0){ + if (listData.length > 0) { listStore.loadData(listData); - }else { + } else { monitorResultListWin.close(); grid.dwrReload(); } } //DGSETYY-16:弹出监测结果填写表单 -function showMonitorResultForm(ids){ - if(typeof ids !== 'number'){ +function showMonitorResultForm(ids) { + if (typeof ids !== 'number') { showMonitorResultList(); return; } var formObj = new Ext.FormPanel({ id: 'monitorResultForm', - frame: true, - labelSeparator: ':', - bodyStyle: 'padding:5px', + frame: true, + labelSeparator: ':', + bodyStyle: 'padding:5px', height: 150, - autoWidth: true, - autoScroll: true, - labelAlign: 'right', - viewConfig: { - forceFit: true - }, - items:[{ + autoWidth: true, + autoScroll: true, + labelAlign: 'right', + viewConfig: { + forceFit: true + }, + items: [{ layout: 'column', - items:[{ + items: [{ columnWidth: 1, layout: 'form', items: [{ xtype: 'combo', fieldLabel: "物理监测结果", - id:'physicsResult', + id: 'physicsResult', name: "physicsResult", - labelWidth:90, + labelWidth: 90, valueField: 'value', displayField: 'value', store: monitorResutlStore, triggerAction: 'all', mode: 'local', - value:'合格', + value: '合格', readOnly: true, anchor: '90%' - },{ + }, { xtype: 'combo', fieldLabel: "化学监测结果", - id:'chemistryResult', + id: 'chemistryResult', name: "chemistryResult", - labelWidth:90, + labelWidth: 90, valueField: 'value', displayField: 'value', store: monitorResutlStore, triggerAction: 'all', mode: 'local', - value:'合格', + value: '合格', readOnly: true, anchor: '90%' }] }] }], buttons: [{ - text: '保存', - handler: function () { + text: '保存', + handler: function () { var physicsResult = Ext.getCmp('physicsResult').getValue(); var chemistryResult = Ext.getCmp('chemistryResult').getValue(); - if(physicsResult == '不合格' || chemistryResult == '不合格'){ + if (physicsResult == '不合格' || chemistryResult == '不合格') { top.Ext.Msg.confirm("确认", "监测结果为“不合格”后就不能再改为“合格”,是否确认?", function (btn) { if (btn == 'yes') { - saveSterilizationResult(ids,physicsResult,chemistryResult,monitorResultFormWin); + saveSterilizationResult(ids, physicsResult, chemistryResult, monitorResultFormWin); } }) - }else { - saveSterilizationResult(ids,physicsResult,chemistryResult,monitorResultFormWin); + } else { + saveSterilizationResult(ids, physicsResult, chemistryResult, monitorResultFormWin); } - } - }] + } + }] }) var monitorResultFormWin = new Ext.Window({ - id: 'monitorResultFormWin', - layout: 'fit', - title: '监测结果填写', - border: false, - modal: true, - width: 400, - height: 150, - plain: true, - align: 'center', - closable:false, - items: [formObj] - }); - monitorResultFormWin.show(); + id: 'monitorResultFormWin', + layout: 'fit', + title: '监测结果填写', + border: false, + modal: true, + width: 400, + height: 150, + plain: true, + align: 'center', + closable: false, + items: [formObj] + }); + monitorResultFormWin.show(); } -function gotoPage(v, p, record){ +function gotoPage(v, p, record) { var id = record.data.id; - return "填写监测结果"; + return "填写监测结果"; } //保存监测结果 -function saveSterilizationResult(id,physicsResult,chemistryResult,monitorResultFormWin){ +function saveSterilizationResult(id, physicsResult, chemistryResult, monitorResultFormWin) { var myMask = new top.Ext.LoadMask(top.Ext.getBody(), { msg: "正在保存,请稍候..." }); @@ -208,25 +208,25 @@ url: WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!updateSterilizationResult.do', params: { id: id, - physicsResult:physicsResult, - chemistryResult:chemistryResult - }, + physicsResult: physicsResult, + chemistryResult: chemistryResult + }, success: function (response, options) { var result = Ext.decode(response.responseText); var success = result.success; myMask.hide(); if (success) { showMultipleResult('保存成功'); monitorResultFormWin.close(); - if(listStore){ + if (listStore) { reloadMonitorResultList(id); - }else { + } else { grid.dwrReload(); } - if(result.msg == '不合格'){ + if (result.msg == '不合格') { addQualityMonitoring1(id); } - }else { + } else { showMultipleResult(result.msg); } }, @@ -322,7 +322,7 @@ return false; } else { var id = records[0].data['id']; - top.showUploadImagesForWin(id,'灭菌记录图片'); + top.showUploadImagesForWin(id, '灭菌记录图片'); } } @@ -337,7 +337,7 @@ return false; } else { var id = records[0].data['id']; - top.showUploadImagesForWin(id,'生物监测图片'); + top.showUploadImagesForWin(id, '生物监测图片'); } } @@ -370,24 +370,24 @@ } } //打印灭菌明细表 -function printSterilizationDetailsObj(){ +function printSterilizationDetailsObj() { var records = grid.getSelectionModel().getSelections(); if (records.length == 0) { showResult("请选择要打印的灭菌记录!", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage); return false; } var isReturn = false; var arr = []; - for(var i=0;i 0){ + if (result.success) { + if (result.data.length > 0) { formTypeOfPrinted = "sterilizationRecordDetail"; setPrinterByConfig(); - for(var i=0;i 1) { showMultipleResult("只能选择一条灭菌记录!", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage); return false; @@ -566,20 +572,20 @@ timeout: 99999, success: function (response, options) { var result = Ext.decode(response.responseText); - if(result.success){ - if(result.data){ - top.Ext.MessageBox.confirm("请确认", "本次灭菌含有“"+ result.data.sterilizationToussePageSizes +"”的器械包,需要进行定期监测。",function (button, text) { - submitSterilizationComplete(sterilizationRecordId, null); + if (result.success) { + if (result.data) { + top.Ext.MessageBox.confirm("请确认", "本次灭菌含有“" + result.data.sterilizationToussePageSizes + "”的器械包,需要进行定期监测。", function (button, text) { + submitSterilizationComplete(sterilizationRecordId, null, recordObj); if ("yes" == button) { var needFinishConfirm = sstsConfig.sterilizationRecordFinishConfirm ? true : false; var obj = { - defaultQualityMonitoring:result.data.defaultQualityMonitoring, - defaultQualityMonitoringId:result.data.defaultQualityMonitoringId, - finishComfirmer:null, - needFinishConfirm:needFinishConfirm, - calcSterilizationResult:false, - sterilizationStatus:'灭菌完成', - qualityMonitoringSterilizationID:sterilizationRecordId + defaultQualityMonitoring: result.data.defaultQualityMonitoring, + defaultQualityMonitoringId: result.data.defaultQualityMonitoringId, + finishComfirmer: null, + needFinishConfirm: needFinishConfirm, + calcSterilizationResult: false, + sterilizationStatus: '灭菌完成', + qualityMonitoringSterilizationID: sterilizationRecordId } addRoutineMonitoring("", obj); } @@ -589,12 +595,12 @@ } } }); - }else if(sstsConfig.enableCompletionSterilizationRequiresRegistrationQualityMonitoringRecords){ + } else if (sstsConfig.enableCompletionSterilizationRequiresRegistrationQualityMonitoringRecords) { if (records.length > 1) { showMultipleResult("只能选择一条灭菌记录!", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage); return false; } - top.Ext.MessageBox.confirm("请确认", "完成灭菌需要先登记质量监测记录,是否继续?",function (button, text) { + top.Ext.MessageBox.confirm("请确认", "完成灭菌需要先登记质量监测记录,是否继续?", function (button, text) { if ("yes" == button) { var data = records[0].data; qualityMonitoringSterilizationID = data['id']; @@ -608,12 +614,12 @@ } if (sstsConfig.needFinishComfirmer) { - completeSterilizationRecord(ids); + completeSterilizationRecord(ids, null, recordObj); } else { top.Ext.MessageBox.confirm("请确认", "确定" + status + "吗?", function (button, text) { if ("yes" == button) { - submitSterilizationComplete(ids, null); + submitSterilizationComplete(ids, null, recordObj); if (typeof (sterilizationRecordWin) != 'undefined' && sterilizationRecordWin != null) { sterilizationRecordWin.close(); } @@ -637,7 +643,7 @@ * @param ids 灭菌记录的id集合 * @param finishComfirmer 确认完成人 */ -function submitSterilizationComplete(ids, finishComfirmer) { +function submitSterilizationComplete(ids, finishComfirmer, recordObj) { Ext.MessageBox.show({ msg: '正在提交,请稍候...', width: 300, @@ -647,16 +653,27 @@ var needFinishConfirm = sstsConfig.sterilizationRecordFinishConfirm ? true : false; Ext.Ajax.request({ url: WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!completeSterilization.do', - params: { ids: ids, finishComfirmer: finishComfirmer, needFinishConfirm: needFinishConfirm,calcSterilizationResult:false }, + params: { ids: ids, finishComfirmer: finishComfirmer, needFinishConfirm: needFinishConfirm, calcSterilizationResult: false }, timeout: 99999, success: function (response, options) { hideMessageBox(false); var result = Ext.decode(response.responseText); showMultipleResult(result.message, null, sstsConfig.messagePauseTimeOnSterilizationRecordPage); - if(result.success){ - if(sstsConfig.enableTheSterilizationResultJudgmentFunction){ + if (result.success) { + if (sstsConfig.enableTheSterilizationResultJudgmentFunction) { showMonitorResultForm(ids); } + if (sstsConfig.enableParameterFileConfirmation && recordObj) { + if(recordObj.length > 1){ + showResult('本次完成的记录需要确认参数文件。'); + return + } + if (recordObj.sterilizationParaType == '') { + showResult('未读取到灭菌参数图,请确认灭菌参数是否合格。'); + } else { + openSterilizerRecordLineChartByParaType(recordObj.sterilizationParaType, recordObj.id, recordObj.sterilizerName) + } + } } grid.dwrReload(); }, @@ -670,11 +687,11 @@ }); } //BJ309YY-32:是否添加质量监测 -function isCompleteSterilization(ids){ - timeOut = setTimeout(function(){ - if(addQuality){ +function isCompleteSterilization(ids) { + timeOut = setTimeout(function () { + if (addQuality) { submitSterilizationComplete(ids, null); - }else { + } else { isCompleteSterilization(ids); } }, 1000); @@ -859,9 +876,9 @@ * 添加质量监测 */ function addQualityMonitoring1(id) { - if(id){ + if (id) { qualityMonitoringSterilizationID = id; - }else { + } else { var records = grid.getSelectionModel().getSelections(); if (records.length == 0) { qualityMonitoringSterilizationID = null; @@ -879,7 +896,7 @@ } //SZSZYY-33:【灭菌管理】新增生物监测结果打印功能 -function getBiologyInfoForPrint(grid){ +function getBiologyInfoForPrint(grid) { var records = grid.getSelectionModel().getSelections(); if (records.length == 0) { @@ -1121,7 +1138,7 @@ }], buttons: [{ text: '重新灭菌', - hidden:!sstsConfig.enableTheSterilizationResultJudgmentFunction, + hidden: !sstsConfig.enableTheSterilizationResultJudgmentFunction, handler: function () { Ext.Ajax.request({ url: WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!canReSterilization.do', @@ -1132,7 +1149,7 @@ if (success) { interruptWin.close(); callModifyFunction(true); - }else { + } else { showMultipleResult(result.message, null, sstsConfig.messagePauseTimeOnSterilizationRecordPage); } }, @@ -1158,7 +1175,7 @@ }, { id: 'failerBtn', text: '灭菌失败', - hidden:sstsConfig.enableTheSterilizationResultJudgmentFunction, + hidden: sstsConfig.enableTheSterilizationResultJudgmentFunction, handler: function () { sterilizationFailure(grid, statusFailure); sterilizerStatus = statusFailure; @@ -1233,7 +1250,7 @@ } if (v == '灭菌中断' && packageSterilizationCount <= 1) { tempId += "-interruptionHandle"; - var str = ""; + var str = ""; return str; } return; @@ -1254,73 +1271,75 @@ return "

" + v + "

"; } -function renderResult(v, p, record){ +function renderResult(v, p, record) { var result = record.data['sterilizationResult']; var backgroundColor = ""; var color = ""; - if(result == '合格'){ + if (result == '合格') { backgroundColor = "#74EA44"; color = '#000'; - }else if(result == '不合格'){ + } else if (result == '不合格') { backgroundColor = "#6429AE"; color = '#fff'; } - return "

" + v + "

"; + return "

" + v + "

"; } function openSterilizerRecord(id) { openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerRecordView.jsp?popType=true&sterilizationRecordId=' + id, '', '灭菌器参数', '1000', '700'); } - -function openLowSterilizerRecordLineChart(id, sterilizationUser) { - openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChart.jsp?sterilizationRecordId=' + id, '', '灭菌器参数', '1050', '700'); +function openSterilizerPhoto(id, type) { + top.showUploadImagesForWin(id, type); } -function openHighSterilizerRecordLineChart(id, sterilizationUser) { - openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/highSterilizerLineChart.jsp?sterilizationRecordId=' + id, '', '灭菌器参数', '1050', '700'); -} -function openLowTempForJohnsonSterilizerRecordLineChart(id, sterilizerName) { - openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowTempForJohnsonSterilizerLineChart.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '700'); -} -function openCaspSterilizerRecordLineChart(id, sterilizerName) { - openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/caspSterilizerRecordLineChart.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '700'); -} -function openPS100GXPSterilizerRecordLineChart(id, sterilizerName) { - openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/ps100GXPSterilizerRecordLineChart.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '700'); -} -function openSenohSterilizerRecordLineChart(id, sterilizerName) { - openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/senohSterilizerRecordLineChart.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '700'); -} -function openLowSterilizerLineChartSterilizationParaType4(id, sterilizerName){ - openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType4.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '700'); -} -//BJ309YY-8:灭菌炉运行参数(XG2.C) -function openLowSterilizerLineChartSterilizationParaType13(id){ - openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType13.jsp?sterilizationRecordId=' + id, '', '灭菌炉运行参数', '1050', '700'); -} -//BJ309YY-7:灭菌炉运行参数(强生100NX) -function openLowSterilizerLineChartSterilizationParaType14(id){ - openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType14.jsp?sterilizationRecordId=' + id, '', '灭菌炉运行参数', '1050', '700'); -} -//GDSRMYY-596:灭菌炉运行参数(美莱格 快速灭菌炉 43B+) -function openLowSterilizerLineChartSterilizationParaType16(id){ - openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType16.jsp?sterilizationRecordId=' + id, '', '灭菌炉运行参数', '1050', '700'); -} -//SZSLHQZXYY-25:灭菌炉运行参数(史帝瑞过氧化氢灭菌器) -function openLowSterilizerLineChartSterilizationParaType17(id){ - openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType17.jsp?sterilizationRecordId=' + id, '', '灭菌炉运行参数', '1050', '700'); -} -function openSterilizerPhoto(id,type){ - top.showUploadImagesForWin(id,type); -} //NFYY-98:显示窗口显示对应的PDF文件 -function openSterilizerPDF(id){ +function openSterilizerPDF(id) { //暂时不支持IE - if(isIE()){ + if (isIE()) { showResult('IE浏览器不支持预览pdf文件,请切换谷歌浏览器!'); - }else { - openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/showFileForPDF.jsp?sterilizationRecordId=' + id,'', '灭菌炉运行参数', '1050', '700'); + } else { + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/showFileForPDF.jsp?sterilizationRecordId=' + id, '', '灭菌炉运行参数', '1050', '700'); } } + +//BJDXZLYY-74:通用弹窗 +function openSterilizerRecordLineChartByParaType(sterilizationParaType, id, sterilizerName) { + //显示pdf文件的type + var showPdfForType = [15]; + var commonPage = [8, 9, 10, 11, parseInt(STERILIZATIONPARATYPE_XINHUA_PDF)]; + if (sterilizationParaType == 1) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChart.jsp?sterilizationRecordId=' + id, '', '灭菌器参数', '1050', '700'); + } else if (sterilizationParaType == 2) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/highSterilizerLineChart.jsp?sterilizationRecordId=' + id, '', '灭菌器参数', '1050', '700'); + } else if (sterilizationParaType == 3) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowTempForJohnsonSterilizerLineChart.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '700'); + } else if (sterilizationParaType == 4) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType4.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '700'); + } else if (sterilizationParaType == 5) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/caspSterilizerRecordLineChart.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '700'); + } else if (sterilizationParaType == 6) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/senohSterilizerRecordLineChart.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '700'); + } else if (sterilizationParaType == 7) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/ps100GXPSterilizerRecordLineChart.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '700'); + } else if (sterilizationParaType == 12) { + openSterilizerPhoto(id, '灭菌器参数'); + } else if (sterilizationParaType == 13) { + ////BJ309YY-8:灭菌炉运行参数(XG2.C) + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType13.jsp?sterilizationRecordId=' + id, '', '灭菌炉运行参数', '1050', '700'); + } else if (sterilizationParaType == 14) { + //BJ309YY-7:灭菌炉运行参数(强生100NX) + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType14.jsp?sterilizationRecordId=' + id, '', '灭菌炉运行参数', '1050', '700'); + } else if (sterilizationParaType == 16) { + //GDSRMYY-596:灭菌炉运行参数(美莱格 快速灭菌炉 43B+) + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType16.jsp?sterilizationRecordId=' + id, '', '灭菌炉运行参数', '1050', '700'); + } else if (sterilizationParaType == 17) { + //SZSLHQZXYY-25:灭菌炉运行参数(史帝瑞过氧化氢灭菌器) + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType17.jsp?sterilizationRecordId=' + id, '', '灭菌炉运行参数', '1050', '700'); + } else if (commonPage.indexOf(sterilizationParaType) >= 0) { + getSterilizerDataLineCharByIframeUtil(id, sterilizationParaType); + } else if (showPdfForType.indexOf(sterilizationParaType) >= 0) { + openSterilizerPDF(id) + } +} function renderBiologicalMonitoringStatus(v, p, record) { if (v == '进行中') { return "

" + v + ""; @@ -1354,9 +1373,9 @@ } //打印监测包条码 -function printMonitorTousseBarcodes(printAmount,type,callback){ +function printMonitorTousseBarcodes(printAmount, type, callback) { top.Ext.MessageBox.show({ - msg: '正在打印'+type+'条码,请稍候...', + msg: '正在打印' + type + '条码,请稍候...', width: 300, wait: true, waitConfig: { interval: 300 } @@ -1365,7 +1384,7 @@ url: WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!createMonitorTousseBarcodes.do', params: { amount: printAmount, - type:type + type: type }, success: function (response, options) { var result = Ext.decode(response.responseText); @@ -1381,18 +1400,15 @@ Ext.onReady(function () { Ext.QuickTips.init(); var sterilizationRecordDetailHidden = true; - if(printConfig && printConfig.sterilizationRecordDetail){ + if (printConfig && printConfig.sterilizationRecordDetail) { sterilizationRecordDetailHidden = false } - //显示pdf文件的type - var showPdfForType = [15]; - var commonPage = [8,9,10,11,parseInt(STERILIZATIONPARATYPE_XINHUA_PDF)]; // 记录cookie(3步) var columns = [ { header: "灭菌员", width: 120, dataIndex: 'sterilizationUser', renderer: renderCallModifyFunction }, { header: "开始时间", width: 125, dataIndex: 'startDate', renderer: myDateFormatByMinute }, - { header: "核查人", width: 120, dataIndex: 'verifier.fullName', hidden:!sstsConfig.enableDoubleCheckOfSterilizationFunction}, - { header: "复核人", width: 120, dataIndex: 'reviewers.fullName', hidden:!sstsConfig.enableDoubleCheckOfSterilizationFunction}, + { header: "核查人", width: 120, dataIndex: 'verifier.fullName', hidden: !sstsConfig.enableDoubleCheckOfSterilizationFunction }, + { header: "复核人", width: 120, dataIndex: 'reviewers.fullName', hidden: !sstsConfig.enableDoubleCheckOfSterilizationFunction }, { header: "确认完成人", width: 70, dataIndex: 'finishComfirmer' }, { header: confirmUserName, width: 110, dataIndex: 'srSituationComfirmer', hidden: !((sstsConfig.hasOwnProperty('sterilizationRecordFinishConfirm')) && sstsConfig.sterilizationRecordFinishConfirm) }, { header: confirmTimeName, width: 130, dataIndex: 'srSituationComfirmTime', hidden: !((sstsConfig.hasOwnProperty('sterilizationRecordFinishConfirm')) && sstsConfig.sterilizationRecordFinishConfirm) }, @@ -1402,59 +1418,33 @@ { header: "炉次", width: 40, align: 'center', dataIndex: 'frequency' }, { header: "灭菌程序", width: 80, align: 'center', dataIndex: 'sterilizationType', id: 'SterilizationType' }, { header: "灭菌状态", width: 60, dataIndex: 'status', renderer: renderColor }, - { header: "灭菌结果", width: 60, dataIndex: 'sterilizationResult', renderer: renderResult,hidden:!((sstsConfig.hasOwnProperty('enableTheSterilizationResultJudgmentFunction')) && sstsConfig.enableTheSterilizationResultJudgmentFunction) }, + { header: "灭菌结果", width: 60, dataIndex: 'sterilizationResult', renderer: renderResult, hidden: !((sstsConfig.hasOwnProperty('enableTheSterilizationResultJudgmentFunction')) && sstsConfig.enableTheSterilizationResultJudgmentFunction) }, { header: "生物监测状态", width: 100, align: 'center', dataIndex: 'biologicalMonitoringStatus', renderer: renderBiologicalMonitoringStatus, hidden: !sstsConfig.showBiologicalMonitoringStatus }, { header: "物理监测结果", width: 100, align: 'center', dataIndex: 'physicsResult' }, - { header: "管腔化学PCD监测结果", width: 140, align: 'center', dataIndex: 'pcdMonitoringResult',hidden: !((sstsConfig.hasOwnProperty('displayPCDMonitoringResultsInTheSterilizationRecordInformation')) && sstsConfig.displayPCDMonitoringResultsInTheSterilizationRecordInformation) }, + { header: "管腔化学PCD监测结果", width: 140, align: 'center', dataIndex: 'pcdMonitoringResult', hidden: !((sstsConfig.hasOwnProperty('displayPCDMonitoringResultsInTheSterilizationRecordInformation')) && sstsConfig.displayPCDMonitoringResultsInTheSterilizationRecordInformation) }, { header: "化学监测结果", width: 100, align: 'center', dataIndex: 'chemistryResult' }, - { header: "生物监测结果", width: 100, align: 'center', dataIndex: 'biologyResult',renderer:function(v, p, record){ - var result = "

"; - result += ""+v+""; - if(record.json.isExistBiologicalMonitorImg){ - result += ""; + { + header: "生物监测结果", width: 100, align: 'center', dataIndex: 'biologyResult', renderer: function (v, p, record) { + var result = "
"; + result += "" + v + ""; + if (record.json.isExistBiologicalMonitorImg) { + result += ""; + } + result += "
"; + return result } - result += "
"; - return result - } }, + }, { header: "监测员", width: 70, align: 'center', dataIndex: 'monitorUser' }, { header: "监测核对员", width: 70, align: 'center', dataIndex: 'monitorChecker' }, { header: "灭菌包总数量", width: 90, align: 'center', dataIndex: 'amount' }, { header: "灭菌器参数", width: 70, dataIndex: 'sterilizerRecordAmount', sortable: false, renderer: function (v, p, record) { var buttonGroup = ""; - if (record.data.sterilizationParaType == 1) { - buttonGroup += ""; - } else if (record.data.sterilizationParaType == 2) { - buttonGroup += ""; - } else if (record.data.sterilizationParaType == 3) { - buttonGroup += ""; - }else if (record.data.sterilizationParaType == 4) { - buttonGroup += ""; - }else if(record.data.sterilizationParaType == 5){ - buttonGroup += ""; - }else if(record.data.sterilizationParaType == 6){ - buttonGroup += ""; - }else if(record.data.sterilizationParaType == 7){ - buttonGroup += ""; - }else if(record.data.sterilizationParaType == 12){ - buttonGroup += ""; - }else if(record.data.sterilizationParaType == 13){ - buttonGroup += ""; - }else if(record.data.sterilizationParaType == 14){ - buttonGroup += ""; - }else if(record.data.sterilizationParaType == 16){ - buttonGroup += ""; - }else if(record.data.sterilizationParaType == 17){ - buttonGroup += ""; - }else if(commonPage.indexOf(record.data.sterilizationParaType) >= 0){ - buttonGroup += ""; - }else if(showPdfForType.indexOf(record.data.sterilizationParaType) >= 0){ - buttonGroup += ""; - }else { - buttonGroup += ""; + if (record.data.sterilizationParaType >= 1) { + buttonGroup += ""; } - if(record.data.isExist){ - buttonGroup += ""; + if (record.data.isExist) { + buttonGroup += ""; } return buttonGroup; } @@ -1541,7 +1531,7 @@ var sign = true; var tbar = null; var showButton = false; - if(sstsConfig.displayPrintSterilizationDetailsButton && sstsConfig.displayPrintSterilizationDetailsButton.indexOf(ownGroup) >= 0){ + if (sstsConfig.displayPrintSterilizationDetailsButton && sstsConfig.displayPrintSterilizationDetailsButton.indexOf(ownGroup) >= 0) { showButton = true; } if (isQueryToday) { @@ -1589,7 +1579,7 @@ } }, '-', { text: '灭菌失败', - hidden: sstsConfig.enableTheSterilizationResultJudgmentFunction?true:SSTS_Sterilization_Update, + hidden: sstsConfig.enableTheSterilizationResultJudgmentFunction ? true : SSTS_Sterilization_Update, iconCls: 'btn_ext_application_error', id: 'sterilizationFailureBtn', handler: function () { @@ -1711,21 +1701,21 @@ //ZSSXLRMYY-226:器械包名称store var tousseDefinitionStore = new Ext.data.Store({ - proxy : new Ext.data.HttpProxy({ - url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getAllTousseDefinitionData.do', - method : 'POST' + proxy: new Ext.data.HttpProxy({ + url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getAllTousseDefinitionData.do', + method: 'POST' }), - reader : new Ext.data.JsonReader({ - totalProperty : 'totalCount', - root : 'data' + reader: new Ext.data.JsonReader({ + totalProperty: 'totalCount', + root: 'data' }, [ - {name : 'id',mapping : 'id'}, - {name : 'spelling',mapping : 'spelling'}, - {name : 'name',mapping : 'name'}, - {name : 'displayName',mapping : 'displayName'}, - {name : 'amount',mapping : 'amount'}] - ),listeners : { - beforeload : function (){ + { name: 'id', mapping: 'id' }, + { name: 'spelling', mapping: 'spelling' }, + { name: 'name', mapping: 'name' }, + { name: 'displayName', mapping: 'displayName' }, + { name: 'amount', mapping: 'amount' }] + ), listeners: { + beforeload: function () { tousseDefinitionStore.baseParams["tousseTypes"] = '敷料包,聚合包,器械包,外部代理灭菌,外来器械包,外来器械拆分小包,消毒物品,自定义器械包' tousseDefinitionStore.baseParams["distinctName"] = true;//同名只返回一个 } @@ -1810,21 +1800,21 @@ }, '-', { text: '器械包名称:' }, { - xtype : 'combo', - id : 'tousseName', - name : 'tousseName', - queryParam : 'spell', - minChars : 0, - valueField : 'name', - displayField : 'name', - store : tousseDefinitionStore, - forceSelection : true, - lazyInit : true, - anchor : '95%', - triggerAction : 'all', - hideTrigger : true, - typeAhead : false, - allowBlank : true + xtype: 'combo', + id: 'tousseName', + name: 'tousseName', + queryParam: 'spell', + minChars: 0, + valueField: 'name', + displayField: 'name', + store: tousseDefinitionStore, + forceSelection: true, + lazyInit: true, + anchor: '95%', + triggerAction: 'all', + hideTrigger: true, + typeAhead: false, + allowBlank: true }, '-', { text: '查询', minWidth: 50, @@ -1859,76 +1849,76 @@ autoHeight: true, autoScroll: true, items: [{ - layout : 'column', - items:[{ - layout : 'form', - labelWidth:93, - labelAlign:'left', + layout: 'column', + items: [{ + layout: 'form', + labelWidth: 93, + labelAlign: 'left', columnWidth: 1, - items : [{ - xtype : 'textfield', + items: [{ + xtype: 'textfield', columnWidth: 1, - disable:true, - fieldLabel:'监测包类型', - cls : 'fieldReadOnlyNoRemove', - width:0 + disable: true, + fieldLabel: '监测包类型', + cls: 'fieldReadOnlyNoRemove', + width: 0 }] - },{ - layout : 'form', - labelWidth:100, - labelAlign:'right', + }, { + layout: 'form', + labelWidth: 100, + labelAlign: 'right', columnWidth: .5, - items : [{ - id : 'monitorTousseType_1', - name : 'monitorTousseType_1', + items: [{ + id: 'monitorTousseType_1', + name: 'monitorTousseType_1', columnWidth: .5, - fieldLabel : '化学监测包', - xtype : 'checkbox', - inputValue : '化学监测包', - labelSeparator:'' + fieldLabel: '化学监测包', + xtype: 'checkbox', + inputValue: '化学监测包', + labelSeparator: '' }] - },{ - layout : 'form', - labelWidth:100, - labelAlign:'right', + }, { + layout: 'form', + labelWidth: 100, + labelAlign: 'right', columnWidth: .5, - items : [{ - id : 'monitorTousseType_2', - name : 'monitorTousseType_2', + items: [{ + id: 'monitorTousseType_2', + name: 'monitorTousseType_2', columnWidth: .5, - fieldLabel : '生物监测包', - xtype : 'checkbox', - inputValue : '生物监测包', - labelSeparator:'' + fieldLabel: '生物监测包', + xtype: 'checkbox', + inputValue: '生物监测包', + labelSeparator: '' }] - },{ - layout : 'form', - labelWidth:80, - labelAlign:'left', + }, { + layout: 'form', + labelWidth: 80, + labelAlign: 'left', columnWidth: 1, - items : [{ - xtype : 'textfield', + items: [{ + xtype: 'textfield', columnWidth: 1, - disable:true, - fieldLabel:'打印份数', - cls : 'fieldReadOnlyNoRemove', - width:0 + disable: true, + fieldLabel: '打印份数', + cls: 'fieldReadOnlyNoRemove', + width: 0 }] - },{ - layout : 'form', - labelWidth:35, - labelAlign:'left', + }, { + layout: 'form', + labelWidth: 35, + labelAlign: 'left', columnWidth: 1, - items : [{ - xtype : 'numberfield', + items: [{ + xtype: 'numberfield', columnWidth: 1, - labelSeparator:'', - id:'printAmount', - width:180, - value:1, - name:'printAmount', - allowDecimals : false, - allowNegative : false + labelSeparator: '', + id: 'printAmount', + width: 180, + value: 1, + name: 'printAmount', + allowDecimals: false, + allowNegative: false }] }] }], @@ -1938,31 +1928,31 @@ handler: function () { var monitorTousseType_1 = top.Ext.getCmp('monitorTousseType_1').getValue(); var monitorTousseType_2 = top.Ext.getCmp('monitorTousseType_2').getValue(); - if(!monitorTousseType_1 && !monitorTousseType_2){ + if (!monitorTousseType_1 && !monitorTousseType_2) { showMultipleResult('请选择监测包类型'); return } var printAmount = top.Ext.getCmp('printAmount').getValue(); - if(printAmount == 0){ + if (printAmount == 0) { showMultipleResult('打印份数不能小于1'); return; - }else if(printAmount > 500){ + } else if (printAmount > 500) { showMultipleResult('打印份数不能超过500'); return; } if (isNaN(printAmount) == false) { - if(monitorTousseType_1){ + if (monitorTousseType_1) { var type1 = top.Ext.getCmp('monitorTousseType_1').inputValue; - printMonitorTousseBarcodes(printAmount,type1,function(result){ + printMonitorTousseBarcodes(printAmount, type1, function (result) { for (var i = 0; i < result.data.length; i++) { var barcode = result.data[i].barcode; print_container(barcode, type1, unitName); } - if(monitorTousseType_2){ + if (monitorTousseType_2) { var type2 = top.Ext.getCmp('monitorTousseType_2').inputValue; - printMonitorTousseBarcodes(printAmount,type2,function(result){ + printMonitorTousseBarcodes(printAmount, type2, function (result) { for (var i = 0; i < result.data.length; i++) { var barcode = result.data[i].barcode; print_container(barcode, type2, unitName); @@ -1972,16 +1962,16 @@ }) } - if(!monitorTousseType_1 && monitorTousseType_2){ + if (!monitorTousseType_1 && monitorTousseType_2) { var type = top.Ext.getCmp('monitorTousseType_2').inputValue; - printMonitorTousseBarcodes(printAmount,type,function(result){ + printMonitorTousseBarcodes(printAmount, type, function (result) { for (var i = 0; i < result.data.length; i++) { var barcode = result.data[i].barcode; print_container(barcode, type, unitName); } }) } - }else { + } else { showMultipleResult("打印份数必须是数字,请重新输入!"); } } @@ -2010,7 +2000,7 @@ } //SZSZYY-33:【灭菌管理】新增生物监测结果打印功能 - if(sstsConfig.enableBioreaderInterface && sstsConfig.enablePrintOfBiologicalMonitoringFunction){ + if (sstsConfig.enableBioreaderInterface && sstsConfig.enablePrintOfBiologicalMonitoringFunction) { items = items.concat(['-', { text: '打印生物监测结果', minWidth: 50, @@ -2041,16 +2031,16 @@ //QYSRMYY-70:新增支持设置默认查询时间 var defaultOperationStart = ''; var defaultOperationEnd = ''; - if(sstsConfig.defaultQueryTimeOfTheFunctionModule && sstsConfig.defaultQueryTimeOfTheFunctionModule.length > 0){ + if (sstsConfig.defaultQueryTimeOfTheFunctionModule && sstsConfig.defaultQueryTimeOfTheFunctionModule.length > 0) { var defaultQueryTimeOfTheFunctionModule = sstsConfig.defaultQueryTimeOfTheFunctionModule; var queryPeriod = 0; - for(var i=0;i 0 && queryPeriod <= 10000){ - defaultOperationStart = getDefaultDate(newDate,queryPeriod) + '00:00'; + if (queryPeriod > 0 && queryPeriod <= 10000) { + defaultOperationStart = getDefaultDate(newDate, queryPeriod) + '00:00'; defaultOperationEnd = getDefaultDate(newDate) + '23:59'; $Id("parm_s_requestTimeQuantum").value = Ext.util.Format.date(defaultOperationStart, 'Y-m-d H:i') + ';' + Ext.util.Format.date(defaultOperationEnd, 'Y-m-d H:i'); } @@ -2076,9 +2066,9 @@ if (isQueryToday) { requestTbar.render(thisGrid.tbar); } - - if(defaultOperationStart !== '' && defaultOperationEnd !== ''){ - if($Id('requestStartTime')){ + + if (defaultOperationStart !== '' && defaultOperationEnd !== '') { + if ($Id('requestStartTime')) { $Id('requestStartTime').value = defaultOperationStart; $Id('requestEndTime').value = defaultOperationEnd; } Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js =================================================================== diff -u -r41012 -r41016 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 41012) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 41016) @@ -280,6 +280,19 @@ if (status == washfaild) { otherPartAddQM = true; addQualityMonitoringByResponPart("清洗消毒"); + }else if(sstsConfig.enableParameterFileConfirmation && status == washed){ + if(records.length == 1){ + var washDataAmount = records[0].data.washDataAmount; + var washDataType = records[0].data.washDataType; + var id = records[0].data.id; + if(washDataAmount > 0 || washDataType > 0){ + openWashDataLineChart(id) + }else { + showResult('未读取到清洗参数图,请确认清洗参数是否合格。'); + } + }else { + showResult('本次完成的记录需要确认参数文件。'); + } } } },