Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js =================================================================== diff -u -r31716 -r33563 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js (.../interfereWashAndDisinfectRecordView.js) (revision 31716) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js (.../interfereWashAndDisinfectRecordView.js) (revision 33563) @@ -1,7 +1,7 @@ var grid; -var mergeSameDefinitionItemInClassifyBasket = getSystemSetConfig("mergeSameDefinitionItemInClassifyBasket",false); //对于一个篮筐中,来自与不同回收记录的相同id的器械包(材料)是否要合并。如果合并,则不显示回收科室与回收时间 -var enableIdCardBasketBinding = getSystemSetConfig("enableIdCardBasketBinding",false); +var mergeSameDefinitionItemInClassifyBasket = getSystemSetConfig("mergeSameDefinitionItemInClassifyBasket", false); //对于一个篮筐中,来自与不同回收记录的相同id的器械包(材料)是否要合并。如果合并,则不显示回收科室与回收时间 +var enableIdCardBasketBinding = getSystemSetConfig("enableIdCardBasketBinding", false); function initQueryValueAndReload() { $Id('parm_s_barcodeSearch').value = $Id('barcodeSearch').value; @@ -10,76 +10,76 @@ } -function updateWashStatus(status){ +function updateWashStatus(status) { var records = grid.getSelectionModel().getSelections(); var recordId = ''; var rinserName = ''; var curStatus = ''; if (records.length == 0) { showResult("请至少选中一条清洗记录!"); return false; - }else if(records.length == 1){ + } else if (records.length == 1) { var data = records[0].data; recordId = data['id']; rinserName = data['disinfectIdentification']; curStatus = data['washStatus']; - }else if(records.length > 1){ + } else if (records.length > 1) { showResult("一次只能选中一条清洗记录!"); return false; } // 判断清洗机是否能干预 disinfectIdentification DWREngine.setAsync(false); var needConfirm = false; - WashAndDisinfectRecordTableManager.isRinserNeedConfirm(rinserName,function(result){ - needConfirm = result; - }); + WashAndDisinfectRecordTableManager.isRinserNeedConfirm(rinserName, function (result) { + needConfirm = result; + }); DWREngine.setAsync(true); - if(needConfirm == false){ + if (needConfirm == false) { showResult("该清洗机不需要清洗确认!"); return false; } Ext.getCmp('washSaveConfirm').setValue("0"); - top.Ext.MessageBox.confirm("请确认","确定干预状态为"+status+"吗?", - function(button, text) { - if ("yes" == button){ - Ext.MessageBox.show({ - msg: '正在提交,请稍候...', - width:300, - wait:true, - waitConfig: {interval:300} - }); - Ext.Ajax.request({ - url : WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!washRecordStatusInterfere.do', - params : {recordId : recordId , curStatus : curStatus ,modifyStatus : status}, - success : function(response, options) { - hideMessageBox(false); - var result = Ext.decode(response.responseText); - var success = result.success; - if (true != success) { - showResult(result.message); - grid.dwrReload(); - } else { - showResult(result.message); - grid.dwrReload(); + top.Ext.MessageBox.confirm("请确认", "确定干预状态为" + status + "吗?", + function (button, text) { + if ("yes" == button) { + Ext.MessageBox.show({ + msg: '正在提交,请稍候...', + width: 300, + wait: true, + waitConfig: { interval: 300 } + }); + Ext.Ajax.request({ + url: WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!washRecordStatusInterfere.do', + params: { recordId: recordId, curStatus: curStatus, modifyStatus: status }, + success: function (response, options) { + hideMessageBox(false); + var result = Ext.decode(response.responseText); + var success = result.success; + if (true != success) { + showResult(result.message); + grid.dwrReload(); + } else { + showResult(result.message); + grid.dwrReload(); + } + }, + failure: function (response, options) { + showResult("提交失败!"); } - }, - failure : function(response, options) { - showResult("提交失败!"); - } - }); - - } - }); + }); + + } + }); } -function nameAndFrequency(v, p, record){ +function nameAndFrequency(v, p, record) { var name = record.data['sterilizerName']; - if(name!="" && (v!="" && v!=null)){ - return record.data['sterilizerName']+ ",第" + v+"炉"; + if (name != "" && (v != "" && v != null)) { + return record.data['sterilizerName'] + ",第" + v + "炉"; } return ""; } -var loadFormData = function(grid) { +var loadFormData = function (grid) { var records = grid.getSelectionModel().getSelections(); if (records.length == 0) { showResult("请选择要修改的清洗消毒记录!"); @@ -91,10 +91,10 @@ } id = records[0].data['id']; var isWashAgain = false; - if(records[0].data['washStatus'] == washfaild){ + if (records[0].data['washStatus'] == washfaild) { isWashAgain = true; } - addAndEditWashAndDisinfectRecord(id,isWashAgain); + addAndEditWashAndDisinfectRecord(id, isWashAgain); top.Ext.getCmp('washAndDisinfectRecordWin').setTitle('干预清洗消毒记录'); }; @@ -106,62 +106,63 @@ loadFormData(grid); } -function openWashDataLineChart(id){ +function openWashDataLineChart(id) { Ext.Ajax.request({ - url:WWWROOT +'/disinfectSystem/washData/washDataLineChartAction!getRinserTypeInfo.do?washAndDisinfectRecordId='+id+'&time='+new Date().getTime(), - success:function(result){ - var resultStr = Ext.decode(result.responseText); - var data = resultStr.data - if(data.deviceBrand == changLong){ - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataGridChart.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); - }else if (data.deviceBrand == marge){ - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp?washAndDisinfectRecordId='+id+'&deviceModel='+data.deviceModel,'', '清洗参数', '800', '600'); - }else if(data.deviceBrand == xinHua){ - if(sstsConfig.washDataLineChartType == 1){ - if(data.deviceModel == changlong_DC_4){ - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaChangLong.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); + url: WWWROOT + '/disinfectSystem/washData/washDataLineChartAction!getRinserTypeInfo.do?washAndDisinfectRecordId=' + id + '&time=' + new Date().getTime(), + success: function (result) { + var resultStr = Ext.decode(result.responseText); + var data = resultStr.data + if (data.deviceBrand == changLong) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataGridChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } else if (data.deviceBrand == marge) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp?washAndDisinfectRecordId=' + id + '&deviceModel=' + data.deviceModel, '', '清洗参数', '800', '600'); + } else if (data.deviceBrand == xinHua) { + if (sstsConfig.washDataLineChartType == 1) { + if (data.deviceModel == changlong_DC_4) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaChangLong.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } else { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } } else { - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); + if (data.deviceModel == changlong_DC_5) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua_ChangLong.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } else { + // ZJJSRM-6新华清洗机(负压清洗机和单舱清洗机(super6000)清洗参数显示) + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaOfZJJSRM.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } } + } else if (data.deviceBrand == GETINGE) { + if (data.deviceModel == GETING_86_SERIES || data.deviceModel == GETING_SUZHOUJIEDING_46_5) { + // KLMY洁定清洗机接口/DGSDBZXYY-158 + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfGeting86Series.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } else { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } + } else if (data.deviceBrand == YOUYUAN) { + // DGSDBZXYY-114 连云港佑源减压沸腾清洗消毒机的接口开发 + if (data.deviceModel == YOUYUAN_YZQ_230) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfYouYuan.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } + } else if (data.deviceBrand == STERIS) { + // DGSFYBJY-54 史帝瑞清洗机(型号:AMSCO 3052) + if (data.deviceModel == STERIS_AMSCO_3052) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfSterisMSCO3052.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } else { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } } else { - if(data.deviceModel == changlong_DC_5){ - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua_ChangLong.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); + if (sstsConfig.belimedLineChartType == 1) { + // ZJJSRM-15倍力曼清洗机接口 + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfBelimed.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); } else { - // ZJJSRM-6新华清洗机(负压清洗机和单舱清洗机(super6000)清洗参数显示) - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaOfZJJSRM.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); } } - }else if(data.deviceBrand == GETINGE){ - if(data.deviceModel == GETING_86_SERIES || data.deviceModel == GETING_SUZHOUJIEDING_46_5){ - // KLMY洁定清洗机接口/DGSDBZXYY-158 - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfGeting86Series.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); - } else { - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); - } - }else if(data.deviceBrand == YOUYUAN){ - // DGSDBZXYY-114 连云港佑源减压沸腾清洗消毒机的接口开发 - if(data.deviceModel == YOUYUAN_YZQ_230){ - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfYouYuan.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); - } - }else if(data.deviceBrand == STERIS){ - // DGSFYBJY-54 史帝瑞清洗机(型号:AMSCO 3052) - if(data.deviceModel == STERIS_AMSCO_3052){ - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfSterisMSCO3052.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); - }else{ - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); - } - }else{ - if(sstsConfig.belimedLineChartType == 1){ - // ZJJSRM-15倍力曼清洗机接口 - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfBelimed.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); - } else { - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); - } } - }}); + }); } -Ext.onReady(function() { +Ext.onReady(function () { function renderColor(v, p, record) { var status = record.data['washStatus']; var color = "white"; @@ -173,156 +174,158 @@ return "
" + v + "
"; } var columns = [ - {header : "流水号",width : 80,dataIndex : 'serialNumber',renderer : modifyRecord}, - {header : "操作员",width : 80,dataIndex : 'operator'}, - {header : "清洗方式",width : 80,hidden:true,dataIndex : 'washingMode'}, - {header : "清洗机名称",width : 120,dataIndex : 'disinfectIdentification'}, - {header : "清洗程序",width : 150,dataIndex : 'disinfectProgram'}, - {header : "清洗状态",width : 120,dataIndex : 'washStatus',renderer : renderColor}, - {header : "开始时间",width : 140,dataIndex : 'startDate',renderer : myDateFormatBySecond}, - {header : "结束时间",width : 140,dataIndex : 'endDate',renderer : myDateFormatBySecond}, - {header : "清洗参数",dataIndex : 'washDataAmount',sortable :false,renderer: function(v,p,record){ - if(record.data.washDataAmount > 0){ - return "