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

controllers/sg/his_api_controller.go

@@ -3126,7 +3126,7 @@ func (c *HisApiController) GetUploadInfo() {
 			data["chrg_bchno"] = chrg_bchno
 			data["org_name"] = miConfig.OrgName
 			data["doctor"] = roles.UserName
-			data["doctor_id"] = roles.AdminUserId
+			data["doctor_id"] = strconv.FormatInt(roles.AdminUserId, 10)
 			data["dept"] = strconv.FormatInt(patientPrescription.Departments, 10)
 			data["fixmedins_code"] = miConfig.Code
 			if (department.ID == 0 && adminUser.CurrentOrgId == 9919) || (department.ID == 0 && adminUser.CurrentOrgId == 10106) {