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 = 10106
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,12 +53,12 @@ call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 #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/gdyb_api/prd/hsa/hgs/"
 #gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #内蒙古
-gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
-gdyb_paasid = "sg03_prd"
-#gdyb_paasid = "jm_sc_yjyy"
+# gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
+# gdyb_paasid = "sg03_prd"
+gdyb_paasid = "jm_sc_yjyy"
 #gdyb_paasid="zh_prd_yjyy"
 #gdyb_paasid = "sz_prd_yjyy"
 #gdyb_paasid = "zq_prd_yjyy"

controllers/sg/his_api_controller.go

@@ -3145,6 +3145,12 @@ func (c *HisApiController) GetRegisterInfo() {
 			if len(insutypes) == 2 {
 				insutype = med_type
 			}
+
+			if len(med_type) > 0 {
+
+				insutype = med_type
+			}
+
 			for _, item := range rf {
 				if item.Insutype == insutype {
 					insuplc_admdvs = item.InsuplcAdmdvs
@@ -3854,6 +3860,7 @@ func (c *HisApiController) GetUploadInfo() {
 							insutype = strconv.FormatInt(his.SocialType, 10)
 						}
 
+						insutype = strconv.FormatInt(his.SocialType, 10)
 						//insutype = "390"
 						if his.IdCardType == 1 {
 							// cert_no = his.MedicalInsuranceNumber