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

conf/app.conf

@@ -52,9 +52,11 @@ sso_domain = https://sso.kuyicloud.com
 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"
+#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.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"
@@ -62,6 +64,9 @@ gdyb_paasid = "sg03_prd"
 #gdyb_paasid = "zq_prd_yjyy"
 
 
+
+
+
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = syh

controllers/sg/his_api_controller.go

@@ -3315,8 +3315,17 @@ func (c *HisApiController) GetUploadInfo() {
 							total = total + (subItem.Price * float64(subItem.Count))
 						}
 					}
+					var allTotal string
+					if adminUser.CurrentOrgId == 9919 {
+
+						allTotal = fmt.Sprintf("%.2f", total)
+
+					} else {
+
+						allTotal = fmt.Sprintf("%.4f", total)
+
+					}
 
-					allTotal := fmt.Sprintf("%.4f", total)
 					if res.Infcode == 0 {
 						var rf []*ResultFive
 						json.Unmarshal([]byte(his.Iinfo), &rf)