Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sg/his_api_controller.go

@@ -3538,15 +3538,15 @@ func (c *HisApiController) GetPreUploadInfo() {
 		data["doctor"] = roles.UserName
 		data["department"] = department.Name
 		data["org_name"] = miConfig.OrgName
-		data["med_type"] = reg_type
-		data["doctor_id"] = doctor_info.AdminUserId
+		data["med_type"] = strconv.FormatInt(reg_type, 10)
+		data["doctor_id"] = strconv.FormatInt(doctor_info.AdminUserId, 10)
 		data["fixmedins_code"] = miConfig.Code
 		data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
 		data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
 		data["secret_key"] = miConfig.SecretKey
 		data["sick_code"] = sickConfig.CountryCode
 		data["sick_name"] = sickConfig.ClassName
-		data["dept"] = department.ID
+		data["dept"] = strconv.FormatInt(department.ID, 10)
 		data["config"] = config
 
 		fmt.Println(data)