Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/statistics_api_controller.go

@@ -45,6 +45,9 @@ func StatisticsApiRegistRouters() {
 	beego.Router("/api/commonqc/dialysistreat/detail", &StatisticsApiController{}, "get:GetDialysisTreatDetail")
 
 	beego.Router("/api/commonqc/patinet/weight", &StatisticsApiController{}, "get:GetPatientWeight")
+
+	beego.Router("/api/commonqc/dryweight/detail", &StatisticsApiController{}, "get:GetPatientDryWeightDetail")
+
 	beego.Router("/api/commonqc/weight/detail", &StatisticsApiController{}, "get:GetPatientWeightDetail")
 	beego.Router("/api/commonqc/patinet/bp", &StatisticsApiController{}, "get:GetPatientBP")
 	beego.Router("/api/commonqc/bp/detail", &StatisticsApiController{}, "get:GetPatientBPDetail")
@@ -82,14 +85,48 @@ func (c *StatisticsApiController) GetPatientWeight() {
 		"list": item,
 	})
 }
+func (c *StatisticsApiController) GetPatientDryWeightDetail() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	dry_type, _ := c.GetInt64("dry_type")
+	page, _ := c.GetInt64("page")
+	limit, _ := c.GetInt64("limit")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		fmt.Println("err-----------", err)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	data, total, _ := service.GetNewDialysisWeightDetailTableTenSix(c.GetAdminUserInfo().CurrentOrgId, startTime, endTime, dry_type, page, limit)
+	fmt.Println(data)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":  data,
+		"total": total,
+	})
+}
+
 func (c *StatisticsApiController) GetPatientWeightDetail() {
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
 	add_type, _ := c.GetInt64("add_type")
 	dry_type, _ := c.GetInt64("dry_type")
-	fmt.Println("dry_type")
-	fmt.Println(dry_type)
-
+	item_type, _ := c.GetInt64("item_type")
 	after_type, _ := c.GetInt64("after_type")
 	page, _ := c.GetInt64("page")
 	limit, _ := c.GetInt64("limit")
@@ -117,7 +154,7 @@ func (c *StatisticsApiController) GetPatientWeightDetail() {
 		}
 		endTime = theTime.Unix()
 	}
-	data, total, _ := service.GetNewDialysisWeightDetailTableTen(c.GetAdminUserInfo().CurrentOrgId, startTime, endTime, add_type, dry_type, after_type, page, limit, keyword)
+	data, total, _ := service.GetNewDialysisWeightDetailTableTenT(c.GetAdminUserInfo().CurrentOrgId, startTime, endTime, add_type, dry_type, after_type, page, limit, keyword, item_type)
 	fmt.Println(data)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list":  data,