Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp =================================================================== diff -u -r36743 -r37108 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp (.../useRecordView.jsp) (revision 36743) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp (.../useRecordView.jsp) (revision 37108) @@ -92,6 +92,7 @@ Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationView.jsp =================================================================== diff -u -r29513 -r37108 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationView.jsp (.../expensiveGoodsApplicationView.jsp) (revision 29513) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationView.jsp (.../expensiveGoodsApplicationView.jsp) (revision 37108) @@ -28,6 +28,7 @@ var currentOrgUnitCode = '${currentOrgUnitCode}'; //用户的当前科室编码 var userName = '${userName}'; //用户的全名 var userCode = '${userCode}'; //用户的登录名 + var profile = '${profile}'; /** * 《高值耗材申请单添加》权限 Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r37100 -r37108 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 37100) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 37108) @@ -346,56 +346,6 @@ signatureWindow.show(); } -function showPatientInfo(patientInfo){ - top.Ext4.getCmp('patient').setValue(patientInfo.patientName); - top.Ext4.getCmp('patientAge').setValue(patientInfo.patientAge); - if(patientInfo.clinicNumber){ - top.Ext4.getCmp('clinicNumber').setValue(patientInfo.clinicNumber); - } - if(patientInfo.hospitalNumber){ - top.Ext4.getCmp('hospitalNumber').setValue(patientInfo.hospitalNumber); - } - if(patientInfo.patientSex == '男'){ - top.Ext4.getCmp('patientSex').setValue('男'); - }else if(patientInfo.patientSex == '女'){ - top.Ext4.getCmp('patientSex').setValue('女'); - }else{ - top.Ext4.getCmp('patientSex').setValue(''); - } - top.Ext4.getCmp('patientArea').setValue(patientInfo.patientArea); - top.Ext4.getCmp('roomNumber').setValue(patientInfo.roomNumber); - top.Ext4.getCmp('bedNumber').setValue(patientInfo.bedNumber); - //ZSYY-320:外来器械注释医生的字段 - if(profile !== 'zsyy'){ - top.Ext4.getCmp('doctor').setValue(patientInfo.doctorName); - } - top.Ext4.getCmp('surgery').setValue(patientInfo.operation); - //手术时间需要特殊处理,需要将年和月之间的-符替换成/ - if(patientInfo.operationTime){ - var operationTime = patientInfo.operationTime; - var hour = operationTime.split(':')[0]; - var min = operationTime.split(':')[1]; - var resultTime = hour+':'+min; - top.Ext4.getCmp('operationTime').setValue(resultTime); - } - top.Ext4.getCmp('operationRoom').setValue(patientInfo.opRoomId); - if(top.Ext4.getCmp('operationPart')){ - top.Ext4.getCmp('operationPart').setValue(patientInfo.operationPart || ''); - } - if(top.Ext4.getCmp('ascriptionDepartment')){ - top.Ext4.getCmp('ascriptionDepartment').setValue(patientInfo.ascriptionDepartment || ''); - } - if(top.Ext4.getCmp('remark')){ - top.Ext4.getCmp('remark').setValue(patientInfo.remark || ''); - } - if(top.Ext4.getCmp('doctorAccountDepart')){ - top.Ext4.getCmp('doctorAccountDepart').setValue(patientInfo.doctorAccountDepart || ''); - } - if(top.Ext4.getCmp('patientId')){ - top.Ext4.getCmp('patientId').setValue(patientInfo.patientId || ''); - } -} - //确认归还:0,提前归还:1,批量确认归还:2,批量提前归还:3 function returnFunction(actionType,id,handleDepartCoding,supplierContactName,supplierName){ if(top.Ext4.getCmp("handleDepartCoding")) {