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

@@ -93,6 +93,7 @@ func (c *StatisticsApiController) GetPatientWeightDetail() {
 	after_type, _ := c.GetInt64("after_type")
 	page, _ := c.GetInt64("page")
 	limit, _ := c.GetInt64("limit")
+	keyword := c.GetString("keyword")
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -116,7 +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)
+	data, total, _ := service.GetNewDialysisWeightDetailTableTen(c.GetAdminUserInfo().CurrentOrgId, startTime, endTime, add_type, dry_type, after_type, page, limit, keyword)
 	fmt.Println(data)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list":  data,

service/export_data_service.go

@@ -126,7 +126,7 @@ func GetHisOrderDetailFor390(start_time string, end_time string, org_id int64) (
 	return
 }
 func GetHisOrderByTime(patient_id int64, start_time string, end_time string) (order []models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("patient_id = ? AND status = 1 and order_status = 2 and setl_time >= ? and setl_time <= ?", patient_id, start_time+" 00:00:00", end_time+" 23:59:00").Find(&order).Error
+	err = readDb.Model(&models.HisOrder{}).Where("patient_id = ? AND status = 1 and order_status = 2 and  FROM_UNIXTIME(settle_accounts_date)  >= ? and FROM_UNIXTIME(settle_accounts_date) <= ?", patient_id, start_time+" 00:00:00", end_time+" 23:59:00").Find(&order).Error
 	return
 }
 

service/statistis_qc_service.go

@@ -2090,12 +2090,11 @@ func GetNewDialysisWeightDetailTableTen(
 	user_org_id int64,
 	start_time int64,
 	end_time int64,
-	addType, dryType, afterType, page, limit int64,
-) ([]DialysisDataTwo, int64, error) {
+	addType, dryType, afterType, page, limit int64, keyword string) ([]DialysisDataTwo, int64, error) {
 	offset := (page - 1) * limit
 	//var dialysisData []DialysisDataTwo
 	var total int64
-
+	keyword = "%" + keyword + "%"
 	// 构建基本查询
 	query := readDb.Table("xt_assessment_before_dislysis b").
 		Select(`
@@ -2159,7 +2158,7 @@ func GetNewDialysisWeightDetailTableTen(
                ELSE '其他'
            END AS weight_status
        `).
-		Joins("left JOIN xt_patients p ON p.id = b.patient_id").
+		Joins("JOIN xt_patients p ON p.id = b.patient_id and p.name like ?", keyword).
 		Joins("left JOIN xt_assessment_after_dislysis a ON p.id = a.patient_id AND b.assessment_date = a.assessment_date AND a.status = 1").
 		Where("b.user_org_id = ?", user_org_id).
 		Where("b.assessment_date >= ?", start_time).