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

conf/app.conf

@@ -57,10 +57,15 @@ front_end_domain = "https://xt.kuyicloud.com/#"
 # 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_yrojyy"
+#深圳
 # gdyb_paasid = "sz_prd_yjyy"
+#肇庆
 # gdyb_paasid = "zq_prd_yjyy"
 
 

controllers/zh/zh_his_api_controller.go

@@ -1190,7 +1190,22 @@ func (c *ZHHisApiController) GetSettleInfo() {
 			}
 		}
 	}
-	allTotal := fmt.Sprintf("%.2f", total)
+	//allTotal := fmt.Sprintf("%.2f", total)
+
+	var allTotal string
+	if record.OutHospitalStatus == 0 && order.ID == 0 {
+		orders, _ := service.GetHisOrderInfoByNumberFour(record.Number)
+		var total float64
+		for _, item := range orders {
+			total = total + item.DetItemFeeSumamt
+		}
+		allTotal = fmt.Sprintf("%.4f", total)
+
+	} else {
+
+		allTotal = fmt.Sprintf("%.4f", order.MedfeeSumamt)
+
+	}
 	result, src_resquest = service.ZHGdyb2304(record.PsnNo, record.Number, chrg_bchno, cert_no, record.InsutypeType, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "0", record.IdCardType, 0, 0, 0, 0, record.Certificates)
 	//saveLog()
 	saveLog(result, src_resquest, "2304", "住院结算")