Index: ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
===================================================================
diff -u -r36752 -r41073
--- ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js	(.../config.js)	(revision 36752)
+++ ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js	(.../config.js)	(revision 41073)
@@ -169,6 +169,8 @@
   toussePicturesShow:true,
    //PDA按器械包进行科室签收的版本
   departmentSignByTousseVersionForPDA:2,
+  //清洗消毒的控件格式
+  controlFormatInWashanddisinfect:[{"personInCharge":1}],
   //禁用基数限制
   disableCardinalNumLimit: true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r39851 -r41073
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 39851)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 41073)
@@ -52,6 +52,17 @@
 	enableCollapse = true;
 }
 
+//CDSLQYQYYY-143:清洗责任人增加下拉选择填写方式
+var personInCharge = 0;
+if(sstsConfig.controlFormatInWashanddisinfect && sstsConfig.controlFormatInWashanddisinfect.length > 0){
+	var controlFormatInWashanddisinfect = sstsConfig.controlFormatInWashanddisinfect;
+	controlFormatInWashanddisinfect.forEach(function(item,index){
+		if(item['personInCharge']){
+			personInCharge = item['personInCharge'];
+		}
+	})
+}
+
 var materialCm = new Ext.grid.ColumnModel([
 	{ header: 'id', dataIndex: 'id', hidden: true },
 	{ header: "名称", dataIndex: 'name', width: 170, menuDisabled: true },
@@ -987,6 +998,22 @@
 		}
 	}
 
+	var userReader = new Ext.data.JsonReader({
+		fields: [
+			{ name: 'id' },
+			{ name: 'fullName' },
+			{ name: 'orgUnitName' }
+		]
+	});
+
+	var departUsersStore = new Ext.data.Store({
+		proxy: new Ext.data.HttpProxy({
+			url: WWWROOT + '/systemmanage/user/userAction!loadUsersBySearchString.do?searchDisableUser=false',
+			method: 'POST'
+		}),
+		reader: userReader
+	});
+
 	formObj = new top.Ext.FormPanel({
 		id: 'washForm',
 		frame: true,
@@ -1110,12 +1137,13 @@
 						}, {
 							columnWidth: 0.5,
 							layout: 'form',
+							hidden:personInCharge == 1,
 							items: [{
 								xtype: 'textfield',
 								fieldLabel: "责任人",
-								name: "personInCharge",
+								id: personInCharge == 1 ? "personInCharge2" : "personInCharge",
+								name: personInCharge == 1 ? "personInCharge2" : "personInCharge",
 								readOnly: true,
-								id: "personInCharge",
 								anchor: '99%',
 								cls: 'fieldReadOnlyNoRemove',
 								height: 22,
@@ -1127,6 +1155,31 @@
 								}
 							}]
 						}, {
+							columnWidth: 0.5,
+							layout: 'form',
+							hidden: personInCharge !== 1,
+							items: [{
+								xtype: 'combo',
+								fieldLabel: "责任人",
+								id: personInCharge == 1 ? "personInCharge" : "personInCharge2",
+								name: personInCharge == 1 ? "personInCharge" : "personInCharge2",
+								queryParam: 'spell',
+								minChars: 0,
+								valueField: 'fullName',
+								displayField: 'fullName',
+								store: departUsersStore,
+								forceSelection: false,
+								lazyInit: true,
+								triggerAction: 'all',
+								typeAhead: false,
+								anchor: '99%',
+								listeners: {
+									select: function (combo, record, index) {
+										top.Ext.getCmp('personInChargeCode').setValue(record.json.name);
+									}
+								}
+							}]
+						}, {
 							xtype: 'hidden',
 							name: 'personInChargeCode',
 							id: 'personInChargeCode'
@@ -1799,6 +1852,8 @@
 			top.Ext.getCmp('washLoadResult').setValue("1");
 			oldRinserName = action.result.data.disinfectIdentification || '';
 			oldDisinfectProgram = action.result.data.disinfectProgram || '';
+			top.Ext.getCmp('personInCharge').setValue(action.result.data.washPersonInCharge);
+			top.Ext.getCmp('personInChargeCode').setValue(action.result.data.washPersonInChargeCode);
 		},
 		failure: function (form, action) {
 			top.Ext.getCmp('washLoadResult').setValue("-1");