Index: ssts-web/src/main/webapp/disinfectsystem/config/cdswyyy/config.js
===================================================================
diff -u -r18836 -r19041
--- ssts-web/src/main/webapp/disinfectsystem/config/cdswyyy/config.js	(.../config.js)	(revision 18836)
+++ ssts-web/src/main/webapp/disinfectsystem/config/cdswyyy/config.js	(.../config.js)	(revision 19041)
@@ -31,10 +31,12 @@
   //提交申请单前显示申请的物品清单
   showAppliedGoodsBeforeSubmit : true,
   // 隐藏使用记录的洗手护士域
-  hideWashHandNurseOfUseRecord : true,
+  hideWashHandNurseOfUseRecord : false,
   useRecordWashHandNurseAllowBlank : true,
   // 隐藏使用记录的诊疗号域
   hideTreatmentNumOfUseRecord : false,
+  //是否显示主刀医生
+  showSurgeonOfUseRecord : true,
   // 使用记录审核方式， 1: 审核和转换按钮分开； 2：审核和转换按钮合并为1个
   useRecordAuditMode : 2,
   // 隐藏申请科室
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r19021 -r19041
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 19021)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 19041)
@@ -577,7 +577,7 @@
 	top.Ext.getCmp('depart').enable();
 	setFormParams(formObj.form, [ 'id', 'washHandNurse','circuitNurse', 'operationRoom','treatmentNum', 
 	                              'hospitalNum', 'patientName','patientAge', 'patientSex', 'roomNumber',
-	                              'bedNumber', 'patientIDCard', 'doctorName','operationName','specialInfection','operationTime','operationScheduleId', 'remark' ]);
+	                              'bedNumber', 'patientIDCard', 'doctorName', 'surgeon','operationName','specialInfection','operationTime','operationScheduleId', 'remark' ]);
 	// 设置表单上的item参数(因为struts2版本会对前台传过来日期的时分秒部分截掉,所以手术时间需要单独传)
 	setFormItems(tousseInstanceStore);
 	formObj.form.submit( {
@@ -1476,6 +1476,19 @@
 				}]
 			}, {
 				layout : 'form',
+				columnWidth : 0.33,
+				hidden : !sstsConfig.showSurgeonOfUseRecord,
+				items : [{
+					xtype : 'textfield',
+					fieldLabel : '主刀医生',
+					maxLength : '16',
+					id : 'surgeon',
+					name : 'surgeon',
+					allowBlank : true,
+					anchor : '96%'
+				}]
+			}, {
+				layout : 'form',
 				columnWidth : 0.66,
 				items : [{
 					xtype : 'combo',
@@ -1801,7 +1814,7 @@
 				// 保存原始数据,只需要保存需要修改的属性
 				setOriginalFormParams(form, [ 'id', 'washHandNurse','circuitNurse', 'operationRoom','treatmentNum', 
 				                              'hospitalNum', 'patientName','patientAge', 'patientSex', 'roomNumber',
-				                              'bedNumber', 'patientIDCard', 'doctorName','operationName','specialInfection', 'remark' ]);
+				                              'bedNumber', 'patientIDCard', 'doctorName', 'surgeon','operationName','specialInfection', 'remark' ]);
 			},
 			failure : function(form, action) {
 
Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r18834 -r19041
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 18834)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 19041)
@@ -813,6 +813,9 @@
 		
 		//visitId
 		curUseRecord.setVisitId(modified.getVisitId());
+		
+		//surgeon 主刀医生
+		curUseRecord.setSurgeon(modified.getSurgeon());
 	}
 	
 	private void saveUseRecord_internal(UseRecord modified) {
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
===================================================================
diff -u -r18834 -r19041
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java	(.../UseRecord.java)	(revision 18834)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java	(.../UseRecord.java)	(revision 19041)
@@ -72,6 +72,8 @@
 	
 	private String doctorName;//医生姓名
 	
+	private String surgeon;//主刀医生
+	
 	private String operation;//手术名称
 	
 	private String operationRoom;//手术间
@@ -427,6 +429,14 @@
 		this.doctorName = doctorName;
 	}
 
+	public String getSurgeon() {
+		return surgeon;
+	}
+
+	public void setSurgeon(String surgeon) {
+		this.surgeon = surgeon;
+	}
+
 	public String getOperation() {
 		return operation;
 	}
@@ -561,9 +571,10 @@
 		jsonObject.put("depart", getDepart());
 		jsonObject.put("departCoding", getDepartCoding());
 		jsonObject.put("doctorName", getDoctorName());
+		jsonObject.put("surgeon", getSurgeon());
 		jsonObject.put("editTime", getEditTime());
 		jsonObject.put("enteringDate", getEnteringDate());
-		jsonObject.put("kospitalNum", getHospitalNum());
+		jsonObject.put("hospitalNum", getHospitalNum());
 		jsonObject.put("operation", getOperation());
 		jsonObject.put("operationRoom", getOperationRoom());
 		jsonObject.put("operationScheduleId", getOperationScheduleId());