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

controllers/sg/his_api_controller.go

@@ -2460,6 +2460,8 @@ func (c *HisApiController) GetSettleInfo() {
 //退款
 func (c *HisApiController) Refund() {
 	order_id, _ := c.GetInt64("order_id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+
 	number := c.GetString("number")
 	record_time := c.GetString("record_time")
 	patient_id, _ := c.GetInt64("patient_id")
@@ -2478,6 +2480,8 @@ func (c *HisApiController) Refund() {
 	var order models.HisOrder
 	order, _ = service.GetHisOrderByID(order_id)
 
+	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+
 	if order.ID == 0 {
 		order, _ = service.GetHisOrderThree(recordDateTime, patient_id, adminUser.CurrentOrgId)
 
@@ -2488,7 +2492,7 @@ func (c *HisApiController) Refund() {
 
 	if config.IsOpen == 1 { //对接了医保，走医保流程
 		api := "http://127.0.0.1:9532/" + "gdyb/nine?psn_no=" + his.PsnNo +
-			"&mdtrt_id=" + his.Number + "&doctor=" + "张俊杰" + "&setl_id=" + order.SetlId + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
+			"&mdtrt_id=" + his.Number + "&doctor=" + roles.UserName + "&setl_id=" + order.SetlId + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
 			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 		resp, requestErr := http.Get(api)
 		if requestErr != nil {
@@ -2513,7 +2517,7 @@ func (c *HisApiController) Refund() {
 		fmt.Println(userJSONBytes)
 
 		api2 := "http://127.0.0.1:9532/" + "gdyb/six?psn_no=" + his.PsnNo +
-			"&mdtrt_id=" + his.Number + "&chrg_bchno=" + order.Number + "&doctor=" + "张俊杰" + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
+			"&mdtrt_id=" + his.Number + "&chrg_bchno=" + order.Number + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
 			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 		resp2, requestErr2 := http.Get(api2)
 		if requestErr2 != nil {
@@ -2601,7 +2605,7 @@ func (c *HisApiController) RefundNumber() {
 	if config.IsOpen == 1 { //对接了医保，走医保流程
 
 		api3 := "http://127.0.0.1:9532/" + "gdyb/three?psn_no=" + his.PsnNo +
-			"&mdtrt_id=" + his.Number + "&ipt_otp_no=" + his.IptOtpNo + "&doctor=" + "张俊杰" + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
+			"&mdtrt_id=" + his.Number + "&ipt_otp_no=" + his.IptOtpNo + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
 			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 		resp3, requestErr3 := http.Get(api3)
 		if requestErr3 != nil {
@@ -2755,7 +2759,7 @@ func (c *HisApiController) GetCheckAccount() {
 	var user_name string
 	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	if role.ID == 0 {
-		user_name = "张俊杰"
+		user_name = "xxx"
 	} else {
 		user_name = role.UserName
 	}
@@ -2850,7 +2854,7 @@ func (c *HisApiController) Check310() {
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 
 	var user_name string
-	user_name = "张俊杰"
+	user_name = "xxx"
 	api := "http://127.0.0.1:9532/" + "gdyb/ten?" +
 		"insutype=" + "310" +
 		"&clr_type=" + "11" +