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 = 10028
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -54,13 +54,13 @@ 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/sz_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_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 = "sz_prd_yjyy"
 #gdyb_paasid = "zq_prd_yjyy"
 
 

controllers/sg/his_api_controller.go

@@ -5462,6 +5462,12 @@ func (c *HisApiController) GetPreUploadInfo() {
 						} else {
 							order.MedType = res.Output.Setlinfo.MedType
 						}
+						if reg_type == 1112 {
+							order.MedType = "1112"
+						}
+						if reg_type == 1111 {
+							order.MedType = "1111"
+						}
 						order.MedfeeSumamt = res.Output.Setlinfo.MedfeeSumamt
 						order.FulamtOwnpayAmt = res.Output.Setlinfo.FulamtOwnpayAmt
 						order.OverlmtSelfPay = res.Output.Setlinfo.OverlmtSelfpay