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

conf/app.conf

 
 
 [prod]
-org_id = 10215
+org_id = 9919
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
 # gdyb_url = "http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service"
 # gdyb_url = "http://19.15.78.136:20001/ebus/gdyb_inf/poc/hsa/hgs/gzzq/"
 #韶关
-# gdyb_paasid = "sg03_prd"
+gdyb_paasid = "sg03_prd"
 #江门
 #gdyb_paasid = "jm_sc_yjyy"
 #珠海
 #深圳
 # gdyb_paasid = "sz_prd_yjyy"
 #肇庆
-gdyb_paasid = "zq_prd_yjyy"
+# gdyb_paasid = "zq_prd_yjyy"
 # gdyb_paasid = "sztest_hosp"
 #广州
 # gdyb_paasid = "gdyb_inf"

controllers/sg/his_api_controller.go

 		if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 			api := "http://192.168.3.111:9532/" + "jsyb/3201?" +
 				"insutype=" + insutype +
-				"&clr_type=" + "11" +
+				"&clr_type=" + clr_type +
 				"&setl_optins=" + clr_org +
 				"&stmt_begndate=" + start_time +
 				"&stm_enddate=" + end_time +
 
 			api := "http://172.16.13.254:9532/" + "nmyb/3201?" +
 				"insutype=" + insutype +
-				"&clr_type=" + "21" +
+				"&clr_type=" + clr_type +
 				"&setl_optins=" + clr_org +
 				"&stmt_begndate=" + start_time +
 				"&stm_enddate=" + end_time +

models/fj_models.go

+package models
+
+type FjCommon struct {
+	Url             string `json:"url"`
+	AppId           string `json:"app_id"`
+	AppSecret       string `json:"app_secret"`
+	Infno           string `json:"infno"`
+	SignKey         string `json:"sign_key"`
+	EncKey          string `json:"enc_key"`
+	MsgId           string `json:"msg_id"`
+	MdtrtAreaAdmdvs string `json:"mdtrt_area_admdvs"`
+	InsuplcAdmdvs   string `json:"insuplc_admdvs"`
+	Opter           string `json:"opter"`
+	OpterType       string `json:"opter_type"`
+	InfTime         string `json:"inf_time"`
+	FixmedinsCode   string `json:"fixmedins_code"`
+	FixmedinsName   string `json:"fixmedins_name"`
+}

routers/router.go

 		AllowCredentials: true,
 	}))
 	sg.HisManagerApiRegistRouters()
-	//sg.GdybRegistRouters()
+	sg.GdybRegistRouters()
 	//hb.HbybRegistRouters()
 	//sz.SZHisManagerApiRegistRouters()
 	zh.ZHHisManagerApiRegistRouters()