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

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -8989,7 +8989,7 @@ func RemoveRepeatedCheckRecod(arr []*models.HisPrescriptionProject) (newArr []*m
 	for i := 0; i < len(arr); i++ {
 		repeat := false
 		for j := i + 1; j < len(arr); j++ {
-			if arr[i].TeamId == arr[j].TeamId {
+			if arr[i].TeamId == arr[j].TeamId && arr[i].PrescriptionId == arr[j].PrescriptionId {
 				repeat = true
 				break
 			}

models/dialysis.go

@@ -992,6 +992,7 @@ type TreatmentMode struct {
 	Status              int64  `gorm:"column:status" json:"status" form:"status"`
 	CreatedTime         int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
 	UpdatedTime         int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	ModeID              int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
 }
 
 func (TreatmentMode) TableName() string {

models/patient_models.go

@@ -334,6 +334,7 @@ type DialysisPrescription struct {
 	TubingHemodialysis         int64         `gorm:"column:tubing_hemodialysis" json:"tubing_hemodialysis"`
 	Package                    int64         `gorm:"column:package" json:"package"`
 	ALiquid                    int64         `gorm:"column:a_liquid" json:"a_liquid"`
+	QCPatients                 QCPatients    `json:"patient" gorm:"foreignkey:ID;AssociationForeignKey:PatientID;"`
 	UserAdminRole              UserAdminRole `json:"role" gorm:"foreignkey:AdminUserId;AssociationForeignKey:Creater;"`
 	PreImpulse                 float64       `gorm:"column:pre_impulse" json:"pre_impulse" form:"pre_impulse"`
 	AnticoagulantStopTimeMin   int64         `gorm:"column:anticoagulant_stop_time_min" json:"anticoagulant_stop_time_min" form:"anticoagulant_stop_time_min"`

models/qc.go

@@ -5,3 +5,119 @@ type CustomDialysisData struct {
 	Count int64  `json:"count"`
 	Total int64  `json:"total"`
 }
+
+type QCPrescription struct {
+	ID                        int64                     `gorm:"column:id" json:"id"`
+	UserOrgId                 int64                     `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId                 int64                     `gorm:"column:patient_id" json:"patient_id"`
+	ModeId                    int64                     `gorm:"column:mode_id" json:"mode_id"`
+	Status                    int64                     `gorm:"column:status" json:"status"`
+	CreatedTime               int64                     `gorm:"column:created_time" json:"created_time"`
+	UpdatedTime               int64                     `gorm:"column:updated_time" json:"updated_time"`
+	RecordDate                int64                     `gorm:"column:record_date" json:"record_date"`
+	RecordId                  int64                     `gorm:"column:record_id" json:"record_id"`
+	UserAdminRole             UserAdminRole             `json:"role" gorm:"foreignkey:AdminUserId;AssociationForeignKey:Creater;"`
+	Creater                   int64                     `gorm:"column:creater" json:"creater"`
+	Modifier                  int64                     `gorm:"column:modifier" json:"modifier"`
+	QCPatients                QCPatients                `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	QCDialysisOrder           QCDialysisOrder           `gorm:"ForeignKey:PatientId,DialysisDate;AssociationForeignKey:PatientId,RecordDate" json:"order"`
+	QCAssessmentAfterDislysis QCAssessmentAfterDislysis `gorm:"ForeignKey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,RecordDate" json:"ad"`
+}
+
+func (QCPrescription) TableName() string {
+	return "xt_dialysis_prescription"
+}
+
+type QCPatients struct {
+	ID         int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Gender     int64  `gorm:"column:gender" json:"gender" form:"gender"`
+	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	Name       string `gorm:"column:name" json:"name" form:"name"`
+	IdCardNo   string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Status     int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (QCPatients) TableName() string {
+	return "xt_patients"
+}
+
+type QCDialysisOrder struct {
+	ID             int64         `gorm:"column:id" json:"id"`
+	DialysisDate   int64         `gorm:"column:dialysis_date" json:"dialysis_date"`
+	UserOrgId      int64         `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId      int64         `gorm:"column:patient_id" json:"patient_id"`
+	Stage          int64         `gorm:"column:stage" json:"stage"`
+	Remark         string        `gorm:"column:remark" json:"remark"`
+	BedID          int64         `gorm:"column:bed_id" json:"bed_id"`
+	StartNurse     int64         `gorm:"column:start_nurse" json:"start_nurse"`
+	FinishNurse    int64         `gorm:"column:finish_nurse" json:"finish_nurse"`
+	Status         int64         `gorm:"column:status" json:"status"`
+	DeviceNumber   DeviceNumber  `gorm:"ForeignKey:BedID"`
+	StartTime      int64         `gorm:"column:start_time" json:"start_time"`
+	EndTime        int64         `gorm:"column:end_time" json:"end_time"`
+	FinishCreator  int64         `gorm:"column:finish_creator" json:"finish_creator"`
+	FinishModifier int64         `gorm:"column:finish_modifier" json:"finish_modifier"`
+	SchedualType   int64         `gorm:"column:schedual_type" json:"schedual_type"`
+	UserAdminRole  UserAdminRole `json:"role" gorm:"foreignkey:AdminUserId;AssociationForeignKey:StartNurse;"`
+	ZoneId         int64         `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
+}
+
+func (QCDialysisOrder) TableName() string {
+	return "xt_dialysis_order"
+}
+
+type QCAssessmentAfterDislysis struct {
+	ID                    int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AssessmentDate        int64 `gorm:"column:assessment_date" json:"assessment_date" form:"assessment_date"`
+	ActualTreatmentHour   int64 `gorm:"column:actual_treatment_hour" json:"actual_treatment_hour" form:"actual_treatment_hour"`
+	ActualTreatmentMinute int64 `gorm:"column:actual_treatment_minute" json:"actual_treatment_minute" form:"actual_treatment_minute"`
+}
+
+func (QCAssessmentAfterDislysis) TableName() string {
+
+	return "xt_assessment_after_dislysis"
+}
+
+type QCSchedule struct {
+	ID                        int64                     `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                 int64                     `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId                 int64                     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate              int64                     `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType              int64                     `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek              int64                     `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId                    int64                     `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status                    int64                     `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime               int64                     `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime               int64                     `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	QCSPrescription           QCSPrescription           `gorm:"ForeignKey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"prescription"`
+	QCPatients                QCPatients                `gorm:"ForeignKey:ID;AssociationForeignKey:PatientId" json:"patient"`
+	QCDialysisOrder           QCDialysisOrder           `gorm:"ForeignKey:PatientId,DialysisDate;AssociationForeignKey:PatientId,ScheduleDate" json:"order"`
+	QCAssessmentAfterDislysis QCAssessmentAfterDislysis `gorm:"ForeignKey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate" json:"ad"`
+}
+
+// `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
+func (QCSchedule) TableName() string {
+	return "xt_schedule"
+}
+
+type QCSPrescription struct {
+	ID            int64         `gorm:"column:id" json:"id"`
+	UserOrgId     int64         `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId     int64         `gorm:"column:patient_id" json:"patient_id"`
+	ModeId        int64         `gorm:"column:mode_id" json:"mode_id"`
+	Status        int64         `gorm:"column:status" json:"status"`
+	CreatedTime   int64         `gorm:"column:created_time" json:"created_time"`
+	UpdatedTime   int64         `gorm:"column:updated_time" json:"updated_time"`
+	RecordDate    int64         `gorm:"column:record_date" json:"record_date"`
+	RecordId      int64         `gorm:"column:record_id" json:"record_id"`
+	UserAdminRole UserAdminRole `json:"role" gorm:"foreignkey:AdminUserId;AssociationForeignKey:Creater;"`
+	Creater       int64         `gorm:"column:creater" json:"creater"`
+	Modifier      int64         `gorm:"column:modifier" json:"modifier"`
+}
+
+func (QCSPrescription) TableName() string {
+	return "xt_dialysis_prescription"
+}

service/his_service.go

@@ -974,6 +974,7 @@ func CreateNewHisProjectTwo(project *models.HisPrescriptionProject, tx *gorm.DB)
 	}
 	return
 }
+
 func CreateHisProjectTwo(project *models.HisPrescriptionProject) (err error) {
 
 	err = writeDb.Model(&models.HisPrescriptionProject{}).Save(project).Error

service/statistis_qc_service.go

@@ -2,8 +2,12 @@ package service
 
 import (
 	"XT_New/models"
+	"database/sql"
 	"fmt"
+	"github.com/jinzhu/gorm"
+	"reflect"
 	"strings"
+	"time"
 )
 
 func GetDialysisTotalDatas() {
@@ -14,20 +18,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
 
 	}
@@ -45,23 +49,37 @@ type DialysisStat struct {
 	Total  int            `json:"合计"`
 }
 
-func getTreatmentModes() ([]TreatmentMode, error) {
-	var modes []TreatmentMode
-	if err := XTReadDB().Find(&modes).Error; err != nil {
+func GetTreatmentModes() ([]models.TreatmentMode, error) {
+	var modes []models.TreatmentMode
+	if err := XTReadDB().Model(&models.TreatmentMode{}).Find(&modes).Error; err != nil {
 		return nil, err
 	}
 	return modes, nil
 }
 
-func GetDialysisStats(startDate int64, endDate int64, groupBy int64, mode int64) ([]DialysisStat, error) {
-	var stats []DialysisStat
-	var modes []TreatmentMode
-	if mode > 0 {
-		modes, _ = getTreatmentModes()
+func GetDialysisStats(start int64, end int64, mode int64, org_id int64, time_way int64) ([]map[string]interface{}, error) {
+	// 将时间戳转换为time.Time类型
+	t := time.Unix(start, 0)
+	// 使用布局定义格式化时间
+	layout := "2006-01-02"
+	// 将时间格式化为字符串
+	startDate := t.Format(layout) + " 00:00:00"
+
+	t2 := time.Unix(end, 0)
+	// 使用布局定义格式化时间
+	//layout := "2006-01-02"
+	// 将时间格式化为字符串
+	endDate := t2.Format(layout) + " 00:00:00"
+	//var stats []DialysisStat
+	var modes []models.TreatmentMode
+	fmt.Println(mode)
+	if mode == 0 {
+		modes, _ = GetTreatmentModes()
+
 	} else {
-		modes_two, _ := getTreatmentModes()
+		modes_two, _ := GetTreatmentModes()
 		for _, item := range modes_two {
-			if item.ModeID == int(mode) {
+			if item.ModeID == mode {
 				modes = append(modes, item)
 			}
 		}
@@ -71,28 +89,34 @@ func GetDialysisStats(startDate int64, endDate int64, groupBy int64, mode int64)
 		return nil, err
 	}
 
-	// 构建日期格式
-	dateFormat := "%Y-%m-%d"
-	switch groupBy {
-	case 2:
-		dateFormat = "%Y-%m-%d"
-	case 1:
-		dateFormat = "%Y-%u"
-	case 3:
-		dateFormat = "%Y-%m"
-	case 4:
-		dateFormat = "%Y"
-	default:
-		return nil, fmt.Errorf("invalid group by option")
-	}
+	var selectClauses []string
 	// 构建动态查询语句
-	selectClauses := []string{fmt.Sprintf("DATE_FORMAT(p.record_date, '%s') AS `日期`", dateFormat)}
+	if time_way == 1 {
+		//selectClauses = []string{fmt.Sprintf("'%s' AS `日期`", strings.Split(startDate, " ")[0])}
+		selectClauses = []string{fmt.Sprintf("'%s' AS `日期`", strings.Split(startDate, " ")[0]+"~"+strings.Split(endDate, " ")[0])}
+
+	} else if time_way == 3 {
+		selectClauses = []string{fmt.Sprintf("'%s' AS `日期`", strings.Split(startDate, " ")[0]+"~"+strings.Split(endDate, " ")[0])}
+
+		//selectClauses = []string{fmt.Sprintf("'%s' AS `日期`", strings.Split(strings.Split(startDate, " ")[0], "-")[0]+"-"+strings.Split(strings.Split(startDate, " ")[0], "-")[1])}
+	} else if time_way == 4 {
+		selectClauses = []string{fmt.Sprintf("'%s' AS `日期`", strings.Split(startDate, " ")[0]+"~"+strings.Split(endDate, " ")[0])}
+
+		//selectClauses = []string{fmt.Sprintf("'%s' AS `日期`", strings.Split(strings.Split(startDate, " ")[0], "-")[0])}
+	} else {
+		selectClauses = []string{fmt.Sprintf("'%s' AS `日期`", strings.Split(startDate, " ")[0]+"~"+strings.Split(endDate, " ")[0])}
+	}
 	for _, mode := range modes {
-		selectClauses = append(selectClauses, fmt.Sprintf("SUM(CASE WHEN t.mode_name = '%s' THEN 1 ELSE 0 END) AS `%s`", mode.ModeName, mode.ModeName))
+		fmt.Println(mode)
+
+		selectClauses = append(selectClauses, fmt.Sprintf("COALESCE(SUM(CASE WHEN t.name = '%s' THEN 1 ELSE 0 END), 0) AS `%s`", mode.Name, mode.Name))
 	}
 	selectClauses = append(selectClauses, "COUNT(*) AS `合计`")
 
-	query := fmt.Sprintf(`
+	var rows *sql.Rows
+	var query string
+	if mode > 0 {
+		query = fmt.Sprintf(`
         SELECT
             %s
         FROM
@@ -100,48 +124,108 @@ func GetDialysisStats(startDate int64, endDate int64, groupBy int64, mode int64)
         JOIN
             xt_treatment_mode t ON p.mode_id = t.mode_id
         WHERE
-            p.record_date >= ? AND p.record_date <= ?
+            FROM_UNIXTIME(p.record_date) >= ? AND FROM_UNIXTIME(p.record_date) <= ? AND p.user_org_id = ? and p.mode_id = ?
         GROUP BY
-            DATE_FORMAT(p.record_date, '%s')
-    `, dateFormat, dateFormat, selectClauses)
+           日期
+    `, strings.Join(selectClauses, ", "))
+		rows, _ = readDb.Raw(query, startDate, endDate, org_id, mode).Rows()
+
+	} else {
+		query = fmt.Sprintf(`
+        SELECT
+            %s
+        FROM
+            xt_dialysis_prescription p
+        JOIN
+            xt_treatment_mode t ON p.mode_id = t.mode_id
+        WHERE
+            FROM_UNIXTIME(p.record_date) >= ? AND FROM_UNIXTIME(p.record_date) <= ? AND p.user_org_id = ? 
+        GROUP BY
+           日期
+    `, strings.Join(selectClauses, ", "))
+		rows, _ = readDb.Raw(query, startDate, endDate, org_id).Rows()
+	}
 
-	rows, err := readDb.Raw(query, startDate, endDate).Rows()
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
 
-	// 解析查询结果
+	columns, err := rows.Columns()
+	if err != nil {
+		return nil, err
+	}
+
+	var results []map[string]interface{}
+
 	for rows.Next() {
-		var stat DialysisStat
-		stat.Counts = make(map[string]int)
-		cols := []interface{}{&stat.Date}
-		for _, mode := range modes {
-			var count int
-			cols = append(cols, &count)
-			stat.Counts[mode.ModeName] = count
+		// 创建一个长度为列数的切片，用于存储每一行的值
+		columnValues := make([]interface{}, len(columns))
+		columnPointers := make([]interface{}, len(columns))
+		for i := range columnValues {
+			columnPointers[i] = &columnValues[i]
 		}
-		var total int
-		cols = append(cols, &total)
-		stat.Total = total
-		if err := rows.Scan(cols...); err != nil {
+
+		// 扫描当前行的值
+		if err := rows.Scan(columnPointers...); err != nil {
 			return nil, err
 		}
-		stats = append(stats, stat)
+
+		// 将扫描到的值放入结果 map 中
+		result := make(map[string]interface{})
+		for i, colName := range columns {
+			val := columnPointers[i].(*interface{})
+			result[colName] = *val
+		}
+
+		results = append(results, result)
 	}
 
-	return stats, nil
+	//// 解析查询结果
+	//for rows.Next() {
+	//	var stat DialysisStat
+	//	stat.Counts = make(map[string]int)
+	//	cols := []interface{}{&stat.Date}
+	//	for _, mode := range modes {
+	//		var count int
+	//		cols = append(cols, &count)
+	//		stat.Counts[mode.Name] = count
+	//	}
+	//	var total int
+	//	cols = append(cols, &total)
+	//	stat.Total = total
+	//	if err := rows.Scan(cols...); err != nil {
+	//		return nil, err
+	//	}
+	//	stats = append(stats, stat)
+	//}
+
+	return results, nil
 }
 
-func GetScheduleStats(startDate int64, endDate int64, groupBy int64, mode int64) ([]DialysisStat, error) {
-	var stats []DialysisStat
-	var modes []TreatmentMode
-	if mode > 0 {
-		modes, _ = getTreatmentModes()
+func GetScheduleStats(start int64, end int64, mode int64, org_id int64, time_way int64) ([]map[string]interface{}, error) {
+	// 将时间戳转换为time.Time类型
+	t := time.Unix(start, 0)
+	// 使用布局定义格式化时间
+	layout := "2006-01-02"
+	// 将时间格式化为字符串
+	startDate := t.Format(layout) + " 00:00:00"
+
+	t2 := time.Unix(end, 0)
+	// 使用布局定义格式化时间
+	//layout := "2006-01-02"
+	// 将时间格式化为字符串
+	endDate := t2.Format(layout) + " 00:00:00"
+	//var stats []DialysisStat
+	var modes []models.TreatmentMode
+	fmt.Println(mode)
+	if mode == 0 {
+		modes, _ = GetTreatmentModes()
+
 	} else {
-		modes_two, _ := getTreatmentModes()
+		modes_two, _ := GetTreatmentModes()
 		for _, item := range modes_two {
-			if item.ModeID == int(mode) {
+			if item.ModeID == mode {
 				modes = append(modes, item)
 			}
 		}
@@ -151,28 +235,28 @@ func GetScheduleStats(startDate int64, endDate int64, groupBy int64, mode int64)
 		return nil, err
 	}
 
-	// 构建日期格式
-	dateFormat := "%Y-%m-%d"
-	switch groupBy {
-	case 2:
-		dateFormat = "%Y-%m-%d"
-	case 1:
-		dateFormat = "%Y-%u"
-	case 3:
-		dateFormat = "%Y-%m"
-	case 4:
-		dateFormat = "%Y"
-	default:
-		return nil, fmt.Errorf("invalid group by option")
-	}
+	var selectClauses []string
 	// 构建动态查询语句
-	selectClauses := []string{fmt.Sprintf("DATE_FORMAT(p.schudle_date, '%s') AS `日期`", dateFormat)}
+	if time_way == 1 {
+		selectClauses = []string{fmt.Sprintf("'%s' AS `日期`", strings.Split(startDate, " ")[0])}
+	} else if time_way == 3 {
+		selectClauses = []string{fmt.Sprintf("'%s' AS `日期`", strings.Split(strings.Split(startDate, " ")[0], "-")[0]+strings.Split(strings.Split(startDate, " ")[0], "-")[1])}
+	} else if time_way == 4 {
+		selectClauses = []string{fmt.Sprintf("'%s' AS `日期`", strings.Split(strings.Split(startDate, " ")[0], "-")[0])}
+	} else {
+		selectClauses = []string{fmt.Sprintf("'%s' AS `日期`", strings.Split(startDate, " ")[0]+"~"+strings.Split(endDate, " ")[0])}
+	}
 	for _, mode := range modes {
-		selectClauses = append(selectClauses, fmt.Sprintf("SUM(CASE WHEN t.mode_name = '%s' THEN 1 ELSE 0 END) AS `%s`", mode.ModeName, mode.ModeName))
+		fmt.Println(mode)
+
+		selectClauses = append(selectClauses, fmt.Sprintf("COALESCE(SUM(CASE WHEN t.name = '%s' THEN 1 ELSE 0 END), 0) AS `%s`", mode.Name, mode.Name))
 	}
 	selectClauses = append(selectClauses, "COUNT(*) AS `合计`")
 
-	query := fmt.Sprintf(`
+	var rows *sql.Rows
+	var query string
+	if mode > 0 {
+		query = fmt.Sprintf(`
         SELECT
             %s
         FROM
@@ -180,39 +264,165 @@ func GetScheduleStats(startDate int64, endDate int64, groupBy int64, mode int64)
         JOIN
             xt_treatment_mode t ON p.mode_id = t.mode_id
         WHERE
-            p.schedule_date >= ? AND p.schedule_date <= ?
+            FROM_UNIXTIME(p.schedule_date) >= ? AND FROM_UNIXTIME(p.schedule_date) <= ? AND p.user_org_id = ? and p.mode_id = ?
         GROUP BY
-            DATE_FORMAT(p.schedule_date, '%s')
-    `, dateFormat, dateFormat, selectClauses)
+           日期
+    `, strings.Join(selectClauses, ", "))
+		rows, _ = readDb.Raw(query, startDate, endDate, org_id, mode).Rows()
+
+	} else {
+		query = fmt.Sprintf(`
+        SELECT
+            %s
+        FROM
+            xt_schedule p
+        JOIN
+            xt_treatment_mode t ON p.mode_id = t.mode_id
+        WHERE
+            FROM_UNIXTIME(p.schedule_date) >= ? AND FROM_UNIXTIME(p.schedule_date) <= ? AND p.user_org_id = ? 
+        GROUP BY
+           日期
+    `, strings.Join(selectClauses, ", "))
+		rows, _ = readDb.Raw(query, startDate, endDate, org_id).Rows()
+	}
 
-	rows, err := readDb.Raw(query, startDate, endDate).Rows()
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
 
-	// 解析查询结果
+	columns, err := rows.Columns()
+	if err != nil {
+		return nil, err
+	}
+
+	var results []map[string]interface{}
+
 	for rows.Next() {
-		var stat DialysisStat
-		stat.Counts = make(map[string]int)
-		cols := []interface{}{&stat.Date}
-		for _, mode := range modes {
-			var count int
-			cols = append(cols, &count)
-			stat.Counts[mode.ModeName] = count
+		// 创建一个长度为列数的切片，用于存储每一行的值
+		columnValues := make([]interface{}, len(columns))
+		columnPointers := make([]interface{}, len(columns))
+		for i := range columnValues {
+			columnPointers[i] = &columnValues[i]
 		}
-		var total int
-		cols = append(cols, &total)
-		stat.Total = total
-		if err := rows.Scan(cols...); err != nil {
+
+		// 扫描当前行的值
+		if err := rows.Scan(columnPointers...); err != nil {
 			return nil, err
 		}
-		stats = append(stats, stat)
+
+		// 将扫描到的值放入结果 map 中
+		result := make(map[string]interface{})
+		for i, colName := range columns {
+			val := columnPointers[i].(*interface{})
+			result[colName] = *val
+		}
+
+		results = append(results, result)
 	}
 
-	return stats, nil
+	//// 解析查询结果
+	//for rows.Next() {
+	//	var stat DialysisStat
+	//	stat.Counts = make(map[string]int)
+	//	cols := []interface{}{&stat.Date}
+	//	for _, mode := range modes {
+	//		var count int
+	//		cols = append(cols, &count)
+	//		stat.Counts[mode.Name] = count
+	//	}
+	//	var total int
+	//	cols = append(cols, &total)
+	//	stat.Total = total
+	//	if err := rows.Scan(cols...); err != nil {
+	//		return nil, err
+	//	}
+	//	stats = append(stats, stat)
+	//}
+
+	return results, nil
 }
 
+//func GetScheduleStats(startDate int64, endDate int64, groupBy int64, mode int64, org_id int64) ([]DialysisStat, error) {
+//	var stats []DialysisStat
+//	var modes []models.TreatmentMode
+//	if mode > 0 {
+//		modes, _ = GetTreatmentModes()
+//	} else {
+//		modes_two, _ := GetTreatmentModes()
+//		for _, item := range modes_two {
+//			if item.ModeID == mode {
+//				modes = append(modes, item)
+//			}
+//		}
+//	}
+//	// 获取透析模式
+//	if err != nil {
+//		return nil, err
+//	}
+//
+//	// 构建日期格式
+//	dateFormat := "%Y-%m-%d"
+//	switch groupBy {
+//	case 2:
+//		dateFormat = "%Y-%m-%d"
+//	case 1:
+//		dateFormat = "%Y-%u"
+//	case 3:
+//		dateFormat = "%Y-%m"
+//	case 4:
+//		dateFormat = "%Y"
+//	default:
+//		return nil, fmt.Errorf("invalid group by option")
+//	}
+//	// 构建动态查询语句
+//	selectClauses := []string{fmt.Sprintf("DATE_FORMAT(p.schudle_date, '%s') AS `日期`", dateFormat)}
+//	for _, mode := range modes {
+//		selectClauses = append(selectClauses, fmt.Sprintf("SUM(CASE WHEN t.mode_name = '%s' THEN 1 ELSE 0 END) AS `%s`", mode.Name, mode.Name))
+//	}
+//	selectClauses = append(selectClauses, "COUNT(*) AS `合计`")
+//
+//	query := fmt.Sprintf(`
+//        SELECT
+//            %s
+//        FROM
+//            xt_schedule p
+//        JOIN
+//            xt_treatment_mode t ON p.mode_id = t.mode_id
+//        WHERE
+//            p.schedule_date >= ? AND p.schedule_date <= ?
+//        GROUP BY
+//            DATE_FORMAT(p.schedule_date, '%s')
+//    `, dateFormat, dateFormat, selectClauses)
+//
+//	rows, err := readDb.Raw(query, startDate, endDate).Rows()
+//	if err != nil {
+//		return nil, err
+//	}
+//	defer rows.Close()
+//
+//	// 解析查询结果
+//	for rows.Next() {
+//		var stat DialysisStat
+//		stat.Counts = make(map[string]int)
+//		cols := []interface{}{&stat.Date}
+//		for _, mode := range modes {
+//			var count int
+//			cols = append(cols, &count)
+//			stat.Counts[mode.Name] = count
+//		}
+//		var total int
+//		cols = append(cols, &total)
+//		stat.Total = total
+//		if err := rows.Scan(cols...); err != nil {
+//			return nil, err
+//		}
+//		stats = append(stats, stat)
+//	}
+//
+//	return stats, nil
+//}
+
 func GetNewDialysisCountMode(starttime int64, endtime int64, orgid int64, origin int64, mode_id int64) (counts []*models.PatientPrescriptionCountStruct, err error) {
 	if origin == 1 {
 
@@ -237,17 +447,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 +455,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)
@@ -357,6 +581,19 @@ func GetDialyzerSummary(org_id int64) ([]string, error) {
 	return Dialyzer, nil
 }
 
+func GetIrrigationSummary(org_id int64) ([]string, error) {
+	var Irrigation []string
+	err := XTReadDB().Model(&models.DialysisPrescription{}).
+		Select("dialysis_irrigation").
+		Where(" user_org_id = ? and status = 1", org_id).
+		Group("dialysis_irrigation").
+		Scan(&Irrigation).Error
+	if err != nil {
+		return nil, err
+	}
+	return Irrigation, nil
+}
+
 type DialyzerResult struct {
 	Dialyzer string
 	Count    int
@@ -371,6 +608,15 @@ func GetDialyzerData(start_time int64, end_time int64, org_id int64) (dr []Dialy
 	return
 }
 
+func GetIrrigationData(start_time int64, end_time int64, org_id int64) (dr []DialyzerResult, err error) {
+	err = XTReadDB().Model(&models.DialysisPrescription{}).
+		Select("dialysis_irrigation as dialyzer, COUNT(*) as count").
+		Where("record_date >= ? and record_date <= ? and user_org_id = ? and status = 1", start_time, end_time, org_id).
+		Group("dialysis_irrigation").
+		Scan(&dr).Error
+	return
+}
+
 func GetDialyzerTotal(start_time int64, end_time int64, org_id int64) (total int64, err error) {
 	err = XTReadDB().Model(&models.DialysisPrescription{}).
 		Where("status = 1 and record_date >= ? and record_date <= ? and user_org_id = ? and dialysis_dialyszers <> ''", start_time, end_time, org_id).
@@ -380,7 +626,7 @@ func GetDialyzerTotal(start_time int64, end_time int64, org_id int64) (total int
 
 func GetPrescriptionByAnticoagulant(page int64, limit int64, orgid int64, anticoagulant int64, start_time int64, end_time int64) (solution []*models.DialysisPrescription, total int64, err error) {
 
-	db := XTReadDB().Model(&models.DialysisPrescription{}).Where("status = 1")
+	db := XTReadDB().Model(&models.DialysisPrescription{}).Preload("QCPatients", "status = 1 and user_org_id = ?", orgid).Where("status = 1")
 	if anticoagulant > 0 {
 		db = db.Where("anticoagulant = ?", anticoagulant)
 	}
@@ -471,116 +717,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 {
@@ -665,3 +980,43 @@ 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)
+}
+
+func GetDialysisPrescriptionInfo(start_date string, end_date string, mode int64, org_id int64, page int64, limit int64) (qcp []models.QCPrescription, total int64, err error) {
+	offset := (page - 1) * limit
+
+	err = readDb.Model(&models.QCPrescription{}).Preload("UserAdminRole", func(db *gorm.DB) *gorm.DB {
+		return readUserDb.Where("status = 1 and org_id=?", org_id)
+	}).Preload("QCPatients", "status = 1 and user_org_id = ?", org_id).Preload("QCDialysisOrder", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("UserAdminRole", func(db *gorm.DB) *gorm.DB {
+			return readUserDb.Where("status = 1 and org_id=?", org_id)
+		}).Preload("DeviceNumber", "status = 1 and org_id = ?", org_id).Where("status = 1 AND user_org_id = ?", org_id)
+	}).Preload("QCAssessmentAfterDislysis", "status = 1 and user_org_id = ?", org_id).Where("FROM_UNIXTIME(record_date, '%Y-%m-%d') >= ? and FROM_UNIXTIME(record_date, '%Y-%m-%d') <= ? and user_org_id = ? and mode_id = ?  and status = 1", start_date, end_date, org_id, mode).Count(&total).Offset(offset).Limit(limit).Find(&qcp).Error
+	return
+}
+
+func GetScheduleInfo(start_date string, end_date string, mode int64, org_id int64, page int64, limit int64) (qcp []models.QCSchedule, total int64, err error) {
+	offset := (page - 1) * limit
+
+	err = readDb.Model(&models.QCSchedule{}).Preload("QCPatients", "status = 1 and user_org_id =?", org_id).Preload("QCSPrescription", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("UserAdminRole", func(db *gorm.DB) *gorm.DB {
+			return readUserDb.Where("status = 1 and org_id=?", org_id)
+		}).Where("status = 1 AND user_org_id = ?", org_id)
+	}).Preload("QCAssessmentAfterDislysis", "status = 1 and user_org_id = ?", org_id).Preload("QCDialysisOrder", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("DeviceNumber", "status = 1").Preload("UserAdminRole", func(db *gorm.DB) *gorm.DB {
+			return readUserDb.Where("status = 1 and org_id=?", org_id)
+		}).Where("status = 1 AND user_org_id = ?", org_id)
+	}).Where("FROM_UNIXTIME(schedule_date, '%Y-%m-%d') >= ? and FROM_UNIXTIME(schedule_date, '%Y-%m-%d') <= ? and user_org_id = ? and mode_id = ? and status = 1", start_date, end_date, org_id, mode).Count(&total).Offset(offset).Limit(limit).Find(&qcp).Error
+	return
+}