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

controllers/his_hospital_api_controller.go

@@ -47,7 +47,7 @@ func HisHospitalManagerApiRegistRouters() {
 }
 func (this *HisHospitalApiController) ModifyFaPiaoCode() {
 	order_id, _ := this.GetInt64("id")
-	fapiao_code := this.GetString("fapiao_code")
+	fapiao_number := this.GetString("fapiao_number")
 
 	order, _ := service.GetHisOrderByID(order_id)
 	if order.ID == 0 {
@@ -55,7 +55,7 @@ func (this *HisHospitalApiController) ModifyFaPiaoCode() {
 		return
 	}
 
-	order.FaPiaoCode = fapiao_code
+	order.FaPiaoNumber = fapiao_number
 	err := service.SaveOrderTwo(&order)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

controllers/statistics_api_controller.go

@@ -7,6 +7,7 @@ import (
 	"XT_New/utils"
 	"fmt"
 	"github.com/astaxie/beego"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -345,27 +346,23 @@ func (c *StatisticsApiController) GetDialysisTotalDetail() {
 				//fmt.Println(aa)
 				var dynamicFields []map[string]interface{}
 				//var uniqueFields []map[string]interface{}
-
 				for _, result := range list {
-					// 打印患者ID
 					nb := result["日期"].([]byte)
 					name := string(nb)
 
-					// 创建动态字段的map
 					dynamicField := make(map[string]interface{})
-					// 将日期放在首位
 					dynamicField["日期"] = name
 
-					// 打印其他列的值，并添加到动态字段中
+					numericColumns := make(map[string]interface{})
+					nonNumericColumns := make(map[string]interface{})
+
+					// 分类处理列
 					for columnName, columnValue := range result {
-						if columnName == "日期" {
-							continue
-						}
-						if columnName == "合计" {
+						if columnName == "日期" || columnName == "合计" {
 							continue
 						}
 						if columnValue == nil {
-							dynamicField[columnName] = ""
+							nonNumericColumns[columnName] = ""
 							continue
 						}
 
@@ -376,36 +373,49 @@ func (c *StatisticsApiController) GetDialysisTotalDetail() {
 						}
 
 						strValue := string(byteValue)
-
 						floatValue, err := strconv.ParseFloat(strValue, 64)
 						if err != nil {
 							fmt.Printf("Error converting value for column %s: %v\n", columnName, err)
+							nonNumericColumns[columnName] = strValue
 						} else {
 							if floatValue == 0 {
-								dynamicField[columnName] = ""
+								nonNumericColumns[columnName] = ""
 							} else {
-								dynamicField[columnName] = floatValue
+								numericColumns[columnName] = floatValue
 							}
 						}
 					}
 
-					// 将合计放在末尾
+					// 添加数值列
+					for columnName, columnValue := range numericColumns {
+						dynamicField[columnName] = columnValue
+					}
+
+					// 添加非数值列
+					for columnName, columnValue := range nonNumericColumns {
+						dynamicField[columnName] = columnValue
+					}
+
 					hj := result["合计"].(int64)
 					dynamicField["合计"] = hj
 
 					dynamicFields = append(dynamicFields, dynamicField)
 				}
 
-				// 将日期放在首位
 				seen := make(map[interface{}]struct{})
 				for _, field := range dynamicFields {
 					value := field["日期"]
 					if _, ok := seen[value]; !ok {
 						seen[value] = struct{}{}
 						uniqueFields = append(uniqueFields, field)
+
+						//// 对字段进行排序，有值的排在前面
+						//sortedField := sortFieldsByValue(field)
+						//uniqueFields = append(uniqueFields, sortedField)
 					}
 				}
 			}
+
 			c.ServeSuccessJSON(map[string]interface{}{
 				"list": uniqueFields,
 			})
@@ -427,29 +437,25 @@ func (c *StatisticsApiController) GetDialysisTotalDetail() {
 			var uniqueFields []map[string]interface{}
 			for _, date := range dailyDates {
 				list, _ := service.GetDialysisStats(date.Unix(), date.Unix(), mode, c.GetAdminUserInfo().CurrentOrgId, time_way)
-				//fmt.Println(aa)
 				var dynamicFields []map[string]interface{}
 
 				for _, result := range list {
-					// 打印患者ID
 					nb := result["日期"].([]byte)
 					name := string(nb)
 
-					// 创建动态字段的map
 					dynamicField := make(map[string]interface{})
-					// 将日期放在首位
 					dynamicField["日期"] = name
 
-					// 打印其他列的值，并添加到动态字段中
+					numericColumns := make(map[string]interface{})
+					nonNumericColumns := make(map[string]interface{})
+
+					// 分类处理列
 					for columnName, columnValue := range result {
-						if columnName == "日期" {
-							continue
-						}
-						if columnName == "合计" {
+						if columnName == "日期" || columnName == "合计" {
 							continue
 						}
 						if columnValue == nil {
-							dynamicField[columnName] = ""
+							nonNumericColumns[columnName] = ""
 							continue
 						}
 
@@ -460,27 +466,35 @@ func (c *StatisticsApiController) GetDialysisTotalDetail() {
 						}
 
 						strValue := string(byteValue)
-
 						floatValue, err := strconv.ParseFloat(strValue, 64)
 						if err != nil {
 							fmt.Printf("Error converting value for column %s: %v\n", columnName, err)
+							nonNumericColumns[columnName] = strValue
 						} else {
 							if floatValue == 0 {
-								dynamicField[columnName] = ""
+								nonNumericColumns[columnName] = ""
 							} else {
-								dynamicField[columnName] = floatValue
+								numericColumns[columnName] = floatValue
 							}
 						}
 					}
 
-					// 将合计放在末尾
+					// 添加数值列
+					for columnName, columnValue := range numericColumns {
+						dynamicField[columnName] = columnValue
+					}
+
+					// 添加非数值列
+					for columnName, columnValue := range nonNumericColumns {
+						dynamicField[columnName] = columnValue
+					}
+
 					hj := result["合计"].(int64)
 					dynamicField["合计"] = hj
 
 					dynamicFields = append(dynamicFields, dynamicField)
 				}
 
-				// 将日期放在首位
 				seen := make(map[interface{}]struct{})
 				for _, field := range dynamicFields {
 					value := field["日期"]
@@ -490,6 +504,143 @@ func (c *StatisticsApiController) GetDialysisTotalDetail() {
 					}
 				}
 			}
+
+			//for _, date := range dailyDates {
+			//	list, _ := service.GetDialysisStats(date.Unix(), date.Unix(), mode, c.GetAdminUserInfo().CurrentOrgId, time_way)
+			//	//fmt.Println(aa)
+			//	var dynamicFields []map[string]interface{}
+			//
+			//	for _, result := range list {
+			//		// 打印患者ID
+			//		nb := result["日期"].([]byte)
+			//		name := string(nb)
+			//
+			//		// 创建动态字段的map
+			//		dynamicField := make(map[string]interface{})
+			//		// 将日期放在首位
+			//		dynamicField["日期"] = name
+			//
+			//		// 临时存储无数值的列
+			//		nonNumericColumns := make(map[string]interface{})
+			//
+			//		// 先处理包含数值的列
+			//		for columnName, columnValue := range result {
+			//			if columnName == "日期" || columnName == "合计" {
+			//				continue
+			//			}
+			//			if columnValue == nil {
+			//				nonNumericColumns[columnName] = ""
+			//				continue
+			//			}
+			//
+			//			byteValue, ok := columnValue.([]byte)
+			//			if !ok {
+			//				fmt.Printf("Error: Unable to convert value for column %s to []byte\n", columnName)
+			//				continue
+			//			}
+			//
+			//			strValue := string(byteValue)
+			//
+			//			floatValue, err := strconv.ParseFloat(strValue, 64)
+			//			if err != nil {
+			//				fmt.Printf("Error converting value for column %s: %v\n", columnName, err)
+			//				nonNumericColumns[columnName] = strValue
+			//			} else {
+			//				if floatValue == 0 {
+			//					nonNumericColumns[columnName] = ""
+			//				} else {
+			//					dynamicField[columnName] = floatValue
+			//				}
+			//			}
+			//		}
+			//
+			//		// 添加无数值的列
+			//		for columnName, columnValue := range nonNumericColumns {
+			//			dynamicField[columnName] = columnValue
+			//		}
+			//
+			//		// 将合计放在末尾
+			//		hj := result["合计"].(int64)
+			//		dynamicField["合计"] = hj
+			//
+			//		dynamicFields = append(dynamicFields, dynamicField)
+			//	}
+			//
+			//	// 将日期放在首位
+			//	seen := make(map[interface{}]struct{})
+			//	for _, field := range dynamicFields {
+			//		value := field["日期"]
+			//		if _, ok := seen[value]; !ok {
+			//			seen[value] = struct{}{}
+			//			uniqueFields = append(uniqueFields, field)
+			//		}
+			//	}
+			//}
+			//for _, date := range dailyDates {
+			//	list, _ := service.GetDialysisStats(date.Unix(), date.Unix(), mode, c.GetAdminUserInfo().CurrentOrgId, time_way)
+			//	//fmt.Println(aa)
+			//	var dynamicFields []map[string]interface{}
+			//
+			//	for _, result := range list {
+			//		// 打印患者ID
+			//		nb := result["日期"].([]byte)
+			//		name := string(nb)
+			//
+			//		// 创建动态字段的map
+			//		dynamicField := make(map[string]interface{})
+			//		// 将日期放在首位
+			//		dynamicField["日期"] = name
+			//
+			//		// 打印其他列的值，并添加到动态字段中
+			//		for columnName, columnValue := range result {
+			//			if columnName == "日期" {
+			//				continue
+			//			}
+			//			if columnName == "合计" {
+			//				continue
+			//			}
+			//			if columnValue == nil {
+			//				dynamicField[columnName] = ""
+			//				continue
+			//			}
+			//
+			//			byteValue, ok := columnValue.([]byte)
+			//			if !ok {
+			//				fmt.Printf("Error: Unable to convert value for column %s to []byte\n", columnName)
+			//				continue
+			//			}
+			//
+			//			strValue := string(byteValue)
+			//
+			//			floatValue, err := strconv.ParseFloat(strValue, 64)
+			//			if err != nil {
+			//				fmt.Printf("Error converting value for column %s: %v\n", columnName, err)
+			//			} else {
+			//				if floatValue == 0 {
+			//					dynamicField[columnName] = ""
+			//				} else {
+			//					dynamicField[columnName] = floatValue
+			//				}
+			//			}
+			//		}
+			//
+			//		// 将合计放在末尾
+			//		hj := result["合计"].(int64)
+			//		dynamicField["合计"] = hj
+			//
+			//		dynamicFields = append(dynamicFields, dynamicField)
+			//	}
+			//
+			//	// 将日期放在首位
+			//	seen := make(map[interface{}]struct{})
+			//	for _, field := range dynamicFields {
+			//		value := field["日期"]
+			//		if _, ok := seen[value]; !ok {
+			//			seen[value] = struct{}{}
+			//			uniqueFields = append(uniqueFields, field)
+			//		}
+			//	}
+			//}
 			c.ServeSuccessJSON(map[string]interface{}{
 				"list": uniqueFields,
 			})
@@ -1026,8 +1177,17 @@ func (c *StatisticsApiController) GetDialysisTotalDetailInfo() {
 	origin, _ := c.GetInt64("origin")
 	page, _ := c.GetInt64("page")
 	limit, _ := c.GetInt64("limit")
-	start_date := strings.Split(date_str, "~")[0]
-	end_date := strings.Split(date_str, "~")[1]
+	time_way, _ := c.GetInt64("time_way")
+	var start_date string
+	var end_date string
+	if time_way == 1 {
+		start_date = date_str
+		end_date = date_str
+	} else {
+		start_date = strings.Split(date_str, "~")[0]
+		end_date = strings.Split(date_str, "~")[1]
+	}
+
 	if origin == 1 {
 		qcp, total, _ := service.GetDialysisPrescriptionInfo(start_date, end_date, mode, c.GetAdminUserInfo().CurrentOrgId, page, limit)
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -1173,6 +1333,8 @@ func (c *StatisticsApiController) GetDialyzer() {
 		return
 	}
 	dialyzers, err := service.GetDialyzerData(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId)
+	DialysisIrrigation, err := service.GetDialysisIrrigationData(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId)
+
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1184,11 +1346,23 @@ func (c *StatisticsApiController) GetDialyzer() {
 	}
 	var respDatas []respData
 	for _, item := range dialyzers {
-		var respData respData
-		respData.Name = item.Dialyzer
-		respData.Count = item.Count
-		respData.Percentage = float64(item.Count) / float64(total) * 100
-		respDatas = append(respDatas, respData)
+		if len(item.Dialyzer) > 0 {
+			var respData respData
+			respData.Name = item.Dialyzer
+			respData.Count = item.Count
+			respData.Percentage = float64(item.Count) / float64(total) * 100
+			respDatas = append(respDatas, respData)
+		}
+	}
+	for _, item := range DialysisIrrigation {
+		if len(item.Dialyzer) > 0 {
+
+			var respData respData
+			respData.Name = item.Dialyzer
+			respData.Count = item.Count
+			respData.Percentage = float64(item.Count) / float64(total) * 100
+			respDatas = append(respDatas, respData)
+		}
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
 		"data": respDatas,
@@ -1238,8 +1412,8 @@ func (c *StatisticsApiController) GetDialyzerDetail() {
 }
 func (c *StatisticsApiController) GetDialyzerConfig() {
 	dialyzers, _ := service.GetDialyzerSummary(c.GetAdminUserInfo().CurrentOrgId)
-	//Irrigation, _ := service.GetIrrigationSummary(c.GetAdminUserInfo().CurrentOrgId)
-	//dialyzers = append(dialyzers, Irrigation...)
+	Irrigation, _ := service.GetIrrigationSummary(c.GetAdminUserInfo().CurrentOrgId)
+	dialyzers = append(dialyzers, Irrigation...)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"dialyzers": dialyzers,
 	})
@@ -2011,3 +2185,38 @@ func splitByDay(startDate, endDate time.Time) []time.Time {
 	}
 	return dates
 }
+
+// 排序函数
+func sortFieldsByValue(field map[string]interface{}) map[string]interface{} {
+	// 将键值对分成两个部分，一个有值，一个无值
+	var withValue, withoutValue []string
+
+	for key, value := range field {
+		if key == "日期" || key == "合计" {
+			continue
+		}
+		if value == "" {
+			withoutValue = append(withoutValue, key)
+		} else {
+			withValue = append(withValue, key)
+		}
+	}
+
+	// 对有值和无值部分分别排序
+	sort.Strings(withValue)
+	sort.Strings(withoutValue)
+
+	// 创建一个新的有序map
+	sortedField := make(map[string]interface{})
+	sortedField["日期"] = field["日期"]
+
+	for _, key := range withValue {
+		sortedField[key] = field[key]
+	}
+	for _, key := range withoutValue {
+		sortedField[key] = field[key]
+	}
+
+	sortedField["合计"] = field["合计"]
+	return sortedField
+}

models/dialysis.go

@@ -1706,3 +1706,12 @@ type XtDialysisOrderLost struct {
 func (XtDialysisOrderLost) TableName() string {
 	return "xt_dialysis_order"
 }
+
+type MewTreatmentMode struct {
+	Name   string `gorm:"column:name" json:"name" form:"name"`
+	ModeID int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+}
+
+func (MewTreatmentMode) TableName() string {
+	return "xt_treatment_mode"
+}

service/statistis_qc_service.go

@@ -50,12 +50,10 @@ type DialysisStat struct {
 	Total  int            `json:"合计"`
 }
 
-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 GetTreatmentModes(org_id int64, start string, end string) (mode []models.MewTreatmentMode) {
+	//XTReadDB().Model(&models.HisPrescription{}).Joins("join xt_treatment_mode mode on").Where("user_org_id = ?", org_id).Find(&modes).Error
+	XTReadDB().Table("xt_dialysis_prescription p").Joins("join xt_treatment_mode mode on mode.id = p.mode_id").Where("p.user_org_id = ? and  FROM_UNIXTIME(p.record_date) >= ? AND FROM_UNIXTIME(p.record_date) <= ?", org_id, start, end).Select("mode.name as name, p.mode_id as mode_id").Group("p.mode_id").Scan(&mode)
+	return
 }
 
 func GetDialysisStats(start int64, end int64, mode int64, org_id int64, time_way int64) ([]map[string]interface{}, error) {
@@ -72,13 +70,13 @@ func GetDialysisStats(start int64, end int64, mode int64, org_id int64, time_way
 	// 将时间格式化为字符串
 	endDate := t2.Format(layout) + " 00:00:00"
 	//var stats []DialysisStat
-	var modes []models.TreatmentMode
+	var modes []models.MewTreatmentMode
 	fmt.Println(mode)
 	if mode == 0 {
-		modes, _ = GetTreatmentModes()
+		modes = GetTreatmentModes(org_id, startDate, endDate)
 
 	} else {
-		modes_two, _ := GetTreatmentModes()
+		modes_two := GetTreatmentModes(org_id, startDate, endDate)
 		for _, item := range modes_two {
 			if item.ModeID == mode {
 				modes = append(modes, item)
@@ -94,7 +92,7 @@ func GetDialysisStats(start int64, end int64, mode int64, org_id int64, time_way
 	// 构建动态查询语句
 	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])}
+		selectClauses = []string{fmt.Sprintf("'%s' AS `日期`", strings.Split(startDate, " ")[0])}
 
 	} else if time_way == 3 {
 		selectClauses = []string{fmt.Sprintf("'%s' AS `日期`", strings.Split(startDate, " ")[0]+"~"+strings.Split(endDate, " ")[0])}
@@ -218,13 +216,13 @@ func GetScheduleStats(start int64, end int64, mode int64, org_id int64, time_way
 	// 将时间格式化为字符串
 	endDate := t2.Format(layout) + " 00:00:00"
 	//var stats []DialysisStat
-	var modes []models.TreatmentMode
+	var modes []models.MewTreatmentMode
 	fmt.Println(mode)
 	if mode == 0 {
-		modes, _ = GetTreatmentModes()
+		modes = GetTreatmentModes(org_id, startDate, endDate)
 
 	} else {
-		modes_two, _ := GetTreatmentModes()
+		modes_two := GetTreatmentModes(org_id, startDate, endDate)
 		for _, item := range modes_two {
 			if item.ModeID == mode {
 				modes = append(modes, item)
@@ -543,10 +541,10 @@ func GetAnticoagulantData(start_time int64, end_time int64, org_id int64) (map[s
 		Count         int
 	}
 
-	err := XTReadDB().Model(&models.DialysisPrescription{}).
-		Select("anticoagulant, COUNT(*) as count").
-		Where("status = 1 and record_date >= ? and record_date <= ? and user_org_id = ?", start_time, end_time, org_id).
-		Group("anticoagulant").
+	err := XTReadDB().Model(&models.DialysisPrescription{}).Joins("join xt_dialysis_order oo on oo.patient_id = xt_dialysis_prescription.patient_id and oo.dialysis_date = xt_dialysis_prescription.record_date and oo.status = 1").
+		Select("xt_dialysis_prescription.anticoagulant, COUNT(*) as count").
+		Where("xt_dialysis_prescription.status = 1 and xt_dialysis_prescription.record_date >= ? and xt_dialysis_prescription.record_date <= ? and xt_dialysis_prescription.user_org_id = ?", start_time, end_time, org_id).
+		Group("xt_dialysis_prescription.anticoagulant").
 		Scan(&results).Error
 	if err != nil {
 		return nil, err
@@ -555,16 +553,17 @@ func GetAnticoagulantData(start_time int64, end_time int64, org_id int64) (map[s
 	for _, result := range results {
 		if name, ok := anticoagulantMap[result.Anticoagulant]; ok {
 			anticoagulantData[name] = result.Count
-		} else {
-			anticoagulantData[fmt.Sprintf("Unknown (%d)", result.Anticoagulant)] = result.Count
 		}
+		//else {
+		//	anticoagulantData[fmt.Sprintf("Unknown (%d)", result.Anticoagulant)] = result.Count
+		//}z
 	}
 
 	return anticoagulantData, nil
 }
 func GetAnticoagulantTotal(start_time int64, end_time int64, org_id int64) (total int64, err error) {
-	err = XTReadDB().Model(&models.DialysisPrescription{}).
-		Where("record_date >= ? and record_date <= ? and user_org_id = ? and status = 1", start_time, end_time, org_id).
+	err = XTReadDB().Model(&models.DialysisPrescription{}).Joins("join xt_dialysis_order oo on oo.patient_id = xt_dialysis_prescription.patient_id and oo.dialysis_date = xt_dialysis_prescription.record_date and oo.status = 1").
+		Where("xt_dialysis_prescription.record_date >= ? and xt_dialysis_prescription.record_date <= ? and xt_dialysis_prescription.user_org_id = ? and xt_dialysis_prescription.status = 1", start_time, end_time, org_id).
 		Count(&total).Error
 
 	return
@@ -601,10 +600,19 @@ type DialyzerResult struct {
 }
 
 func GetDialyzerData(start_time int64, end_time int64, org_id int64) (dr []DialyzerResult, err error) {
-	err = XTReadDB().Model(&models.DialysisPrescription{}).
-		Select("dialysis_dialyszers 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_dialyszers").
+	err = XTReadDB().Model(&models.DialysisPrescription{}).Joins("join xt_dialysis_order oo on oo.patient_id = xt_dialysis_prescription.patient_id and oo.dialysis_date = xt_dialysis_prescription.record_date and oo.status = 1").
+		Select("xt_dialysis_prescription.dialysis_dialyszers as dialyzer, COUNT(*) as count").
+		Where("xt_dialysis_prescription.record_date >= ? and xt_dialysis_prescription.record_date <= ? and xt_dialysis_prescription.user_org_id = ? and xt_dialysis_prescription.status = 1", start_time, end_time, org_id).
+		Group("xt_dialysis_prescription.dialysis_dialyszers").
+		Scan(&dr).Error
+	return
+}
+
+func GetDialysisIrrigationData(start_time int64, end_time int64, org_id int64) (dr []DialyzerResult, err error) {
+	err = XTReadDB().Model(&models.DialysisPrescription{}).Joins("join xt_dialysis_order oo on oo.patient_id = xt_dialysis_prescription.patient_id and oo.dialysis_date = xt_dialysis_prescription.record_date and oo.status = 1").
+		Select("xt_dialysis_prescription.dialysis_irrigation as dialysis_irrigation, COUNT(*) as count").
+		Where("xt_dialysis_prescription.record_date >= ? and xt_dialysis_prescription.record_date <= ? and xt_dialysis_prescription.user_org_id = ? and xt_dialysis_prescription.status = 1", start_time, end_time, org_id).
+		Group("xt_dialysis_prescription.dialysis_irrigation").
 		Scan(&dr).Error
 	return
 }
@@ -619,22 +627,22 @@ func GetIrrigationData(start_time int64, end_time int64, org_id int64) (dr []Dia
 }
 
 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).
+	err = XTReadDB().Model(&models.DialysisPrescription{}).Joins("join xt_dialysis_order oo on oo.patient_id = xt_dialysis_prescription.patient_id and oo.dialysis_date = xt_dialysis_prescription.record_date and oo.status = 1").
+		Where("xt_dialysis_prescription.status = 1 and xt_dialysis_prescription.record_date >= ? and xt_dialysis_prescription.record_date <= ? and xt_dialysis_prescription.user_org_id = ?", start_time, end_time, org_id).
 		Count(&total).Error
 	return
 }
 
 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{}).Preload("QCPatients", "status = 1 and user_org_id = ?", orgid).Where("status = 1")
+	db := XTReadDB().Model(&models.DialysisPrescription{}).Joins("join xt_dialysis_order oo on oo.patient_id = xt_dialysis_prescription.patient_id and oo.dialysis_date = xt_dialysis_prescription.record_date and oo.status = 1").Preload("QCPatients", "xt_patients.status = 1 and xt_patients.user_org_id = ?", orgid).Where("xt_dialysis_prescription.status = 1")
 	if anticoagulant > 0 {
-		db = db.Where("anticoagulant = ?", anticoagulant)
+		db = db.Where("xt_dialysis_prescription.anticoagulant = ?", anticoagulant)
 	}
 	if orgid > 0 {
-		db = db.Where("user_org_id = ?", orgid)
+		db = db.Where("xt_dialysis_prescription.user_org_id = ?", orgid)
 	}
-	db = db.Where("record_date >= ? and record_date <= ?", start_time, end_time)
+	db = db.Where("xt_dialysis_prescription.record_date >= ? and xt_dialysis_prescription.record_date <= ?", start_time, end_time)
 
 	offset := (page - 1) * limit
 
@@ -644,14 +652,14 @@ func GetPrescriptionByAnticoagulant(page int64, limit int64, orgid int64, antico
 
 func GetPrescriptionByDialyzer(page int64, limit int64, orgid int64, dialyzer string, start_time int64, end_time int64) (solution []*models.DialysisPrescription, total int64, err error) {
 
-	db := XTReadDB().Model(&models.DialysisPrescription{}).Preload("QCPatients", "status = 1 and user_org_id = ?", orgid).Where("status = 1")
+	db := XTReadDB().Model(&models.DialysisPrescription{}).Joins("join xt_dialysis_order oo on oo.patient_id = xt_dialysis_prescription.patient_id and oo.dialysis_date = xt_dialysis_prescription.record_date and oo.status = 1").Preload("QCPatients", "xt_patients.status = 1 and xt_patients.user_org_id = ?", orgid).Where("xt_dialysis_prescription.status = 1")
 	if len(dialyzer) > 0 {
-		db = db.Where("dialysis_dialyszers = ?", dialyzer)
+		db = db.Where("xt_dialysis_prescription.dialysis_dialyszers = ? or xt_dialysis_prescription.dialysis_irrigation = ?", dialyzer, dialyzer)
 	}
 	if orgid > 0 {
-		db = db.Where("user_org_id = ?", orgid)
+		db = db.Where("xt_dialysis_prescription.user_org_id = ?", orgid)
 	}
-	db = db.Where("record_date >= ? and record_date <= ? and status = 1", start_time, end_time)
+	db = db.Where("xt_dialysis_prescription.record_date >= ? and xt_dialysis_prescription.record_date <= ? and xt_dialysis_prescription.status = 1", start_time, end_time)
 
 	offset := (page - 1) * limit
 
@@ -680,9 +688,9 @@ func GetDialysisCompletionRate(org_id int64, start_time int64, end_time int64) (
 	query := `
         SELECT
             CASE
-                WHEN ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) <= 15 THEN '达标'
-                WHEN TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0)) < 0 THEN '未达标'
-                ELSE '超时'
+                WHEN ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) <= 15 THEN '达到透析处方时间'
+                WHEN TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0)) < -15 THEN '超出处方时间'
+                ELSE '未到达处方时间'
             END AS dialysis_status,
             COUNT(*) AS count
         FROM
@@ -808,7 +816,7 @@ func GetDialysisCompletionDetail(org_id int64, start_time int64, end_time int64,
 	   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
+	       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).