提交代码

controllers/statistics_api_controller.go

@@ -1177,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 == 2 {
+		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{}{

models/dialysis.go

@@ -1662,3 +1662,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)
@@ -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)