Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r33051 -r33063 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 33051) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 33063) @@ -4124,8 +4124,7 @@ anchor: '100%' }] }, { - // columnWidth : (sstsConfig.enableBiologicalObserveDate ? 1 : 1), - columnWidth: 1, + columnWidth: sstsConfig.displayPCDMonitoringResultsInTheSterilizationRecordInformation?0.5:1, layout: 'form', labelWidth: 120, items: [{ @@ -4140,12 +4139,31 @@ name: "biologyResult", id: "biologyResult", allowBlank: false, - anchor: '50%' - // anchor : (sstsConfig.enableBiologicalObserveDate ? '100%' : '50%') + anchor: sstsConfig.displayPCDMonitoringResultsInTheSterilizationRecordInformation?'100%':'50%' }] }, { columnWidth: .5, layout: 'form', + labelWidth: 120, + hidden:!sstsConfig.displayPCDMonitoringResultsInTheSterilizationRecordInformation, + items: [{ + xtype: 'combo', + fieldLabel: "PCD监测结果", + disabled: true, + readOnly: true, + valueField: 'value', + displayField: 'value', + store: monitorResutlStore, + triggerAction: 'all', + mode: 'local', + name: "pcdMonitoringResult", + id: "pcdMonitoringResult", + allowBlank: true, + anchor: '100%' + }] + }, { + columnWidth: .5, + layout: 'form', cls: 'edit-5char-labelwidth', labelWidth: 120, items: [{ @@ -5008,6 +5026,9 @@ if (sr.sterilizer.allowSelectBiologicalResult == "否") { top.Ext.getCmp('biologyResult').disable(); } + if(sstsConfig.displayPCDMonitoringResultsInTheSterilizationRecordInformation){ + top.Ext.getCmp('pcdMonitoringResult').enable(); + } _biologicalMonitoringTime = sr.sterilizer.biologicalMonitoringTime * 60 * 1000; //此灭菌炉的生物监测持续时间 top.Ext.getCmp('biologicalObserveDate').setValue(formatDateYear(sr.biologicalObserveDate)); //生物监测的观察时间 top.Ext.getCmp('biologicalMonitoringStartDate').setValue(formatDateYear(sr.biologicalMonitoringStartDate)); //生物监测的开始时间 Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js =================================================================== diff -u -r33051 -r33063 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js (.../sterilizationMonitoring.js) (revision 33051) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js (.../sterilizationMonitoring.js) (revision 33063) @@ -59,6 +59,10 @@ var controlTubeResult = top.Ext.getCmp('controlTubeResult').getValue(); var controlBatchNum = top.Ext.getCmp('controlBatchNum').getValue(); var controlTubeExpiryDate = top.Ext.getCmp('controlTubeExpiryDate').getValue(); + var pcdMonitoringResult = ''; + if(sstsConfig.displayPCDMonitoringResultsInTheSterilizationRecordInformation){ + pcdMonitoringResult = top.Ext.getCmp('pcdMonitoringResult').getValue(); + } if (sstsConfig.monitorCheckerMustFill) { //保存时,需要填写监测核对员 if (sstsConfig.needMonitorAuditor) { //如果有监测审核员也要填写 if (""==monitorUser) { @@ -117,7 +121,7 @@ } var bioreaderId = top.Ext.getCmp('bioreaderId').getValue(); SterilizationRecordTableManager.saveMonitorResult(bioreaderId,id,physicsResult,chemistryResult,biologyResult,cycleCounter,biologicalObserveDateString,biologicalMonitoringStartDateString,biologicalMonitoringEndDateString,monitorUser,monitorChecker,monitorAuditor,remark, - cardPosition,monitoringTubeResult,monitoringBatchNum,monitoringTubeExpiryDate,cardPositionOfControlTube,controlTubeResult,controlBatchNum,controlTubeExpiryDate,function(result){ + cardPosition,monitoringTubeResult,monitoringBatchNum,monitoringTubeExpiryDate,cardPositionOfControlTube,controlTubeResult,controlBatchNum,controlTubeExpiryDate,pcdMonitoringResult,function(result){ if(result.success){ if(sstsConfig.enableSterilizerSafetyCheckBeforeRunAndSterilizerRunLogSheetRegistrationFunction){ saveFormParams(id,safetyCheckFormInstanceInfo,runTableRecordFormInstanceInfo); Index: ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js =================================================================== diff -u -r31037 -r33063 --- ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js (.../config.js) (revision 31037) +++ ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js (.../config.js) (revision 33063) @@ -124,6 +124,8 @@ allowEditForeignTousseTousseName:true, //外来器械申请单不能直接增加新包 onlySelectExistedForeignTousse:true, + //灭菌记录里显示【PCD监测结果】字段 + displayPCDMonitoringResultsInTheSterilizationRecordInformation:true, //禁用基数限制 disableCardinalNumLimit: true } \ No newline at end of file