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

controllers/sg/his_api_controller.go

@@ -2178,15 +2178,15 @@ func (c *HisApiController) GetUploadInfo() {
 			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
 			bytesData, _ := json.Marshal(data)
 			req, _ := http.NewRequest("POST", "http://192.168.124.4:9532/"+"hbyb/2203", bytes.NewReader(bytesData))