Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js =================================================================== diff -u -r36144 -r36480 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 36144) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 36480) @@ -887,35 +887,6 @@ } } -// 根据住院号或者诊疗号加载病人信息 -function loadPatientInfoByValAndType(jsonStr) { - if (jsonStr != '') { - DataSynchronizationTableManager.getPatientInfoByNumberAndType(jsonStr, { - callback: function (responseText) { - var result = JSON.parse(responseText); - iskeypress = false; - if (result.success) { - var patientInfo = result.patientInfo; - if (patientInfo) { - showPatientInfo(patientInfo); - } else { - showResult('找不到该号码所对应的病人信息!'); - validPatientInfo(); - } - } - else { - showResult(result.msg); - } - - }, - timeout: 45000, - errorHandler: function (msg) { - showResult('网络加载异常,请稍候重试!
 异常信息:' + msg); - } - }); - } -} - /** * 将病人显示到对应使用记录的表单上 * @param patientInfo 病人信息json对象 Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js =================================================================== diff -u -r36466 -r36480 --- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 36466) +++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 36480) @@ -21,11 +21,15 @@ callback:function(responseText){ var result = JSON.parse(responseText); if (result.success){ - var patientInfo = result.patientInfo; - if(patientInfo){ - showPatientInfo(patientInfo); - }else{ - showResult('找不到该号码所对应的病人信息!'); + if(result.patientInfoArray && result.patientInfoArray.length > 1){ + showMultiPatientInfoWin(result.patientInfoArray); + }else { + var patientInfo = result.patientInfo; + if(patientInfo){ + showPatientInfo(patientInfo); + }else{ + showResult('找不到该号码所对应的病人信息!'); + } } } else{ @@ -39,9 +43,69 @@ } }); } +} +//BJ309YY-2:选择多条显示记录 +var patientInfoStore; +var patientInfoWin; +function showMultiPatientInfoWin(patientInfoArray){ + patientInfoStore = new top.Ext.data.Store({ + data:patientInfoArray, + reader : new top.Ext.data.JsonReader({ + fields : [ + {name: 'operationTime'}, + {name: 'hospitalNumber'}, + {name: 'patientName'}, + {name: 'operation'}, + {name: 'doctorName'} + ] + }) + }); + var patientInfoGrid = new top.Ext.grid.GridPanel({ + store:patientInfoStore, + columns: [ + {header: "手术时间", width: 130, dataIndex: 'operationTime'}, + {header: "住院号", width: 80,dataIndex: 'hospitalNumber'}, + {header: "病人名称", width: 80,dataIndex: 'patientName'}, + {header: "手术名称", width: 80,dataIndex: 'operation'}, + {header: "手术医生", width: 80,dataIndex: 'doctorName'}, + {header: "操作", width: 70,dataIndex: 'id',renderer : function(v, p, record){ + var id = record.id; + return "选择"; + }} + ], + stripeRows: true, + viewConfig: { + forceFit:true + }, + height:200, + width:600 + }); + patientInfoWin = new top.Ext.Window({ + autoHeight:true, + title : '选择手术记录', + width:615, + draggable:true, + modal:true, + closeAction:'close', + items:[patientInfoGrid], + close: function() { + patientInfoWin.hide(); + } + }); + patientInfoWin.show(); } +function getPatientInfo(id){ + for(var i=0;i