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

controllers/sg/his_api_controller.go

@@ -8952,14 +8952,14 @@ func (c *HisApiController) GetCheckAccount() {
 	adminUser := c.GetAdminUserInfo()
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
-	//if len(clr_org) == 0 {
-	//	clr_org = miConfig.MdtrtareaAdmvs
-	//}
+	if len(clr_org) == 0 {
+		clr_org = miConfig.MdtrtareaAdmvs
+	}
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
-	orders, _ := service.GetOrderByTime(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, clr_org, clr_type)
+	orders, _ := service.GetOrderByTime(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, "", clr_type)
 	fixmedins_setl_cnt := int64(len(orders))
 	var medfee_sumamt float64
 	var acct_pay float64