Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r15724 -r15811
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 15724)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 15811)
@@ -105,7 +105,14 @@
 	top.Ext4.getCmp('bedNumber').setValue(patientInfo.bedNumber);
 	top.Ext4.getCmp('doctor').setValue(patientInfo.doctorName);
 	top.Ext4.getCmp('surgery').setValue(patientInfo.operation);
-	top.Ext4.getCmp('operationTime').setValue(patientInfo.operationTime);
+	//手术时间需要特殊处理,需要将年和月之间的-符替换成/
+	if(patientInfo.operationTime){
+		try{
+			top.Ext4.getCmp('operationTime').setValue(new Date(patientInfo.operationTime.replace("-","/")));
+		}catch(e){
+			
+		}
+	}
 	top.Ext4.getCmp('ascriptionDepartment').setValue(patientInfo.ascriptionDepartment);
 	top.Ext4.getCmp('operationRoom').setValue(patientInfo.opRoomId);
 	top.Ext4.getCmp('ascriptionDepartment').setValue(patientInfo.ascriptionDepartment);
Index: ssts-web/src/main/resources/config/dgszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r15724 -r15811
--- ssts-web/src/main/resources/config/dgszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 15724)
+++ ssts-web/src/main/resources/config/dgszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 15811)
@@ -14,7 +14,7 @@
 	        h.sfzh as patientIDCard,
 	        i.[手术者] as doctorName,
 	        i.[手术名称] as operation,
-			i.[拟定手术时间] as operationTime,
+			convert(varchar,i.[拟定手术时间],120) operationTime
 			i.[手术间] as opRoomId, 
 			i.[床位] as bedNumber,
 			'' as roomNummber,