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

controllers/sg/his_api_controller.go

@@ -13090,7 +13090,7 @@ func DeleteExtraSpace(s string) string {
 func (c *HisApiController) Post3202() {
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
-	insutype := c.GetString("insutype")
+	//insutype := c.GetString("insutype")
 	clr_type := c.GetString("clr_type")
 	clr_org := c.GetString("clr_optins")
 
@@ -13109,27 +13109,32 @@ func (c *HisApiController) Post3202() {
 	orders, _ := service.GetOrderByTimeFour(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, "390", "", clr_type)
 	orders_two, _ := service.GetOrderByTimeFour(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, "310", "", clr_type)
 
-	fixmedins_setl_cnt := int64(len(orders))
+	//fixmedins_setl_cnt := int64(len(orders))
 	var medfee_sumamt float64
 	var acct_pay float64
 	var fund_pay_sumamt float64
+	for _, item := range orders {
+		medfee_sumamt = medfee_sumamt + item.MedfeeSumamt
+		acct_pay = acct_pay + item.AcctPay
+		fund_pay_sumamt = fund_pay_sumamt + item.FundPaySumamt
+	}
 
 	var medfee_sumamt_two float64
 	var acct_pay_two float64
 	var fund_pay_sumamt_two float64
-	for _, item := range orders {
+	for _, item := range orders_two {
 		medfee_sumamt_two = medfee_sumamt_two + item.MedfeeSumamt
 		acct_pay_two = acct_pay_two + item.AcctPay
 		fund_pay_sumamt_two = fund_pay_sumamt_two + item.FundPaySumamt
 	}
 
-	var user_name string
+	//var user_name string
 	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-	if role.ID == 0 {
-		user_name = "xxx"
-	} else {
-		user_name = role.UserName
-	}
+	//if role.ID == 0 {
+	//	user_name = "xxx"
+	//} else {
+	//	user_name = role.UserName
+	//}
 	var res ResultSix
 	if config.IsOpen == 1 {
 		var bps []models.BusinessParams