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

controllers/his_api_controller.go

@@ -3241,8 +3241,8 @@ func (c *HisApiController) CreateHisPrescription() {
 					timeLayout := "2006-01-02"
 					loc, _ := time.LoadLocation("Local")
 					theTime2, err := time.ParseInLocation(timeLayout+" 15:04", preTime, loc)
-					result := strings.Split(preTime, " ")
-					theTime3, _ := time.ParseInLocation(timeLayout, result[0], loc)
+					//result := strings.Split(preTime, " ")
+					theTime3, _ := time.ParseInLocation(timeLayout, record_date, loc)
 					if err != nil {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 						return
@@ -4421,8 +4421,8 @@ func (c *HisApiController) CreateHisPrescription() {
 					timeLayout := "2006-01-02"
 					loc, _ := time.LoadLocation("Local")
 					theTime2, err := time.ParseInLocation(timeLayout+" 15:04", preTime, loc)
-					result := strings.Split(preTime, " ")
-					theTime3, _ := time.ParseInLocation(timeLayout, result[0], loc)
+					//result := strings.Split(preTime, " ")
+					theTime3, _ := time.ParseInLocation(timeLayout, record_date, loc)
 					if err != nil {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 						return

controllers/statistics_api_controller.go

@@ -117,6 +117,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)
+	fmt.Println(data)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list":  data,
 		"total": total,
@@ -149,18 +150,25 @@ func (c *StatisticsApiController) GetPatientBP() {
 		}
 		endTime = theTime.Unix()
 	}
-	fmt.Println(startTime)
-	fmt.Println(endTime)
+	if statistics_type == 1 {
+		item, _ := service.GetNewDialysisBPDetailTableTenThree(c.GetAdminUserInfo().CurrentOrgId, startTime, endTime)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": item,
+		})
+	} else {
+		item, _ := service.GetNewDialysisBPDetailTableTenFour(c.GetAdminUserInfo().CurrentOrgId, startTime, endTime)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": item,
+		})
+	}
 
-	item, _ := service.GetNewDialysisBloodChartData(c.GetAdminUserInfo().CurrentOrgId, startTime, endTime, statistics_type)
-	c.ServeSuccessJSON(map[string]interface{}{
-		"list": item,
-	})
 }
 func (c *StatisticsApiController) GetPatientBPDetail() {
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
 	add_type, _ := c.GetInt64("status_type")
+	statistics_type, _ := c.GetInt64("statistics_type")
+
 	page, _ := c.GetInt64("page")
 	limit, _ := c.GetInt64("limit")
 
@@ -186,7 +194,17 @@ func (c *StatisticsApiController) GetPatientBPDetail() {
 		}
 		endTime = theTime.Unix()
 	}
-	data, total, _ := service.GetNewDialysisBPDetailTableTen(c.GetAdminUserInfo().CurrentOrgId, startTime, endTime, add_type, page, limit)
+	var data []service.DialysisDataThree
+	var total int64
+
+	if statistics_type == 1 {
+		data, total, _ = service.GetNewDialysisBPDetailTableTen(c.GetAdminUserInfo().CurrentOrgId, startTime, endTime, add_type, page, limit)
+
+	} else {
+
+		data, total, _ = service.GetNewDialysisBPDetailTableTenOne(c.GetAdminUserInfo().CurrentOrgId, startTime, endTime, add_type, page, limit)
+
+	}
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list":  data,
 		"total": total,