Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js =================================================================== diff -u -r33249 -r33259 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 33249) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 33259) @@ -9,9 +9,6 @@ //器械包丢失报损记录,格式如:[{id:1,errorRemark:"丢失原因说明",damageRemark:"报损原因说明",errorData:[{materialId:"材料id1",errorAmount:1},{materialId:"材料id2",errorAmount:0},...{materialId:"材料id3",errorAmount:1}}],damageData:[{materialId:"材料id1",errorAmount:1},{materialId:"材料id2",errorAmount:0},...{materialId:"材料id3",errorAmount:1}}]}, {id:2,errorRemark:"丢失原因说明",damageRemark:"报损原因说明",errorData:[{materialId:"材料id1",errorAmount:1},{materialId:"材料id2",errorAmount:0},...{materialId:"材料id3",errorAmount:1}}],damageData:[{materialId:"材料id1",errorAmount:1},{materialId:"材料id2",errorAmount:0},...{materialId:"材料id3",errorAmount:1}}]}] var tousseInstanceMaterialErrorDamageArray = []; -//巡回护士项的标签 -var circuitNurseLabelName = sstsConfig.circuitNurseLabelName ? sstsConfig.circuitNurseLabelName : '巡回护士'; - var sm = new top.Ext.grid.CheckboxSelectionModel({ singleSelect: false }); @@ -72,90 +69,92 @@ var remarkAllowBlank = true; if (sstsConfig.notAllowBlankFieldsOnUseRecordPage && typeof sstsConfig.notAllowBlankFieldsOnUseRecordPage == 'object') { - if (sstsConfig.notAllowBlankFieldsOnUseRecordPage.length > 0) { - for (var i = 0; i < sstsConfig.notAllowBlankFieldsOnUseRecordPage.length; i++) { - var fieldName = sstsConfig.notAllowBlankFieldsOnUseRecordPage[i]; - if (fieldName == 'hospitalNum') { - hospitalNumAllowBlank = false; - } - if (fieldName == 'treatmentNum') { - treatmentNumAllowBlank = false; - } - if (fieldName == 'washHandNurse') { - washHandNurseAllowBlank = false; - } - if (fieldName == 'circuitNurse') { - circuitNurseAllowBlank = false; - } - if (fieldName == 'operationRoom') { - operationRoomAllowBlank = false; - } - if (fieldName == 'patientName') { - patientNameAllowBlank = false; - } - if (fieldName == 'patientAge') { - patientAgeAllowBlank = false; - } - if (fieldName == 'patientSex') { - patientSexAllowBlank = false; - } - if (fieldName == 'patientArea') { - patientAreaAllowBlank = false; - } - if (fieldName == 'departNameOfpatient') { - departNameOfpatientAllowBlank = false; - } - if (fieldName == 'roomNumber') { - roomNumberAllowBlank = false; - } - if (fieldName == 'bedNumber') { - bedNumberAllowBlank = false; - } - if (fieldName == 'patientIDCard') { - patientIDCardAllowBlank = false; - } - if (fieldName == 'doctorName') { - doctorNameAllowBlank = false; - } - if (fieldName == 'surgeon') { - surgeonAllowBlank = false; - } - if (fieldName == 'anesthetist') { - anesthetistAllowBlank = false; - } - if (fieldName == 'anesthesiaMode') { - anesthesiaModeAllowBlank = false; - } - if (fieldName == 'operation') { - operationNameAllowBlank = false; - } - if (fieldName == 'operationScheduleId') { - operationScheduleIdAllowBlank = false; - } - if (fieldName == 'operationTime') { - operationTimeAllowBlank = false; - } - if (fieldName == 'visitId') { - visitIdAllowBlank = false; - } - if (fieldName == 'specialInfection') { - specialInfectionAllowBlank = false; - } - if (fieldName == 'doctorAccountDepart') { - doctorAccountDepartAllowBlank = false; - } - if (fieldName == 'remark') { - remarkAllowBlank = false; - } - } - } + var allowBlankObj = returnFieldAllowBlankObj('notAllowBlankFieldsOnUseRecordPage'); + //住院号 + hospitalNumAllowBlank = allowBlankObj.hospitalNum; + //诊疗号 + treatmentNumAllowBlank = allowBlankObj.treatmentNum; + //洗手护士 + washHandNurseAllowBlank = allowBlankObj.washHandNurse; + //巡回护士 + circuitNurseAllowBlank = allowBlankObj.circuitNurse; + //手术间 + operationRoomAllowBlank = allowBlankObj.operationRoom; + //姓名 + patientNameAllowBlank = allowBlankObj.patientName; + //年龄 + patientAgeAllowBlank = allowBlankObj.patientAge; + //性别 + patientSexAllowBlank = allowBlankObj.patientSex; + //病区 + patientAreaAllowBlank = allowBlankObj.patientArea; + //病人所在科室 + departNameOfpatientAllowBlank = allowBlankObj.departNameOfpatient; + //病室 + roomNumberAllowBlank = allowBlankObj.roomNumber; + //床位 + bedNumberAllowBlank = allowBlankObj.bedNumber; + //身份证 + patientIDCardAllowBlank = allowBlankObj.patientIDCard; + //手术医生 + doctorNameAllowBlank = allowBlankObj.doctorName; + //主刀医生 + surgeonAllowBlank = allowBlankObj.surgeon; + //麻醉医生 + anesthetistAllowBlank = allowBlankObj.anesthetist; + //麻醉方式 + anesthesiaModeAllowBlank = allowBlankObj.anesthesiaMode; + //手术名称 + operationNameAllowBlank = allowBlankObj.operationName; + //手术单号 + operationScheduleIdAllowBlank = allowBlankObj.operationScheduleId; + //手术时间 + operationTimeAllowBlank = allowBlankObj.operationTime; + //住院次数 + visitIdAllowBlank = allowBlankObj.visitId; + //特殊感染类型 + specialInfectionAllowBlank = allowBlankObj.specialInfection; + //主刀医生核算科室 + doctorAccountDepartAllowBlank = allowBlankObj.doctorAccountDepart; + //备注 + remarkAllowBlank = allowBlankObj.remark; } else { hospitalNumAllowBlank = fromDepartmentUseRecord || getBoolValueFromJs('sstsConfig.useRecordHospitalNumAllowBlank', true); washHandNurseAllowBlank = fromDepartmentUseRecord || (sstsConfig.allowAllBlankExceptThreeSpecialFields ? true : getBoolValueFromJs('sstsConfig.useRecordWashHandNurseAllowBlank', false)); circuitNurseAllowBlank = fromDepartmentUseRecord || (sstsConfig.allowAllBlankExceptThreeSpecialFields ? true : getBoolValueFromJs('sstsConfig.useRecordCircuitNurseAllowBlank', false)); operationRoomAllowBlank = fromDepartmentUseRecord || (sstsConfig.allowAllBlankExceptThreeSpecialFields ? true : useRecordOperationRoomAllowBlank) } +//ZJYY-80:使用记录字段别名设置 +var configureObj = replaceName('aliasNameOfUseRecordFields'); +var hospitalNumName = configureObj.hospitalNumber; +var treatmentNumName = configureObj.treatmentNum; +var washHandNurseName = configureObj.washHandNurse; +var circuitNurseName = configureObj.circuitNurse; +var operationRoomName = configureObj.operationRoom; +var patientNameSet = configureObj.patientName; +var patientAgeName = configureObj.patientAge; +var patientSexName = configureObj.patientSex; +var patientAreaName = configureObj.patientArea; +var departNameOfpatientName = configureObj.departNameOfpatient; +var roomNumberName = configureObj.roomNumber; +var bedNumberName = configureObj.bedNumber; +var patientIDCardName = configureObj.patientIDCard; +var doctorNameSet = configureObj.doctorName; +var surgeonName = configureObj.surgeon; +var anesthetistName = configureObj.anesthetist; +var anesthesiaModeName = configureObj.anesthesiaMode; +var operationName = configureObj.operation; +var operationScheduleIdName = configureObj.operationScheduleId; +var operationTimeName = configureObj.operationTime; +var visitIdName = configureObj.visitId; +var specialInfectionName = configureObj.specialInfection; +var doctorAccountDepartName = configureObj.doctorAccountDepart; +var remarkName = configureObj.remark; + +//巡回护士项的标签 +circuitNurseName = sstsConfig.circuitNurseLabelName ? sstsConfig.circuitNurseLabelName : circuitNurseName; + /** * 加急加急级别数据,格式如下: * hasLoaded:true|false, //加载过一次后该值将设为true,后面将不再加载。用于第一次扫物品条码时先进行加载,完成后再调条码接口 @@ -984,7 +983,7 @@ if (patientInfo.operationScheduleId) { top.Ext.getCmp('operationScheduleId').setValue(patientInfo.operationScheduleId); } - if (sstsConfig.enableUseRecordFormExtensionFields && sstsConfig.enableUseRecordFormExtensionFields.contains('主刀医生核算科室')) { + if (sstsConfig.enableUseRecordFormExtensionFields && sstsConfig.enableUseRecordFormExtensionFields.contains(doctorAccountDepartName)) { if (patientInfo.doctorAccountDepartCode && patientInfo.doctorAccountDepart) { top.Ext.getCmp('doctorAccountDepartCode').setValue(patientInfo.doctorAccountDepartCode); top.Ext.getCmp('doctorAccountDepart').setRawValue(patientInfo.doctorAccountDepart); @@ -1112,175 +1111,175 @@ if (!hospitalNumAllowBlank && top.Ext.getCmp('hospitalNum').getValue() == '') { btObj.enable(); top.Ext.getCmp('hospitalNum').focus(); - showResult('住院号不能为空'); + showResult(hospitalNumName + '不能为空'); return result; } if (!treatmentNumAllowBlank && top.Ext.getCmp('treatmentNum').getValue() == '') { btObj.enable(); top.Ext.getCmp('treatmentNum').focus(); - showResult('诊疗号不能为空'); + showResult(treatmentNumName + '不能为空'); return result; } if (!washHandNurseAllowBlank && top.Ext.getCmp('washHandNurse').getValue() == '') { btObj.enable(); top.Ext.getCmp('washHandNurse').focus(); - showResult('洗手护士不能为空'); + showResult(washHandNurseName + '不能为空'); return result; } if (!circuitNurseAllowBlank && top.Ext.getCmp('circuitNurse').getValue() == '') { btObj.enable(); top.Ext.getCmp('circuitNurse').focus(); - showResult(circuitNurseLabelName + '不能为空'); + showResult(circuitNurseName + '不能为空'); return result; } if (!operationRoomAllowBlank && top.Ext.getCmp('operationRoom').getValue() == '') { btObj.enable(); top.Ext.getCmp('operationRoom').focus(); - showResult('手术间不能为空'); + showResult(operationRoomName + '不能为空'); return result; } if (!patientNameAllowBlank && top.Ext.getCmp('patientName').getValue() == '') { btObj.enable(); top.Ext.getCmp('patientName').focus(); - showResult('姓名不能为空'); + showResult(patientNameSet + '不能为空'); return result; } if (!patientAgeAllowBlank && top.Ext.getCmp('patientAge').getValue() == '') { btObj.enable(); top.Ext.getCmp('patientAge').focus(); - showResult('年龄不能为空'); + showResult(patientAgeName + '不能为空'); return result; } if (!patientSexAllowBlank && top.Ext.getCmp('patientSex').getValue() == '') { btObj.enable(); top.Ext.getCmp('patientSex').focus(); - showResult('性别不能为空'); + showResult(patientSexName + '不能为空'); return result; } if (!patientAreaAllowBlank && top.Ext.getCmp('patientArea').getValue() == '') { btObj.enable(); top.Ext.getCmp('patientArea').focus(); - showResult('病区不能为空'); + showResult(patientAreaName + '不能为空'); return result; } if (!departNameOfpatientAllowBlank && top.Ext.getCmp('departNameOfpatient').getValue() == '') { btObj.enable(); top.Ext.getCmp('departNameOfpatient').focus(); - showResult('病人所在科室不能为空'); + showResult(departNameOfpatientName + '不能为空'); return result; } if (!roomNumberAllowBlank && top.Ext.getCmp('roomNumber').getValue() == '') { btObj.enable(); top.Ext.getCmp('roomNumber').focus(); - showResult('病室不能为空'); + showResult(roomNumberName + '不能为空'); return result; } if (!bedNumberAllowBlank && top.Ext.getCmp('bedNumber').getValue() == '') { btObj.enable(); top.Ext.getCmp('bedNumber').focus(); - showResult('床位不能为空'); + showResult(bedNumberName + '不能为空'); return result; } if (!patientIDCardAllowBlank && top.Ext.getCmp('patientIDCard').getValue() == '') { btObj.enable(); top.Ext.getCmp('patientIDCard').focus(); - showResult('身份证不能为空'); + showResult(patientIDCardName + '不能为空'); return result; } if (!doctorNameAllowBlank && top.Ext.getCmp('doctorName').getValue() == '') { btObj.enable(); top.Ext.getCmp('doctorName').focus(); - showResult('手术医生不能为空'); + showResult(doctorNameSet + '不能为空'); return result; } if (!surgeonAllowBlank && top.Ext.getCmp('surgeon').getValue() == '') { btObj.enable(); top.Ext.getCmp('surgeon').focus(); - showResult('主刀医生不能为空'); + showResult(surgeonName + '不能为空'); return result; } if (!anesthetistAllowBlank && top.Ext.getCmp('anesthetist').getValue() == '') { btObj.enable(); top.Ext.getCmp('anesthetist').focus(); - showResult('麻醉医生不能为空'); + showResult(anesthetistName + '不能为空'); return result; } if (!anesthesiaModeAllowBlank && top.Ext.getCmp('anesthesiaMode').getValue() == '') { btObj.enable(); top.Ext.getCmp('anesthesiaMode').focus(); - showResult('麻醉方式不能为空'); + showResult(anesthesiaModeName + '不能为空'); return result; } if (!operationNameAllowBlank && top.Ext.getCmp('operation').getValue() == '') { btObj.enable(); top.Ext.getCmp('operation').focus(); - showResult('手术名称不能为空'); + showResult(operationName + '不能为空'); return result; } if (!operationScheduleIdAllowBlank && top.Ext.getCmp('operationScheduleId').getValue() == '') { btObj.enable(); top.Ext.getCmp('operationScheduleId').focus(); - showResult('手术单号不能为空'); + showResult(operationScheduleIdName + '不能为空'); return result; } if (!operationTimeAllowBlank && top.Ext.getCmp('operationTime').getValue() == '') { btObj.enable(); top.Ext.getCmp('operationTime').focus(); - showResult('手术时间不能为空'); + showResult(operationTimeName + '不能为空'); return result; } if (!visitIdAllowBlank && top.Ext.getCmp('visitId').getValue() == '') { btObj.enable(); top.Ext.getCmp('visitId').focus(); - showResult('住院次数不能为空'); + showResult(visitIdName + '不能为空'); return result; } if (!specialInfectionAllowBlank && top.Ext.getCmp('specialInfection').getValue() == '') { btObj.enable(); top.Ext.getCmp('specialInfection').focus(); - showResult('特殊感染类型不能为空'); + showResult(specialInfectionName + '不能为空'); return result; } if (!doctorAccountDepartAllowBlank && top.Ext.getCmp('doctorAccountDepart').getValue() == '') { btObj.enable(); top.Ext.getCmp('doctorAccountDepart').focus(); - showResult('主刀医生核算科室不能为空'); + showResult(doctorAccountDepartName + '不能为空'); return result; } if (!remarkAllowBlank && top.Ext.getCmp('remark').getValue() == '') { btObj.enable(); top.Ext.getCmp('remark').focus(); - showResult('备注不能为空'); + showResult(remarkName + '不能为空'); return result; } } else { if (getBoolValueFromJs('sstsConfig.useRecordHospitalNumAllowBlank', true) == false && top.Ext.getCmp('hospitalNum').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields) { btObj.enable(); top.Ext.getCmp('hospitalNum').focus(); - showResult('住院号不能为空'); + showResult(hospitalNumName + '不能为空'); return result; } if (getBoolValueFromJs('sstsConfig.useRecordWashHandNurseAllowBlank', false) == false && top.Ext.getCmp('washHandNurse').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields) { btObj.enable(); top.Ext.getCmp('washHandNurse').focus(); - showResult('洗手护士不能为空'); + showResult(washHandNurseName + '不能为空'); return result; } if (getBoolValueFromJs('sstsConfig.useRecordCircuitNurseAllowBlank', false) == false && top.Ext.getCmp('circuitNurse').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields) { btObj.enable(); top.Ext.getCmp('circuitNurse').focus(); - showResult(circuitNurseLabelName + '不能为空'); + showResult(circuitNurseName + '不能为空'); return result; } if (useRecordOperationRoomAllowBlank == false && top.Ext.getCmp('operationRoom').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields) { btObj.enable(); top.Ext.getCmp('operationRoom').focus(); - showResult('手术间不能为空'); + showResult(operationRoomName + '不能为空'); return result; } if (!sstsConfig.noInputTreatmentNumOrHospitalNum && top.Ext.getCmp('treatmentNum').getValue() == '' && top.Ext.getCmp('hospitalNum').getValue() == '' && top.Ext.getCmp('patientName').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields) { btObj.enable(); - showResult('请输入诊疗号或者住院号或者病人姓名'); + showResult('请输入' + treatmentNumName + '或者' + hospitalNumName + '或者' + patientNameSet); return result; } } @@ -2308,7 +2307,7 @@ hidden: fromDepartmentUseRecord, items: [{ xtype: 'textfield', - fieldLabel: '住院号', + fieldLabel: hospitalNumName, id: 'hospitalNum', name: 'hospitalNum', allowBlank: hospitalNumAllowBlank, @@ -2350,7 +2349,7 @@ hidden: fromDepartmentUseRecord || sstsConfig.hideTreatmentNumOfUseRecord, items: [{ xtype: 'textfield', - fieldLabel: '诊疗号', + fieldLabel: treatmentNumName, id: 'treatmentNum', name: 'treatmentNum', allowBlank: treatmentNumAllowBlank, @@ -2399,10 +2398,9 @@ hidden: fromDepartmentUseRecord || sstsConfig.hideWashHandNurseOfUseRecord, items: [{ xtype: 'combo', - fieldLabel: '洗手护士', + fieldLabel: washHandNurseName, id: 'washHandNurse', name: 'washHandNurse', - // disabled : !fillTousseName, queryParam: 'spell', minChars: 0, displayField: 'fullName', @@ -2441,10 +2439,9 @@ hidden: fromDepartmentUseRecord, items: [{ xtype: 'combo', - fieldLabel: circuitNurseLabelName, + fieldLabel: circuitNurseName, id: 'circuitNurse', name: 'circuitNurse', - // disabled : !fillTousseName, queryParam: 'spell', minChars: 0, displayField: 'fullName', @@ -2496,7 +2493,7 @@ hidden: fromDepartmentUseRecord, items: [{ xtype: sstsConfig.onlySelectExistedOperationRoom ? 'combo' : 'textfield', - fieldLabel: '手术间', + fieldLabel: operationRoomName, id: 'operationRoom', name: 'operationRoom', maxLength: 10, @@ -2523,31 +2520,14 @@ }); } } - /* xtype : 'textfield', - fieldLabel : '手术间', - id : 'operationRoom', - name : 'operationRoom', - maxLength:10, - maxLengthText :'长度超过限制,不能保存!', - allowBlank : fromDepartmentUseRecord || (sstsConfig.allowAllBlankExceptThreeSpecialFields ? true : useRecordOperationRoomAllowBlank), - anchor : '96%', - listeners:{ - render : function(c) { - c.getEl().on('keypress', function(e) { - if (e.getKey() == 13) {// - top.Ext.getCmp("hospitalNum").focus(); - } - }); - } - } */ }] }, { layout: 'form', columnWidth: 0.33, hidden: fromDepartmentUseRecord, items: [{ xtype: 'textfield', - fieldLabel: '姓名', + fieldLabel: patientNameSet, maxLength: '100', id: 'patientName', name: 'patientName', @@ -2565,7 +2545,7 @@ hidden: fromDepartmentUseRecord, items: [{ xtype: 'textfield', - fieldLabel: '年龄', + fieldLabel: patientAgeName, maxLength: '10', id: 'patientAge', name: 'patientAge', @@ -2578,7 +2558,7 @@ hidden: fromDepartmentUseRecord, items: [{ xtype: 'combo', - fieldLabel: '性别', + fieldLabel: patientSexName, valueField: 'typeName', displayField: 'typeName', id: 'patientSex', @@ -2601,7 +2581,7 @@ hidden: fromDepartmentUseRecord, items: [{ xtype: 'combo', - fieldLabel: '病区', + fieldLabel: patientAreaName, valueField: 'patientArea', displayField: 'patientArea', id: 'patientArea', @@ -2628,7 +2608,7 @@ id: 'departNameOfpatient', name: 'departNameOfpatient', queryParam: 'spell', - fieldLabel: '病人所在科室', + fieldLabel: departNameOfpatientName, minChars: 0, valueField: 'id', displayField: 'name', @@ -2651,7 +2631,7 @@ hidden: fromDepartmentUseRecord, items: [{ xtype: 'textfield', - fieldLabel: '病室', + fieldLabel: roomNumberName, maxLength: '16', id: 'roomNumber', name: 'roomNumber', @@ -2664,7 +2644,7 @@ hidden: fromDepartmentUseRecord, items: [{ xtype: 'textfield', - fieldLabel: '床位', + fieldLabel: bedNumberName, maxLength: '16', id: 'bedNumber', name: 'bedNumber', @@ -2677,7 +2657,7 @@ hidden: fromDepartmentUseRecord, items: [{ xtype: 'textfield', - fieldLabel: '身份证', + fieldLabel: patientIDCardName, maxLength: '19', id: 'patientIDCard', name: 'patientIDCard', @@ -2692,7 +2672,7 @@ hidden: fromDepartmentUseRecord, items: [{ xtype: 'textfield', - fieldLabel: '手术医生', + fieldLabel: doctorNameSet, maxLength: '16', id: 'doctorName', name: 'doctorName', @@ -2705,7 +2685,7 @@ hidden: fromDepartmentUseRecord || !sstsConfig.showSurgeonOfUseRecord, items: [{ xtype: 'textfield', - fieldLabel: '主刀医生', + fieldLabel: surgeonName, maxLength: '16', id: 'surgeon', name: 'surgeon', @@ -2715,10 +2695,10 @@ }, { layout: 'form', columnWidth: 0.33, - hidden: fromDepartmentUseRecord || !(sstsConfig.enableUseRecordFormExtensionFields && sstsConfig.enableUseRecordFormExtensionFields.contains('麻醉医生')), + hidden: fromDepartmentUseRecord || !(sstsConfig.enableUseRecordFormExtensionFields && sstsConfig.enableUseRecordFormExtensionFields.contains(anesthetistName)), items: [{ xtype: 'textfield', - fieldLabel: '麻醉医生', + fieldLabel: anesthetistName, maxLength: '16', id: 'anesthetist', name: 'anesthetist', @@ -2728,10 +2708,10 @@ }, { layout: 'form', columnWidth: 0.33, - hidden: fromDepartmentUseRecord || !(sstsConfig.enableUseRecordFormExtensionFields && sstsConfig.enableUseRecordFormExtensionFields.contains('麻醉方式')), + hidden: fromDepartmentUseRecord || !(sstsConfig.enableUseRecordFormExtensionFields && sstsConfig.enableUseRecordFormExtensionFields.contains(anesthesiaModeName)), items: [{ xtype: 'textfield', - fieldLabel: '麻醉方式', + fieldLabel: anesthesiaModeName, maxLength: '16', id: 'anesthesiaMode', name: 'anesthesiaMode', @@ -2744,7 +2724,7 @@ hidden: fromDepartmentUseRecord, items: [{ xtype: 'combo', - fieldLabel: "手术名称", + fieldLabel: operationName, queryParam: 'spell', minChars: 0, valueField: 'operationName', @@ -2767,7 +2747,7 @@ hidden: fromDepartmentUseRecord, items: [{ xtype: 'textfield', - fieldLabel: '手术单号', + fieldLabel: operationScheduleIdName, maxLength: '16', id: 'operationScheduleId', name: 'operationScheduleId', @@ -2780,7 +2760,7 @@ hidden: fromDepartmentUseRecord, items: [{ xtype: 'datefieldWithMin', - fieldLabel: '手术时间', + fieldLabel: operationTimeName, id: 'operationTime', name: 'operationTime', altFormats: 'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', @@ -2795,7 +2775,7 @@ hidden: fromDepartmentUseRecord, items: [{ xtype: 'numberfield', - fieldLabel: '住院次数', + fieldLabel: visitIdName, id: 'visitId', name: 'visitId', allowBlank: visitIdAllowBlank, @@ -2879,7 +2859,7 @@ hidden: fromDepartmentUseRecord, items: [{ xtype: 'combo', - fieldLabel: '特殊感染类型', + fieldLabel: specialInfectionName, valueField: 'specialInfection', displayField: 'specialInfection', id: 'specialInfection', @@ -2901,7 +2881,7 @@ layout: 'form', columnWidth: 0.33, labelWidth: 120, - hidden: !(sstsConfig.enableUseRecordFormExtensionFields && sstsConfig.enableUseRecordFormExtensionFields.contains('主刀医生核算科室')), + hidden: !(sstsConfig.enableUseRecordFormExtensionFields && sstsConfig.enableUseRecordFormExtensionFields.contains(doctorAccountDepartName)), items: [{ xtype: 'hidden', id: 'doctorAccountDepartCode', @@ -2911,7 +2891,7 @@ id: 'doctorAccountDepart', name: 'doctorAccountDepart', queryParam: 'spell', - fieldLabel: '主刀医生核算科室', + fieldLabel: doctorAccountDepartName, minChars: 0, valueField: 'id', displayField: 'name', @@ -2956,7 +2936,7 @@ columnWidth: 1, items: [{ xtype: 'textfield', - fieldLabel: '备注', + fieldLabel: remarkName, id: 'remark', name: 'remark', anchor: '97%', Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp =================================================================== diff -u -r29513 -r33259 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp (.../useRecordItemView.jsp) (revision 29513) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp (.../useRecordItemView.jsp) (revision 33259) @@ -22,6 +22,7 @@ +