提交代码

controllers/statistics_api_controller.go

@@ -169,18 +169,58 @@ func (c *StatisticsApiController) GetDialysisTotal() {
 		case 1:
 			// 按周统计
 			weeks := groupByWeek(dates)
+			fmt.Println(weeks)
 			for _, week := range weeks {
+				// 解析字符串时显式指定时区为 UTC
+				t, err := time.Parse("2006-01-02 15:04:05 -0700 MST", week[0].String())
+				if err != nil {
+					fmt.Println("解析时间出错:", err)
+					return
+				}
+
+				// 格式化时间时将时区设置为 UTC
+				//fmt.Println(t.UTC().Format("2006-01-02 15:04:05"))
+
 				var cus models.CustomDialysisData
-				counts, _ := service.GetNewDialysisCountModeTwo(week[0].Unix(), week[len(week)-1].Unix(), c.GetAdminUserInfo().CurrentOrgId, origin, mode)
+				//week_date := week[0].Format("2006-01-02") + " 00:00:00"
+
+				//date, err := time.Parse("2006-01-02 15:04:05", week_date)
+				//if err != nil {
+				//	fmt.Println("日期解析错误：", err)
+				//	return
+				//}
+
+				// 将time.Time类型转换为时间戳（秒）
+				//week_start := date.Unix()
+
+				// 解析字符串时显式指定时区为 UTC
+				t2, err := time.Parse("2006-01-02 15:04:05 -0700 MST", week[len(week)-1].String())
+				if err != nil {
+					fmt.Println("解析时间出错:", err)
+					return
+				}
+
+				//week_end_date := week[len(week)-1].Format("2006-01-02") + " 00:00:00"
+
+				//end_date, err := time.Parse("2006-01-02 15:04:05", week_end_date)
+				//if err != nil {
+				//	fmt.Println("日期解析错误：", err)
+				//	return
+				//}
+				//
+				//// 将time.Time类型转换为时间戳（秒）
+				//week_end := end_date.Unix()
+
+				counts, _ := service.GetNewDialysisCountModeTwo(t.Unix(), t2.Unix(), c.GetAdminUserInfo().CurrentOrgId, origin, mode)
 				cus.Date = strings.Split(week[0].String(), " ")[0] + "~" + strings.Split(week[len(week)-1].String(), " ")[0]
 				cus.Count = counts.Count
 				cus.Total = p_total
 				cuss = append(cuss, cus)
-				c.ServeSuccessJSON(map[string]interface{}{
-					"list": cuss,
-				})
-			}
 
+			}
+			c.ServeSuccessJSON(map[string]interface{}{
+				"list": cuss,
+			})
 			break
 		case 2:
 			startDate, err := time.Parse("2006-01-02", start_date)
@@ -203,12 +243,11 @@ func (c *StatisticsApiController) GetDialysisTotal() {
 				cus.Count = counts.Count
 				cus.Total = p_total
 				cuss = append(cuss, cus)
-				c.ServeSuccessJSON(map[string]interface{}{
-					"list": cuss,
-				})
 
 			}
-
+			c.ServeSuccessJSON(map[string]interface{}{
+				"list": cuss,
+			})
 			break
 		case 3:
 			// 按月统计
@@ -220,11 +259,12 @@ func (c *StatisticsApiController) GetDialysisTotal() {
 				cus.Count = counts.Count
 				cus.Total = p_total
 				cuss = append(cuss, cus)
-				c.ServeSuccessJSON(map[string]interface{}{
-					"list": cuss,
-				})
+
 				//fmt.Println("Month:", month[0], "~", month[len(month)-1])
 			}
+			c.ServeSuccessJSON(map[string]interface{}{
+				"list": cuss,
+			})
 			break
 		case 4:
 			// 按年统计
@@ -232,14 +272,15 @@ func (c *StatisticsApiController) GetDialysisTotal() {
 			for _, year := range years {
 				var cus models.CustomDialysisData
 				counts, _ := service.GetNewDialysisCountModeTwo(year[0].Unix(), year[len(year)-1].Unix(), c.GetAdminUserInfo().CurrentOrgId, origin, mode)
-				cus.Date = strings.Split(year[0].String(), " ")[0] + "~" + strings.Split(year[len(year)-1].String(), " ")[0]
+				cus.Date = strings.Split(strings.Split(year[0].String(), " ")[0], "-")[0]
 				cus.Count = counts.Count
 				cus.Total = p_total
 				cuss = append(cuss, cus)
-				c.ServeSuccessJSON(map[string]interface{}{
-					"list": cuss,
-				})
+
 			}
+			c.ServeSuccessJSON(map[string]interface{}{
+				"list": cuss,
+			})
 			break
 		}
 	}
@@ -675,10 +716,10 @@ func (c *StatisticsApiController) GetFivePatientInspectionStatistisc() {
 
 	dynamicFields := make([]map[string]interface{}, 0)
 	list, _ := service.GetLatestInspectionValues(c.GetAdminUserInfo().CurrentOrgId, strings.Split(end_date, "-")[0]+"-"+strings.Split(end_date, "-")[1])
-	fmt.Println(list)
+	//fmt.Println(list)
 
 	for _, result := range list {
-		fmt.Println(result)
+		//fmt.Println(result)
 		// 打印患者ID
 		nb := result["姓名"].([]byte)
 		name := string(nb)
@@ -690,6 +731,11 @@ func (c *StatisticsApiController) GetFivePatientInspectionStatistisc() {
 		ynamicField["姓名"] = name
 		// 打印其他列的值
 		for columnName, columnValue := range result {
+
+			fmt.Println("000000")
+			fmt.Println(columnName)
+			fmt.Println("000000")
+
 			// 跳过患者ID列
 
 			if columnName == "姓名" {
@@ -722,7 +768,14 @@ func (c *StatisticsApiController) GetFivePatientInspectionStatistisc() {
 				fmt.Printf("Column: %s, Value: %f\n", columnName, floatValue)
 			}
 			ynamicField["年月"] = strings.Split(end_date, "-")[0] + "-" + strings.Split(end_date, "-")[1]
-			ynamicField[columnName] = floatValue
+			if floatValue == 0 {
+				ynamicField[columnName] = ""
+
+			} else {
+				ynamicField[columnName] = floatValue
+
+			}
+			fmt.Println(ynamicField)
 			dynamicFields = append(dynamicFields, ynamicField)
 		}
 	}

service/statistis_qc_service.go

@@ -3,7 +3,9 @@ package service
 import (
 	"XT_New/models"
 	"fmt"
+	"reflect"
 	"strings"
+	"time"
 )
 
 func GetDialysisTotalDatas() {
@@ -14,20 +16,20 @@ func GetNewDialysiTotal(startime int64, endtime int64, orgid int64, origin int64
 	counts := models.PatientPrescriptionCountStruct{}
 	var err error
 	if origin == 1 { //透析记录，上机为准
-		db := XTReadDB().Table("xt_dialysis_order as x")
+		db := XTReadDB().Table("xt_dialysis_order as x").Joins("join xt_dialysis_prescription p on p.patient_id = x.patient_id and p.record_date = x.dialysis_date")
 		err = db.Select("count(x.id) as count").Where("x.dialysis_date >= ? and x.dialysis_date<=? and x.user_org_id = ? AND x.status = 1", startime, endtime, orgid).Scan(&counts).Error
 		return counts.Count, err
 
 	} else {
-		db := XTReadDB().Table("xt_schedule as sch")
-		//err = db.Select("COUNT(DISTINCT patient_id) AS total_employees").Where("x.dialysis_date >= ? and x.dialysis_date<=? and x.user_org_id = ? AND x.status = 1", startime, endtime, orgid).Scan(&counts).Error
 		var count int64
-		err := db.Model(&Schedule{}).
-			Select("patient_id, schedule_date").
+		var schs []models.Schedule
+		db := XTReadDB().Model(&models.Schedule{})
+		err := db.
 			Group("patient_id, schedule_date").
-			Where("schedule_date >= ? AND schedule_date  <= ?", startime, endtime).
-			Count(&count).
+			Where("schedule_date >= ? AND schedule_date  <= ? and user_org_id = ? and status = 1", startime, endtime, orgid).
+			Find(&schs).
 			Error
+		count = int64(len(schs))
 		return count, err
 
 	}
@@ -237,17 +239,7 @@ func GetNewDialysisCountMode(starttime int64, endtime int64, orgid int64, origin
 		return counts, err
 
 	} else {
-		db := readDb.Table("xt_schedule as o").Where("o.status = 1").Select("patient_id, schedule_date").Group("patient_id, schedule_date,mode_id")
-		if starttime > 0 {
-			db = db.Where("o.schedule_date >= ?", starttime)
-		}
-		if endtime > 0 {
-			db = db.Where("o.schedule_date <= ?", endtime)
-		}
-		if orgid > 0 {
-			db = db.Where("o.user_org_id = ?", orgid)
-		}
-		err = db.Select("o.mode_id,count(o.mode_id) as count").Scan(&counts).Error
+		err = readDb.Raw("select mode_id, count(aa.`mode_id`) as count from xt_schedule aa join (SELECT DISTINCT o.patient_id, o.`schedule_date` FROM xt_schedule AS o WHERE o.status = 1 AND o.schedule_date >= ?   AND o.schedule_date <= ?   AND o.user_org_id = ?) as b on  aa.`patient_id` = b.`patient_id` and aa.`schedule_date` = b.`schedule_date` where aa.`status` = 1 and    aa.schedule_date >= ?    AND aa.schedule_date <= ?   AND aa.user_org_id = ? Group by aa.`mode_id`", starttime, endtime, orgid, starttime, endtime, orgid).Find(&counts).Error
 		return counts, err
 
 	}
@@ -255,28 +247,52 @@ func GetNewDialysisCountMode(starttime int64, endtime int64, orgid int64, origin
 }
 
 func GetNewDialysisCountModeTwo(starttime int64, endtime int64, orgid int64, origin int64, mode_id int64) (counts models.CustomDialysisData, err error) {
+
+	// 将时间戳转换为time.Time类型
+	t := time.Unix(starttime, 0)
+
+	// 使用布局定义格式化时间
+	layout := "2006-01-02"
+
+	// 将时间格式化为字符串
+	startDate := t.Format(layout) + " 00:00:00"
+
+	t2 := time.Unix(endtime, 0)
+
+	// 使用布局定义格式化时间
+	//layout := "2006-01-02"
+
+	// 将时间格式化为字符串
+	endDate := t2.Format(layout) + " 00:00:00"
+	//fmt.Println(formattedDate)
+
+	// 将日期字符串解析为time.Time类型
+	//start, _ := time.Parse("2006-01-02 15:04:05", formattedDate)
+	//starttime = start.Unix()
+	//fmt.Println(starttime)
+
 	if origin == 1 {
 		db := readDb.Table("xt_dialysis_order as o").Where("o.status = 1")
 		if starttime > 0 {
-			db = db.Where("o.dialysis_date >=?", starttime)
+			db = db.Where("DATE_FORMAT(FROM_UNIXTIME(o.dialysis_date), '%Y-%m-%d %H:%i:%s') >= ?", startDate)
 		}
 		if endtime > 0 {
-			db = db.Where("o.dialysis_date<=?", endtime)
+			db = db.Where("DATE_FORMAT(FROM_UNIXTIME(o.dialysis_date), '%Y-%m-%d %H:%i:%s') <= ?", endDate)
 		}
 		if orgid > 0 {
 			db = db.Where("o.user_org_id = ?", orgid)
 		}
 
-		err = db.Select("s.mode_id,count(s.mode_id) as count").Joins("join xt_dialysis_prescription as s on s.patient_id = o.patient_id and s.record_date = o.dialysis_date and s.status= 1 AND s.record_date >= ? AND s.record_date <= ? AND  s.mode_id = ? ", starttime, endtime, mode_id).Group("s.mode_id").Scan(&counts).Error
+		err = db.Select("s.mode_id,count(s.mode_id) as count").Joins("join xt_dialysis_prescription as s on s.patient_id = o.patient_id and s.record_date = o.dialysis_date and s.status= 1 AND DATE_FORMAT(FROM_UNIXTIME(s.record_date), '%Y-%m-%d %H:%i:%s') >= ?  AND DATE_FORMAT(FROM_UNIXTIME(s.record_date), '%Y-%m-%d %H:%i:%s') <= ? AND  s.mode_id = ? ", startDate, endDate, mode_id).Group("s.mode_id").Scan(&counts).Error
 		return counts, err
 
 	} else {
-		db := readDb.Table("xt_schedule as o").Where("o.status = 1").Select("patient_id, schedule_date").Group("patient_id, schedule_date,mode_id")
+		db := readDb.Table("xt_schedule as o").Where("o.status = 1").Select("patient_id, schedule_date").Group("mode_id")
 		if starttime > 0 {
-			db = db.Where("o.schedule_date >= ?", starttime)
+			db = db.Where("DATE_FORMAT(FROM_UNIXTIME(o.schedule_date),'%Y-%m-%d %H:%i:%s') >= ?", startDate)
 		}
 		if endtime > 0 {
-			db = db.Where("o.schedule_date <= ?", endtime)
+			db = db.Where("DATE_FORMAT(FROM_UNIXTIME(o.schedule_date),'%Y-%m-%d %H:%i:%s') <= ?", endDate)
 		}
 		if orgid > 0 {
 			db = db.Where("o.user_org_id = ?", orgid)
@@ -471,116 +487,185 @@ func GetDialysisCompletionTotal(org_id int64, start_time int64, end_time int64)
             xt_assessment_after_dislysis a ON o.dialysis_date = a.assessment_date AND o.patient_id = a.patient_id AND a.user_org_id = ?
         WHERE
             o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ?
-        GROUP BY
-            dialysis_status;
     `
-	if err := readDb.Raw(query, org_id, org_id, org_id, start_time, end_time).Scan(&Count).Error; err != nil {
+	if err := readDb.Raw(query, org_id, org_id, org_id, start_time, end_time).Count(&Count).Error; err != nil {
 		return 0, err
 	}
 
 	return Count, nil
 }
-func GetDialysisCompletionDetail(org_id int64, start_time int64, end_time int64, mode int64, limit int64, page int64) (date []*CustomData, total int64, err error) {
+func GetDialysisCompletionDetail(org_id int64, start_time int64, end_time int64, mode int64, limit int64, page int64) (results []interface{}, total int64, err error) {
 	var query string
 	if mode == 0 {
 		query = `
-        SELECT
-           p.dialysis_no as dialysis_no,
-           p.name as patient_name,
-           FROM_UNIXTIME(o.dialysis_date) as dialysis_date,
-           CONCAT(p.dialysis_duration_hour, 'h', p.dialysis_duration_minute,'min') as dialysis_duration,
-           CONCAT(a.actual_treatment_hour, 'h', a.actual_treatment_minute,'min') as actual_duration,
-           ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) as diff,
-           p.prescription_doctor as doctor,
-           p.finish_nurse as nurse
-        FROM
-            xt_dialysis_order o
-    	JOIN           
-            xt_patients pp ON o.patient_id = pp.id AND pp.user_org_id = ?
-        JOIN
-            xt_dialysis_prescription p ON o.dialysis_date = p.record_date AND o.patient_id = p.patient_id AND p.user_org_id = ?
-        JOIN
-            xt_assessment_after_dislysis a ON o.dialysis_date = a.assessment_date AND o.patient_id = a.patient_id AND a.user_org_id = ?
-        WHERE
-            o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ?
-    `
+	   SELECT
+	      p.dialysis_no as dialysis_no,
+	      p.name as patient_name,
+	      FROM_UNIXTIME(o.dialysis_date) as dialysis_date,
+	      CONCAT(p.dialysis_duration_hour, 'h', p.dialysis_duration_minute,'min') as dialysis_duration,
+	      CONCAT(a.actual_treatment_hour, 'h', a.actual_treatment_minute,'min') as actual_duration,
+	      ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) as diff,
+	      p.prescription_doctor as doctor,
+	      o.finish_nurse as nurse
+	   FROM
+	       xt_dialysis_order o
+		JOIN
+	       xt_patients pp ON o.patient_id = pp.id AND pp.user_org_id = ?
+	   JOIN
+	       xt_dialysis_prescription p ON o.dialysis_date = p.record_date AND o.patient_id = p.patient_id AND p.user_org_id = ?
+	   JOIN
+	       xt_assessment_after_dislysis a ON o.dialysis_date = a.assessment_date AND o.patient_id = a.patient_id AND a.user_org_id = ?
+	   WHERE
+	       o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ?
+	`
+
+		readDb.Table("xt_dialysis_order o").
+			Joins("JOIN xt_patients pp ON o.patient_id = pp.id AND pp.user_org_id = ?", org_id).
+			Joins("JOIN xt_dialysis_prescription p ON o.dialysis_date = p.record_date AND o.patient_id = p.patient_id AND p.user_org_id = ?", org_id).
+			Joins("JOIN xt_assessment_after_dislysis a ON o.dialysis_date = a.assessment_date AND o.patient_id = a.patient_id AND a.user_org_id = ?", org_id).
+			Where("o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ?", org_id, start_time, end_time).Count(&total)
 
 	} else if mode == 1 {
 		query = `
-        SELECT
-           p.dialysis_no as dialysis_no,
-           p.name as patient_name,
-           FROM_UNIXTIME(o.dialysis_date) as dialysis_date,
-           CONCAT(p.dialysis_duration_hour, 'h', p.dialysis_duration_minute,'min') as dialysis_duration,
-           CONCAT(a.actual_treatment_hour, 'h', a.actual_treatment_minute,'min') as actual_duration,
-           ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) as diff,
-           p.prescription_doctor as doctor,
-           p.finish_nurse as nurse
-        FROM
-            xt_dialysis_order o
-    	JOIN           
-            xt_patients pp ON o.patient_id = pp.id AND pp.user_org_id = ?
-        JOIN
-            xt_dialysis_prescription p ON o.dialysis_date = p.record_date AND o.patient_id = p.patient_id AND p.user_org_id = ?
-        JOIN
-            xt_assessment_after_dislysis a ON o.dialysis_date = a.assessment_date AND o.patient_id = a.patient_id AND a.user_org_id = ?
-        WHERE
-            o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) <= 15
-    `
+	   SELECT
+	      pp.dialysis_no as dialysis_no,
+	      pp.name as patient_name,
+	      FROM_UNIXTIME(o.dialysis_date) as dialysis_date,
+	      CONCAT(p.dialysis_duration_hour, 'h', p.dialysis_duration_minute,'min') as dialysis_duration,
+	      CONCAT(a.actual_treatment_hour, 'h', a.actual_treatment_minute,'min') as actual_duration,
+	      ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) as diff,
+	      p.prescription_doctor as doctor,
+	      o.finish_nurse as nurse
+	   FROM
+	       xt_dialysis_order o
+		JOIN
+	       xt_patients pp ON o.patient_id = pp.id AND pp.user_org_id = ?
+	   JOIN
+	       xt_dialysis_prescription p ON o.dialysis_date = p.record_date AND o.patient_id = p.patient_id AND p.user_org_id = ?
+	   JOIN
+	       xt_assessment_after_dislysis a ON o.dialysis_date = a.assessment_date AND o.patient_id = a.patient_id AND a.user_org_id = ?
+	   WHERE
+	       o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) <= 15
+	`
+		readDb.Table("xt_dialysis_order o").
+			Joins("JOIN xt_patients pp ON o.patient_id = pp.id AND pp.user_org_id = ?", org_id).
+			Joins("JOIN xt_dialysis_prescription p ON o.dialysis_date = p.record_date AND o.patient_id = p.patient_id AND p.user_org_id = ?", org_id).
+			Joins("JOIN xt_assessment_after_dislysis a ON o.dialysis_date = a.assessment_date AND o.patient_id = a.patient_id AND a.user_org_id = ?", org_id).
+			Where("o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ? and ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) <= 15", org_id, start_time, end_time).Count(&total)
 
 	} else if mode == 2 {
 		query = `
-        SELECT
-           p.dialysis_no as dialysis_no,
-           p.name as patient_name,
-           FROM_UNIXTIME(o.dialysis_date) as dialysis_date,
-           CONCAT(p.dialysis_duration_hour, 'h', p.dialysis_duration_minute,'min') as dialysis_duration,
-           CONCAT(a.actual_treatment_hour, 'h', a.actual_treatment_minute,'min') as actual_duration,
-           ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) as diff,
-           p.prescription_doctor as doctor,
-           p.finish_nurse as nurse
-        FROM
-            xt_dialysis_order o
-    	JOIN           
-            xt_patients pp ON o.patient_id = pp.id AND pp.user_org_id = ?
-        JOIN
-            xt_dialysis_prescription p ON o.dialysis_date = p.record_date AND o.patient_id = p.patient_id AND p.user_org_id = ?
-        JOIN
-            xt_assessment_after_dislysis a ON o.dialysis_date = a.assessment_date AND o.patient_id = a.patient_id AND a.user_org_id = ?
-        WHERE
-            o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0)) < 0
-    `
+	   SELECT
+	      pp.dialysis_no as dialysis_no,
+	      pp.name as patient_name,
+	      FROM_UNIXTIME(o.dialysis_date) as dialysis_date,
+	      CONCAT(p.dialysis_duration_hour, 'h', p.dialysis_duration_minute,'min') as dialysis_duration,
+	      CONCAT(a.actual_treatment_hour, 'h', a.actual_treatment_minute,'min') as actual_duration,
+	      ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) as diff,
+	      p.prescription_doctor as doctor,
+	      o.finish_nurse as nurse
+	   FROM
+	       xt_dialysis_order o
+		JOIN
+	       xt_patients pp ON o.patient_id = pp.id AND pp.user_org_id = ?
+	   JOIN
+	       xt_dialysis_prescription p ON o.dialysis_date = p.record_date AND o.patient_id = p.patient_id AND p.user_org_id = ?
+	   JOIN
+	       xt_assessment_after_dislysis a ON o.dialysis_date = a.assessment_date AND o.patient_id = a.patient_id AND a.user_org_id = ?
+	   WHERE
+	       o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0)) < 0
+	`
+		readDb.Table("xt_dialysis_order o").
+			Joins("JOIN xt_patients pp ON o.patient_id = pp.id AND pp.user_org_id = ?", org_id).
+			Joins("JOIN xt_dialysis_prescription p ON o.dialysis_date = p.record_date AND o.patient_id = p.patient_id AND p.user_org_id = ?", org_id).
+			Joins("JOIN xt_assessment_after_dislysis a ON o.dialysis_date = a.assessment_date AND o.patient_id = a.patient_id AND a.user_org_id = ?", org_id).
+			Where("o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ? and TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0)) < 0", org_id, start_time, end_time).Count(&total)
 
 	} else if mode == 3 {
 		query = `
-        SELECT
-           p.dialysis_no as dialysis_no,
-           p.name as patient_name,
-           FROM_UNIXTIME(o.dialysis_date) as dialysis_date,
-           CONCAT(p.dialysis_duration_hour, 'h', p.dialysis_duration_minute,'min') as dialysis_duration,
-           CONCAT(a.actual_treatment_hour, 'h', a.actual_treatment_minute,'min') as actual_duration,
-           ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) as diff,
-           p.prescription_doctor as doctor,
-           p.finish_nurse as nurse
-        FROM
-            xt_dialysis_order o
-    	JOIN           
-            xt_patients pp ON o.patient_id = pp.id AND pp.user_org_id = ?
-        JOIN
-            xt_dialysis_prescription p ON o.dialysis_date = p.record_date AND o.patient_id = p.patient_id AND p.user_org_id = ?
-        JOIN
-            xt_assessment_after_dislysis a ON o.dialysis_date = a.assessment_date AND o.patient_id = a.patient_id AND a.user_org_id = ?
-        WHERE
-            o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0)) > 15
-    `
+	   SELECT
+	      pp.dialysis_no as dialysis_no,
+	      pp.name as patient_name,
+	      FROM_UNIXTIME(o.dialysis_date) as dialysis_date,
+	      CONCAT(p.dialysis_duration_hour, 'h', p.dialysis_duration_minute,'min') as dialysis_duration,
+	      CONCAT(a.actual_treatment_hour, 'h', a.actual_treatment_minute,'min') as actual_duration,
+	      ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) as diff,
+	      p.prescription_doctor as doctor,
+	      o.finish_nurse as nurse
+	   FROM
+	       xt_dialysis_order o
+		JOIN
+	       xt_patients pp ON o.patient_id = pp.id AND pp.user_org_id = ?
+	   JOIN
+	       xt_dialysis_prescription p ON o.dialysis_date = p.record_date AND o.patient_id = p.patient_id AND p.user_org_id = ?
+	   JOIN
+	       xt_assessment_after_dislysis a ON o.dialysis_date = a.assessment_date AND o.patient_id = a.patient_id AND a.user_org_id = ?
+	   WHERE
+	       o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0)) > 15
+	`
+		readDb.Table("xt_dialysis_order o").
+			Joins("JOIN xt_patients pp ON o.patient_id = pp.id AND pp.user_org_id = ?", org_id).
+			Joins("JOIN xt_dialysis_prescription p ON o.dialysis_date = p.record_date AND o.patient_id = p.patient_id AND p.user_org_id = ?", org_id).
+			Joins("JOIN xt_assessment_after_dislysis a ON o.dialysis_date = a.assessment_date AND o.patient_id = a.patient_id AND a.user_org_id = ?", org_id).
+			Where("o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ? and TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0)) > 15", org_id, start_time, end_time).Count(&total)
+
 	}
+
 	offset := (page - 1) * limit
 
-	if err := readDb.Raw(query, org_id, org_id, org_id, org_id, start_time, end_time).Count(&total).Offset(offset).Limit(limit).Scan(&date).Error; err != nil {
-		return nil, 0, err
+	rows, err := readDb.Raw(query, org_id, org_id, org_id, org_id, start_time, end_time).Offset(offset).Limit(limit).Rows()
+	if err != nil {
+		fmt.Println(err)
 	}
+	defer rows.Close()
 
-	return
+	// Define a map to hold the dynamic fields
+	fields := map[string]interface{}{
+		"dialysis_no":       "",
+		"patient_name":      "",
+		"dialysis_date":     "",
+		"dialysis_duration": "",
+		"actual_duration":   "",
+		"diff":              0,
+		"doctor":            "",
+		"nurse":             "",
+	}
+
+	// Create the dynamic struct type
+	dynamicStructType := createDynamicStruct(fields)
+
+	// Slice to hold the results
+	//var results []interface{}
+
+	// Iterate over the rows and scan into the dynamic struct
+	for rows.Next() {
+		// Create a new instance of the dynamic struct
+		result := reflect.New(dynamicStructType).Interface()
+
+		// Create a slice of pointers to the fields in the struct
+		fieldPtrs := []interface{}{
+			reflect.ValueOf(result).Elem().FieldByName("Dialysis_no").Addr().Interface(),
+			reflect.ValueOf(result).Elem().FieldByName("Patient_name").Addr().Interface(),
+			reflect.ValueOf(result).Elem().FieldByName("Dialysis_date").Addr().Interface(),
+			reflect.ValueOf(result).Elem().FieldByName("Dialysis_duration").Addr().Interface(),
+			reflect.ValueOf(result).Elem().FieldByName("Actual_duration").Addr().Interface(),
+			reflect.ValueOf(result).Elem().FieldByName("Diff").Addr().Interface(),
+			reflect.ValueOf(result).Elem().FieldByName("Doctor").Addr().Interface(),
+			reflect.ValueOf(result).Elem().FieldByName("Nurse").Addr().Interface(),
+		}
+
+		// Scan the row into the struct
+		if err := rows.Scan(fieldPtrs...); err != nil {
+			//log.Fatalf("failed to scan row: %v", err)
+			fmt.Println(err)
+
+		}
+
+		// Append the result to the slice
+		results = append(results, result)
+	}
+
+	return results, total, err
 }
 
 type QualityControlStandard struct {
@@ -612,7 +697,7 @@ func GetLatestInspectionValues(org_id int64, yearMonth string) ([]map[string]int
 
 	var selectFields []string
 	for _, standard := range standards {
-		field := fmt.Sprintf("MAX(CASE WHEN i.item_name = %s THEN i.inspect_value END) AS `%s`",
+		field := fmt.Sprintf("IFNULL(MAX(CASE WHEN i.item_name = %s THEN i.inspect_value END),'') AS `%s`",
 			"'"+standard.ItemName+"'", standard.ItemName)
 		selectFields = append(selectFields, field)
 	}
@@ -665,3 +750,15 @@ func GetLatestInspectionValues(org_id int64, yearMonth string) ([]map[string]int
 
 	return results, nil
 }
+
+func createDynamicStruct(fields map[string]interface{}) reflect.Type {
+	var structFields []reflect.StructField
+	for name, value := range fields {
+		structFields = append(structFields, reflect.StructField{
+			Name: strings.Title(name),
+			Type: reflect.TypeOf(value),
+			Tag:  reflect.StructTag(fmt.Sprintf(`json:"%s"`, name)),
+		})
+	}
+	return reflect.StructOf(structFields)
+}