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 = 10138
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -55,22 +55,22 @@ front_end_domain = "https://xt.kuyicloud.com/#"
 #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://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
+gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
 #内蒙古
 # http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service
-gdyb_url = "http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service"
+# gdyb_url = "http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service"
 #韶关
-#gdyb_paasid = "sg03_prd"
+# gdyb_paasid = "sg03_prd"
 #江门
 #gdyb_paasid = "jm_sc_yjyy"
 #珠海
-#gdyb_paasid="zh_prd_yrojyy"
+# gdyb_paasid="zh_prd_yrojyy"
 #深圳
-#gdyb_paasid = "sz_prd_yjyy"
+# gdyb_paasid = "sz_prd_yjyy"
 #肇庆
-#gdyb_paasid = "zq_prd_yjyy"
+# gdyb_paasid = "zq_prd_yjyy"
 
-#gdyb_paasid = "sztest_hosp"
+gdyb_paasid = "sztest_hosp"
 
 
 

controllers/sg/his_api_controller.go

@@ -81,7 +81,28 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/check3102", &HisApiController{}, "get:Check3102")
 
 	beego.Router("/90990", &HisApiController{}, "get:CheckCardPWDTwo")
-	beego.Router("/9001", &HisApiController{}, "get:C")
+	beego.Router("/9001", &HisApiController{}, "get:Get9001")
+
+}
+func (c *HisApiController) Get9001() {
+	adminUser := c.GetAdminUserInfo()
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, 185)
+	result, _ := service.Gdyb9001(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1669)
+
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+	userJSONBytes, _ := json.Marshal(dat)
+	var res models.Result9001
+	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
 
 }
 func (c *HisApiController) Check3101() {
@@ -11412,6 +11433,7 @@ func (c *HisApiController) GetAllopatry() {
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	result, _ := service.Gdyb9001(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1669)
+
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)