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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9532
-runmode = dev
+runmode = prod
 
 #
 copyrequestbody = true
@@ -44,7 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 3877
+org_id = 9919
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sg/his_api_controller.go

@@ -47,12 +47,15 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/org/info", &HisApiController{}, "get:GetOrgInfo")
 	beego.Router("/api/testcard", &HisApiController{}, "get:TestGetBasBaseInfo")
 
-	beego.Router("/api/testpay", &HisApiController{}, "get:TestPay")
+	//beego.Router("/api/testpay", &HisApiController{}, "get:TestPay")
 
 	beego.Router("/api/pre_upload/get", &HisApiController{}, "get:GetPreUploadInfo")
 
 	beego.Router("/api/settle/get", &HisApiController{}, "get:GetSettleInfo")
 
+	beego.Router("/api/310", &HisApiController{}, "get:Check310")
+	beego.Router("/api/390", &HisApiController{}, "get:Check390")
+
 }
 
 //func (c *HisApiController) TestPay() {
@@ -2845,6 +2848,117 @@ func (c *HisApiController) GetCheckAccount() {
 	}
 }
 
+func (c *HisApiController) Check310() {
+
+	adminUser := c.GetAdminUserInfo()
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+
+	var user_name string
+	user_name = "张俊杰"
+	api := "http://127.0.0.1:9532/" + "gdyb/ten?" +
+		"insutype=" + "310" +
+		"&clr_type=" + "11" +
+		"&setl_optins=" + "定点医保中心" +
+		"&stmt_begndate=" + "2021-03-01" +
+		"&stm_enddate=" + "2021-03-31" +
+		"&medfee_sumamt=" + "11521" +
+		"&fund_pay_sumamt=" + "10166.66" +
+		"&acct_pay=" + "0" +
+		"&fixmedins_setl_cnt=" + "7" +
+		"&fixmedins_code=" + miConfig.Code +
+		"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
+		"&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
+		"&secret_key=" + miConfig.SecretKey +
+		"&org_name=" + miConfig.OrgName +
+		"&doctor=" + user_name
+
+	fmt.Println(api)
+	resp, requestErr := http.Get(api)
+	if requestErr != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	body, ioErr := ioutil.ReadAll(resp.Body)
+	fmt.Println(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
+	}
+
+	respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+	userJSONBytes, _ := json.Marshal(respJSON)
+
+	var res ResultEight
+	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+}
+func (c *HisApiController) Check390() {
+
+	adminUser := c.GetAdminUserInfo()
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+
+	var user_name string
+	user_name = "张俊杰"
+	api := "http://127.0.0.1:9532/" + "gdyb/ten?" +
+		"insutype=" + "390" +
+		"&clr_type=" + "11" +
+		"&setl_optins=" + "定点医保中心" +
+		"&stmt_begndate=" + "2021-03-01" +
+		"&stm_enddate=" + "2021-03-31" +
+		"&medfee_sumamt=" + "209318.43" +
+		"&fund_pay_sumamt=" + "188029.12" +
+		"&acct_pay=" + "0" +
+		"&fixmedins_setl_cnt=" + "48" +
+		"&fixmedins_code=" + miConfig.Code +
+		"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
+		"&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
+		"&secret_key=" + miConfig.SecretKey +
+		"&org_name=" + miConfig.OrgName +
+		"&doctor=" + user_name
+
+	fmt.Println(api)
+	resp, requestErr := http.Get(api)
+	if requestErr != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	body, ioErr := ioutil.ReadAll(resp.Body)
+	fmt.Println(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
+	}
+
+	respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+	userJSONBytes, _ := json.Marshal(respJSON)
+
+	var res ResultEight
+	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+}
+
 //对账明细
 func (c *HisApiController) GetCheckDetailAccount() {
 	start_time := c.GetString("start_time")

routers/router.go

@@ -1,7 +1,8 @@
 package routers
 
 import (
-	"gdyb/controllers/sz"
+	"gdyb/controllers/sg"
+	//"gdyb/controllers/sz"
 	//"gdyb/controllers/sz"
 	//admin_api "XT_New/controllers/admin_api_controllers"
 	"github.com/astaxie/beego"
@@ -19,8 +20,8 @@ func init() {
 		AllowCredentials: true,
 	}))
 
-	//sg.HisManagerApiRegistRouters()
-	//sg.GdybRegistRouters()
-	sz.SZHisManagerApiRegistRouters()
+	sg.HisManagerApiRegistRouters()
+	sg.GdybRegistRouters()
+	//sz.SZHisManagerApiRegistRouters()
 
 }