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

controllers/sg/gdyb_controller.go

@@ -24,7 +24,7 @@ func GdybRegistRouters() {
 	beego.Router("/gdyb/six", &GdybController{}, "get:PostSix")
 	beego.Router("/gdyb/seven", &GdybController{}, "get:PostSeven")
 	beego.Router("/gdyb/eight", &GdybController{}, "get:PostEight")
-	beego.Router("/gdyb/nine", &GdybController{}, "get:PostNine")
+	//beego.Router("/gdyb/nine", &GdybController{}, "get:PostNine")
 	beego.Router("/gdyb/ten", &GdybController{}, "get:PostTen")
 	beego.Router("/gdyb/eleven", &GdybController{}, "get:PostEleven")
 	beego.Router("/gdyb/twelve", &GdybController{}, "get:PostTwelve")
@@ -344,35 +344,19 @@ func (c *GdybController) PostEight() {
 	})
 }
 
-func (c *GdybController) PostNine() {
-	psnNo := c.GetString("psn_no")
-	mdtrtId := c.GetString("mdtrt_id")
-	setlId := c.GetString("setl_id")
-	org_name := c.GetString("org_name")
-	doctor := c.GetString("doctor")
-	secret_key := c.GetString("secret_key")
-	fixmedins_code := c.GetString("fixmedins_code")
-	insuplc_admdvs := c.GetString("insuplc_admdvs")
-	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
-	result, src_request := service.Gdyb2208(psnNo, mdtrtId, setlId, org_name, doctor, secret_key, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-		fmt.Println(dat)
-	} else {
-		fmt.Println(err)
-	}
-
-	var dat2 map[string]interface{}
-	if err := json.Unmarshal([]byte(src_request), &dat2); err == nil {
-		fmt.Println(dat2)
-	} else {
-		fmt.Println(err)
-	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"pre":  dat,
-		"pre2": dat2,
-	})
-}
+//func (c *GdybController) PostNine() {
+//	psnNo := c.GetString("psn_no")
+//	mdtrtId := c.GetString("mdtrt_id")
+//	setlId := c.GetString("setl_id")
+//	org_name := c.GetString("org_name")
+//	doctor := c.GetString("doctor")
+//	secret_key := c.GetString("secret_key")
+//	fixmedins_code := c.GetString("fixmedins_code")
+//	insuplc_admdvs := c.GetString("insuplc_admdvs")
+//	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+//	//result, src_request := service.Gdyb2208(psnNo, mdtrtId, setlId, org_name, doctor, secret_key, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+//
+//}
 
 func (c *GdybController) PostTen() {
 	fmt.Println("11222333-----")

controllers/sg/his_api_controller.go

@@ -2637,31 +2637,17 @@ func (c *HisApiController) Refund() {
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 	if config.IsOpen == 1 { //对接了医保，走医保流程
-		api := "http://127.0.0.1:9532/" + "gdyb/nine?psn_no=" + order.PsnNo +
-			"&mdtrt_id=" + order.MdtrtId + "&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 {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		body, ioErr := ioutil.ReadAll(resp.Body)
-		if ioErr != nil {
-			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		var respJSON map[string]interface{}
-		if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+
+		result, src_resquest := service.Gdyb2208(order.PsnNo, order.MdtrtId, roles.UserName, order.SetlId, miConfig.OrgName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
+
+		var dat map[string]interface{}
+		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			fmt.Println(dat)
+		} else {
+			fmt.Println(err)
 		}
-		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-		userJSONBytes, _ := json.Marshal(respJSON)
 
-		respJSON2 := respJSON["data"].(map[string]interface{})["pre2"].(map[string]interface{})
-		userJSONBytes2, _ := json.Marshal(respJSON2)
+		userJSONBytes, _ := json.Marshal(dat)
 
 		var res ResultSixteen
 		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
@@ -2670,28 +2656,18 @@ func (c *HisApiController) Refund() {
 			return
 		}
 		if res.Infcode == 0 {
-			api2 := "http://127.0.0.1:9532/" + "gdyb/six?psn_no=" + order.PsnNo +
-				"&mdtrt_id=" + order.MdtrtId + "&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 {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			body2, ioErr2 := ioutil.ReadAll(resp2.Body)
-			if ioErr2 != nil {
-				utils.ErrorLog("接口返回数据读取失败: %v", ioErr2)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			var respJSON2 map[string]interface{}
-			if err := json.Unmarshal([]byte(string(body2)), &respJSON2); err != nil {
-				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
+
+			result := service.Gdyb2205(order.PsnNo, order.MdtrtId, order.Number, miConfig.OrgName, roles.UserName, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code)
+
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
 			}
-			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-			userJSONBytes, _ := json.Marshal(respJSON)
+
+			userJSONBytes, _ := json.Marshal(dat)
+
 			var res2 ResultSix
 			if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
@@ -2699,7 +2675,7 @@ func (c *HisApiController) Refund() {
 				return
 			}
 			if res2.Infcode == 0 {
-				err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId, string(userJSONBytes2))
+				err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId, src_resquest)
 				if err == nil {
 					c.ServeSuccessJSON(map[string]interface{}{
 						"msg": "退费成功",