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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10265
+org_id = 9504
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -54,13 +54,13 @@ 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_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #内蒙古
-gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
-gdyb_paasid = "sg03_prd"
+#gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
+#gdyb_paasid = "sg03_prd"
 #gdyb_paasid = "jm_sc_yjyy"
-#gdyb_paasid = "zh_prd_yjyy"
-#gdyb_paasid = "sz_prd_yjyy"
+#gdyb_paasid="zh_prd_yjyy"
+gdyb_paasid = "sz_prd_yjyy"
 #gdyb_paasid = "zq_prd_yjyy"
 
 

controllers/sg/his_api_controller.go

@@ -3511,7 +3511,7 @@ func (c *HisApiController) GetUploadInfo() {
 				} else {
 
 					if miConfig.Code == "H15049901371" {
-						result, request_log := service.Gdyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10))
+						result, request_log := service.Gdyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), patientPrescription.DoctorId)
 						var dat map[string]interface{}
 						if err := json.Unmarshal([]byte(result), &dat); err == nil {
 							fmt.Println(dat)
@@ -3536,7 +3536,7 @@ func (c *HisApiController) GetUploadInfo() {
 						res.Infcode = infocode
 
 					} else {
-						result, request_log := service.Gdyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10))
+						result, request_log := service.Gdyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), patientPrescription.DoctorId)
 						var dat map[string]interface{}
 						if err := json.Unmarshal([]byte(result), &dat); err == nil {
 							fmt.Println(dat)
@@ -5082,7 +5082,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 			} else {
 
 				if miConfig.Code == "H15049901371" {
-					result, request_log := service.Gdyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, data["dept"].(string), data["fixmedins_code"].(string), data["dept_code"].(string), data["doctor_id"].(string), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["balance_accounts_type"].(string))
+					result, request_log := service.Gdyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, data["dept"].(string), data["fixmedins_code"].(string), data["dept_code"].(string), data["doctor_id"].(string), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["balance_accounts_type"].(string), patientPrescription.DoctorId)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(result), &dat); err == nil {
 						fmt.Println(dat)
@@ -5108,7 +5108,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 					res.Infcode = infocode
 
 				} else {
-					result, request_log := service.Gdyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, data["dept"].(string), data["fixmedins_code"].(string), data["dept_code"].(string), data["doctor_id"].(string), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["balance_accounts_type"].(string))
+					result, request_log := service.Gdyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, data["dept"].(string), data["fixmedins_code"].(string), data["dept_code"].(string), data["doctor_id"].(string), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["balance_accounts_type"].(string), patientPrescription.DoctorId)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(result), &dat); err == nil {
 						fmt.Println(dat)

service/gdyb_service.go

@@ -831,7 +831,7 @@ type Result struct {
 }
 
 //  门诊费用明细信息上传
-func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, balance_accounts_type string) (string, string) {
+func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, balance_accounts_type string, new_doctor_id int64) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -844,14 +844,14 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	var customs []*Custom
 
 	for _, item := range hisPrescription {
-		role, _ := GetAdminUserInfoByID(item.UserOrgId, item.Creator)
+		role, _ := GetAdminUserInfoByID(item.UserOrgId, new_doctor_id)
 
 		if item.Type == 1 { //药品
 			for _, subItem := range item.HisDoctorAdviceInfo {
 				if len(subItem.BaseDrugLib.MedicalInsuranceNumber) > 0 {
 					//var randNum int
 					//randNum = rand.Intn(10000) + 1000
-					role, _ := GetAdminUserInfoByID(item.UserOrgId, item.Creator)
+					role, _ := GetAdminUserInfoByID(item.UserOrgId, new_doctor_id)
 					cus := &Custom{
 						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*subItem.PrescribingNumber),
 						Cut:              fmt.Sprintf("%.4f", subItem.PrescribingNumber),