Index: ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js =================================================================== diff -u -r37093 -r37094 --- ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 37093) +++ ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 37094) @@ -1494,7 +1494,7 @@ formObj.render("formDiv"); function checkForSave(btObj) { - if (!sstsConfig.noInputTreatmentNumOrHospitalNum && Ext4.getCmp('treatmentNum').getValue() == '' && Ext4.getCmp('hospitalNum').getValue() == '' && Ext4.getCmp('patientName').getValue() == '') { + if (!sstsConfig.noInputTreatmentNumOrHospitalNum && (Ext4.getCmp('treatmentNum').getValue() || '') == '' && (Ext4.getCmp('hospitalNum').getValue() || '') == '' && (Ext4.getCmp('patientName').getValue() || '') == '') { showResult('请输入诊疗号或者住院号或者病人姓名'); return false; } @@ -1506,155 +1506,155 @@ } if (sstsConfig.notAllowBlankFieldsOnUseRecordPage && typeof sstsConfig.notAllowBlankFieldsOnUseRecordPage == 'object') { if (sstsConfig.noInputTreatmentNumOrHospitalNum) { - if (!hospitalNumAllowBlank && Ext4.getCmp('hospitalNum').getValue() == '') { + if (!hospitalNumAllowBlank && (Ext4.getCmp('hospitalNum').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('hospitalNum').focus(); showResult(hospitalNumName + '不能为空'); return false; } - if (!treatmentNumAllowBlank && Ext4.getCmp('treatmentNum').getValue() == '') { + if (!treatmentNumAllowBlank && (Ext4.getCmp('treatmentNum').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('treatmentNum').focus(); showResult(treatmentNumName + '不能为空'); return false; } - if (!patientNameAllowBlank && Ext4.getCmp('patientName').getValue() == '') { + if (!patientNameAllowBlank && (Ext4.getCmp('patientName').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('patientName').focus(); showResult(patientNameSet + '不能为空'); return false; } } else { if (!hospitalNumAllowBlank || !treatmentNumAllowBlank || !patientNameAllowBlank) { - if (!hospitalNumAllowBlank && Ext4.getCmp('hospitalNum').getValue() == '') { + if (!hospitalNumAllowBlank && (Ext4.getCmp('hospitalNum').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('hospitalNum').focus(); showResult(hospitalNumName + '不能为空'); return false; } - if (!treatmentNumAllowBlank && Ext4.getCmp('treatmentNum').getValue() == '') { + if (!treatmentNumAllowBlank && (Ext4.getCmp('treatmentNum').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('treatmentNum').focus(); showResult(treatmentNumName + '不能为空'); return false; } - if (!patientNameAllowBlank && Ext4.getCmp('patientName').getValue() == '') { + if (!patientNameAllowBlank && (Ext4.getCmp('patientName').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('patientName').focus(); showResult(patientNameSet + '不能为空'); return false; } } else { - if (Ext4.getCmp('treatmentNum').getValue() == '' && Ext4.getCmp('hospitalNum').getValue() == '' && Ext4.getCmp('patientName').getValue() == '') { + if ((Ext4.getCmp('treatmentNum').getValue() || '') == '' && (Ext4.getCmp('hospitalNum').getValue() || '') == '' && (Ext4.getCmp('patientName').getValue() || '') == '') { btObj.enable(); showResult('请输入' + treatmentNumName + '或者' + hospitalNumName + '或者' + patientNameSet); return false; } } } - if (!washHandNurseAllowBlank && Ext4.getCmp('washHandNurse').getValue() == '') { + if (!washHandNurseAllowBlank && (Ext4.getCmp('washHandNurse').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('washHandNurse').focus(); showResult(washHandNurseName + '不能为空'); return false; } - if (!circuitNurseAllowBlank && Ext4.getCmp('circuitNurse').getValue() == '') { + if (!circuitNurseAllowBlank && (Ext4.getCmp('circuitNurse').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('circuitNurse').focus(); showResult(circuitNurseName + '不能为空'); return false; } - if (!operationRoomAllowBlank && Ext4.getCmp('operationRoom').getValue() == '') { + if (!operationRoomAllowBlank && (Ext4.getCmp('operationRoom').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('operationRoom').focus(); showResult(operationRoomName + '不能为空'); return false; } - if (!patientAgeAllowBlank && Ext4.getCmp('patientAge').getValue() == '') { + if (!patientAgeAllowBlank && (Ext4.getCmp('patientAge').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('patientAge').focus(); showResult(patientAgeName + '不能为空'); return false; } - if (!patientSexAllowBlank && Ext4.getCmp('patientSex').getValue() == '') { + if (!patientSexAllowBlank && (Ext4.getCmp('patientSex').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('patientSex').focus(); showResult(patientSexName + '不能为空'); return false; } - if (!patientAreaAllowBlank && Ext4.getCmp('patientArea').getValue() == '') { + if (!patientAreaAllowBlank && (Ext4.getCmp('patientArea').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('patientArea').focus(); showResult(patientAreaName + '不能为空'); return false; } - if (!departNameOfpatientAllowBlank && Ext4.getCmp('departNameOfpatient').getValue() == '') { + if (!departNameOfpatientAllowBlank && (Ext4.getCmp('departNameOfpatient').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('departNameOfpatient').focus(); showResult(departNameOfpatientName + '不能为空'); return false; } - if (!roomNumberAllowBlank && Ext4.getCmp('roomNumber').getValue() == '') { + if (!roomNumberAllowBlank && (Ext4.getCmp('roomNumber').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('roomNumber').focus(); showResult(roomNumberName + '不能为空'); return false; } - if (!bedNumberAllowBlank && Ext4.getCmp('bedNumber').getValue() == '') { + if (!bedNumberAllowBlank && (Ext4.getCmp('bedNumber').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('bedNumber').focus(); showResult(bedNumberName + '不能为空'); return false; } - if (!patientIDCardAllowBlank && Ext4.getCmp('patientIDCard').getValue() == '') { + if (!patientIDCardAllowBlank && (Ext4.getCmp('patientIDCard').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('patientIDCard').focus(); showResult(patientIDCardName + '不能为空'); return false; } - if (!doctorNameAllowBlank && Ext4.getCmp('doctorName').getValue() == '') { + if (!doctorNameAllowBlank && (Ext4.getCmp('doctorName').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('doctorName').focus(); showResult(doctorNameSet + '不能为空'); return false; } - if (!surgeonAllowBlank && Ext4.getCmp('surgeon').getValue() == '') { + if (!surgeonAllowBlank && (Ext4.getCmp('surgeon').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('surgeon').focus(); showResult(surgeonName + '不能为空'); return false; } - if (!anesthetistAllowBlank && Ext4.getCmp('anesthetist').getValue() == '') { + if (!anesthetistAllowBlank && (Ext4.getCmp('anesthetist').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('anesthetist').focus(); showResult(anesthetistName + '不能为空'); return false; } - if (!anesthesiaModeAllowBlank && Ext4.getCmp('anesthesiaMode').getValue() == '') { + if (!anesthesiaModeAllowBlank && (Ext4.getCmp('anesthesiaMode').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('anesthesiaMode').focus(); showResult(anesthesiaModeName + '不能为空'); return false; } - if (!operationNameAllowBlank && Ext4.getCmp('operation').getValue() == '') { + if (!operationNameAllowBlank && (Ext4.getCmp('operation').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('operation').focus(); showResult(operationName + '不能为空'); return false; } - if (!operationScheduleIdAllowBlank && Ext4.getCmp('operationScheduleId').getValue() == '') { + if (!operationScheduleIdAllowBlank && (Ext4.getCmp('operationScheduleId').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('operationScheduleId').focus(); showResult(operationScheduleIdName + '不能为空'); return false; } - if (!operationTimeAllowBlank && Ext4.getCmp('operationTime').getValue() == '') { + if (!operationTimeAllowBlank && (Ext4.getCmp('operationTime').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('operationTime').focus(); showResult(operationTimeName + '不能为空'); return false; } - if (!visitIdAllowBlank && Ext4.getCmp('visitId').getValue() == '') { + if (!visitIdAllowBlank && (Ext4.getCmp('visitId').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('visitId').focus(); showResult(visitIdName + '不能为空'); @@ -1666,20 +1666,20 @@ showResult(specialInfectionName + '不能为空'); return false; } - if (!doctorAccountDepartAllowBlank && Ext4.getCmp('doctorAccountDepart').getValue() == '') { + if (!doctorAccountDepartAllowBlank && (Ext4.getCmp('doctorAccountDepart').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('doctorAccountDepart').focus(); showResult(doctorAccountDepartName + '不能为空'); return false; } - if (!remarkAllowBlank && Ext4.getCmp('remark').getValue() == '') { + if (!remarkAllowBlank && (Ext4.getCmp('remark').getValue() || '') == '') { btObj.enable(); Ext4.getCmp('remark').focus(); showResult(remarkName + '不能为空'); return false; } } else { - if (!sstsConfig.noInputTreatmentNumOrHospitalNum && Ext4.getCmp('treatmentNum').getValue() == '' && Ext4.getCmp('hospitalNum').getValue() == '' && Ext4.getCmp('patientName').getValue() == '') { + if (!sstsConfig.noInputTreatmentNumOrHospitalNum && (Ext4.getCmp('treatmentNum').getValue() || '') == '' && (Ext4.getCmp('hospitalNum').getValue() || '') == '' && (Ext4.getCmp('patientName').getValue() || '') == '') { btObj.enable(); showResult('请输入' + treatmentNumName + '或者' + hospitalNumName + '或者' + patientNameSet); return false;