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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id =
+org_id = 9919
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,12 +53,12 @@ call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 url = "http://192.168.1.88:6666/szsi-portal/transData"
-#gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
-gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
-#gdyb_paasid = "sg03_prd"
+gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
+#gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
+gdyb_paasid = "sg03_prd"
 #gdyb_paasid = "jm_sc_yjyy"
 #gdyb_paasid = "zh_prd_yjyy"
-gdyb_paasid = "sz_prd_yjyy"
+#gdyb_paasid = "sz_prd_yjyy"
 #gdyb_paasid = "zq_prd_yjyy"
 
 

controllers/sg/his_api_controller.go

@@ -2384,7 +2384,7 @@ func (c *HisApiController) GetUploadInfo() {
 			data["chrg_bchno"] = chrg_bchno
 			data["org_name"] = miConfig.OrgName
 			data["doctor"] = roles.UserName
-			data["doctor_id"] = roles.DoctorNumber
+			data["doctor_id"] = roles.AdminUserId
 			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) {