Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r40493 -r40496 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 40493) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 40496) @@ -5037,6 +5037,9 @@ top.Ext.getCmp("heat").setValue(result.data.scanTousseInstance.sterilizationRecordJSON.frequency); top.Ext.getCmp("sterilizationStartTime").setValue(result.data.scanTousseInstance.sterilizationRecordJSON.startDate); top.Ext.getCmp("sterilizationEndTime").setValue(result.data.scanTousseInstance.sterilizationRecordJSON.endDate); + if (sstsConfig.enableAddingMultipleResponsiblePersons) { + getBarcodeResponsiblePerson('', record.data.sterilizationRecordJSON.sterilizationUser); + } } } @@ -6012,6 +6015,9 @@ } if ((result.data.recyclingRecordJSON.reUser || '') !== '') { top.Ext.getCmp("recyclePerson").disable(); + if (sstsConfig.enableAddingMultipleResponsiblePersons) { + getBarcodeResponsiblePerson('', result.data.recyclingRecordJSON.reUser); + } } if ((result.data.recyclingRecordJSON.reDept || '') !== '') { top.Ext.getCmp("recycleDepartments").disable(); @@ -6063,6 +6069,9 @@ top.Ext.getCmp("heat").setValue(result.data.sterilizationRecordJSON.frequency); top.Ext.getCmp("sterilizationStartTime").setValue(result.data.sterilizationRecordJSON.startDate); top.Ext.getCmp("sterilizationEndTime").setValue(result.data.sterilizationRecordJSON.endDate); + if (sstsConfig.enableAddingMultipleResponsiblePersons) { + getBarcodeResponsiblePerson('', result.data.sterilizationRecordJSON.sterilizationUser); + } } else { showResultQM(result.message); top.Ext.getCmp("sterilizationName").setValue(""); @@ -7011,10 +7020,10 @@ top.Ext.getCmp('cleaningStartTime').setValue(record.startDate); top.Ext.getCmp('cleaningEndTime').setValue(record.endDate); top.Ext.getCmp('scanWashRecord_id').setValue(record.washRecordID); - top.Ext.getCmp('tousseDefinitionId').setValue(record.tousseDefinitionId || ''); - top.Ext.getCmp('tousseName').setValue(record.tousseName || ''); + //top.Ext.getCmp('tousseDefinitionId').setValue(record.tousseDefinitionId || ''); + //top.Ext.getCmp('tousseName').setValue(record.tousseName || ''); if (sstsConfig.enableAddingMultipleResponsiblePersons) { - getBarcodeResponsiblePerson('', record.personInCharge); + getBarcodeResponsiblePerson('', record.operator); } else { top.Ext.getCmp('responsiblePerson').setValue(record.personInCharge); }