耗材参数

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 
 #

controllers/mobile_api_controllers/doctor_advice_api_controller.go

@@ -37,36 +37,55 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 
 	adminInfo := this.GetMobileAdminUserInfo()
 	orgID := adminInfo.Org.Id
-
-	scheduals, err := service.MobileGetScheduleDoctorAdvices(orgID, date.Unix(), adviceType, patientType, adminInfo.AdminUser.Id, delivery_way)
-	//获取his医嘱数据
-	fmt.Println("date.un222222", date.Unix())
-	hisAdvices, _ := service.GetHisDoctorAdvices(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
-
-	project, _ := service.GetMobileHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
+	scheduals, err := service.MobileGetScheduleDoctorAdvicesTwo(orgID, date.Unix(), adviceType, patientType, adminInfo.AdminUser.Id, delivery_way)
 	config, _ := service.GetHisDoctorConfig(orgID)
 	project_config, _ := service.GetHisProjectConfig(orgID)
-
-	adminUser, _ := service.GetAllAdminUsers(orgID, adminInfo.App.Id)
-	if err != nil {
-		this.ErrorLog("获取排班信息失败:%v", err)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	fmt.Println("project_config23223232323", project_config)
+	if project_config.IsOpen == 1 || project_config.IsOpen == 2 {
+		//获取his医嘱数据
+		project, _ := service.GetMobileHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
+		hisAdvices, _ := service.GetHisDoctorAdvicesTwo(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
+		adminUser, _ := service.GetAllAdminUsers(orgID, adminInfo.App.Id)
+		if err != nil {
+			this.ErrorLog("获取排班信息失败:%v", err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		} else {
+			filtedScheduals := []*service.MScheduleDoctorAdviceVMOne{}
+			for _, schedual := range scheduals {
+				if len(schedual.DoctorAdvices) > 0 {
+					filtedScheduals = append(filtedScheduals, schedual)
+				}
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"scheduals":      filtedScheduals,
+				"adminUser":      adminUser,
+				"config":         config,
+				"project":        project,
+				"project_config": project_config,
+				"hisAdvices":     hisAdvices,
+			})
+		}
 	} else {
-		filtedScheduals := []*service.MScheduleDoctorAdviceVM{}
-		for _, schedual := range scheduals {
-			if len(schedual.DoctorAdvices) > 0 {
-				filtedScheduals = append(filtedScheduals, schedual)
+		adminUser, _ := service.GetAllAdminUsers(orgID, adminInfo.App.Id)
+		if err != nil {
+			this.ErrorLog("获取排班信息失败:%v", err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		} else {
+			filtedScheduals := []*service.MScheduleDoctorAdviceVMOne{}
+			for _, schedual := range scheduals {
+				if len(schedual.DoctorAdvices) > 0 {
+					filtedScheduals = append(filtedScheduals, schedual)
+				}
 			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"scheduals":      filtedScheduals,
+				"adminUser":      adminUser,
+				"config":         config,
+				"project_config": project_config,
+			})
 		}
-		this.ServeSuccessJSON(map[string]interface{}{
-			"scheduals":      filtedScheduals,
-			"adminUser":      adminUser,
-			"hisAdvices":     hisAdvices,
-			"config":         config,
-			"project":        project,
-			"project_config": project_config,
-		})
 	}
+
 }
 
 func (c *DoctorAdviceAPIController) GetAdviceConfigs() {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2704,6 +2704,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 			advice.AdviceDoctor = item.Doctor
 			if item.Type == 3 {
 				advice.AdviceName = item.GoodInfo.GoodName
+				advice.PrescribingNumberUnit = item.GoodInfo.PackingUnit
 			} else if item.Type == 2 {
 				advice.AdviceName = item.HisProject.ProjectName
 			}

service/gobal_config_service.go

@@ -687,7 +687,7 @@ func GetOutDrugCountList(startime int64, endtime int64, orgid int64) (info []*mo
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.count,x.drug_id,x.count_unit").Find(&info).Error
+	err = db.Select("sum(x.count) as count,x.drug_id,x.count_unit").Group("x.drug_id").Find(&info).Error
 	return info, err
 }
 

service/mobile_dialysis_service.go

@@ -742,6 +742,28 @@ func (MScheduleDoctorAdviceVM) TableName() string {
 	return "xt_schedule"
 }
 
+type MScheduleDoctorAdviceVMOne struct {
+	ID              int64                            `gorm:"column:id" json:"id"`
+	UserOrgId       int64                            `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId     int64                            `gorm:"column:partition_id" json:"partition_id"`
+	BedId           int64                            `gorm:"column:bed_id" json:"bed_id"`
+	PatientId       int64                            `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate    int64                            `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType    int64                            `gorm:"column:schedule_type" json:"schedule_type"`
+	ModeId          int64                            `gorm:"column:mode_id" json:"mode_id"`
+	Status          int64                            `gorm:"column:status" json:"status"`
+	DialysisOrder   *MDialysisOrderVM                `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
+	SchedualPatient *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	DeviceNumber    *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
+	DoctorAdvices   []*MDoctorAdviceVM               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
+	Prescription    *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
+	//DialysisAssesmentBefor *models.DialysisAssesmentBefor   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysisassesmentbefor"`
+}
+
+func (MScheduleDoctorAdviceVMOne) TableName() string {
+	return "xt_schedule"
+}
+
 type MDoctorAdviceVM struct {
 	ID                    int64   `gorm:"column:id" json:"id"`
 	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id"`
@@ -887,6 +909,101 @@ func MobileGetScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType
 	return vms, err
 }
 
+func MobileGetScheduleDoctorAdvicesTwo(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string) ([]*MScheduleDoctorAdviceVMOne, error) {
+	var vms []*MScheduleDoctorAdviceVMOne
+	adviceWhere := ""
+	adviceCondition := []interface{}{}
+	if adviceType == 0 {
+		if patientType == 0 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1)"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+
+		} else if patientType == 1 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1)"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+
+		} else if patientType == 2 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1)"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+		}
+
+	} else if adviceType == 1 {
+		if patientType == 0 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ?  "
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+
+		} else if patientType == 1 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND advice_doctor = ? "
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+
+		} else if patientType == 2 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND execution_staff = 0"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+
+		}
+
+	} else if adviceType == 3 {
+		if patientType == 0 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 3 AND record_date = ?  "
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+
+		} else if patientType == 1 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3 AND advice_doctor = ? "
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+		} else if patientType == 2 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3  AND execution_staff = 0"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+		}
+
+	} else if adviceType == 2 && len(deliverWay) > 0 {
+		if patientType == 0 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and delivery_way = ?"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+
+		} else if patientType == 1 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?  and delivery_way = ? "
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, deliverWay)
+		} else if patientType == 2 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0 and delivery_way = ?"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+		}
+
+	} else if adviceType == 2 && len(deliverWay) <= 0 {
+
+		if patientType == 0 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ?"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+
+		} else if patientType == 1 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND (advice_doctor = ? or execution_staff = ?)"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, adminUserId)
+		} else if patientType == 2 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+		}
+
+	}
+
+	db := readDb.
+		Table("xt_schedule").
+		Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+		}).
+		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+		//Preload("DialysisAssesmentBefor", "status =1 AND user_org_id = ? and assessment_date =?", orgID, scheduleDate).
+		Preload("DoctorAdvices", adviceCondition...).
+		Where("status = 1 AND user_org_id = ?", orgID)
+	if scheduleDate != 0 {
+		db = db.Where("schedule_date = ?", scheduleDate)
+	}
+
+	err := db.Find(&vms).Error
+	return vms, err
+}
+
 func GetHisDoctorAdvices(orgID int64, scheduleDate int64, deliverWay string, patientType int, adminUserId int64) ([]*HisMScheduleDoctorAdviceVM, error) {
 
 	var vms []*HisMScheduleDoctorAdviceVM
@@ -969,6 +1086,88 @@ func GetHisDoctorAdvices(orgID int64, scheduleDate int64, deliverWay string, pat
 	return vms, err
 }
 
+func GetHisDoctorAdvicesTwo(orgID int64, scheduleDate int64, deliverWay string, patientType int, adminUserId int64) ([]*HisMScheduleDoctorAdviceVMOne, error) {
+
+	var vms []*HisMScheduleDoctorAdviceVMOne
+	if len(deliverWay) > 0 {
+		if patientType == 0 {
+			db := readDb.
+				Table("xt_schedule").
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ?", orgID, scheduleDate, deliverWay).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
+		}
+		if patientType > 0 {
+			db := readDb.
+				Table("xt_schedule").
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, deliverWay, adminUserId, adminUserId).
+				Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
+		}
+
+	} else {
+		if patientType == 0 {
+			db := readDb.
+				Table("xt_schedule").
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? ", orgID, scheduleDate).
+				Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? and dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
+		}
+		if patientType > 0 {
+			db := readDb.
+				Table("xt_schedule").
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
+				Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
+		}
+
+	}
+
+	return vms, err
+}
+
 func GetMobileHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay string, patientType int, adminUserId int64) ([]*HisMScheduleProjectVM, error) {
 	var vms []*HisMScheduleProjectVM
 	if patientType == 0 {
@@ -1848,6 +2047,28 @@ func (HisMScheduleDoctorAdviceVM) TableName() string {
 	return "xt_schedule"
 }
 
+type HisMScheduleDoctorAdviceVMOne struct {
+	ID                     int64                            `gorm:"column:id" json:"id"`
+	UserOrgId              int64                            `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId            int64                            `gorm:"column:partition_id" json:"partition_id"`
+	BedId                  int64                            `gorm:"column:bed_id" json:"bed_id"`
+	PatientId              int64                            `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate           int64                            `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType           int64                            `gorm:"column:schedule_type" json:"schedule_type"`
+	ModeId                 int64                            `gorm:"column:mode_id" json:"mode_id"`
+	Status                 int64                            `gorm:"column:status" json:"status"`
+	DialysisOrder          *MDialysisOrderVM                `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
+	SchedualPatient        *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	DeviceNumber           *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
+	Prescription           *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
+	HisDoctorAdviceInfo    []*models.HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
+	HisPrescriptionProject []*models.HisPrescriptionProject `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"project"`
+}
+
+func (HisMScheduleDoctorAdviceVMOne) TableName() string {
+	return "xt_schedule"
+}
+
 type HisMScheduleProjectVM struct {
 	ID                     int64                            `gorm:"column:id" json:"id"`
 	UserOrgId              int64                            `gorm:"column:user_org_id" json:"user_org_id"`

service/stock_service.go

@@ -3335,20 +3335,25 @@ func GetAutoDiallysisBefor(startime int64, endtime int64, orgid int64) (info []*
 
 func GetOutStockTotalCountFour(startime int64, endtime int64, orgid int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {
 
-	//if startime > 0 {
-	//	err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >=?  and `status` = 1)  as b GROUP BY good_id", orgid, startime).Scan(&autoMatic).Error
-	//} else {
-	//	err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and `status` = 1)  as b GROUP BY good_id", orgid).Scan(&autoMatic).Error
-	//}
-
-	if startime > 0 || endtime > 0 {
-		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time <=?  and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error
-	} else {
-		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and `status` = 1)  as b GROUP BY good_id", orgid).Scan(&autoMatic).Error
+	if endtime > 0 {
+		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count,x.record_time FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time <=?  and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error
+	}
+	if endtime == 0 {
+		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count,x.record_time FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and `status` = 1)  as b GROUP BY good_id", orgid).Scan(&autoMatic).Error
 	}
 
-	//err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.record_time,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time<=? and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error
-
+	//db := XTReadDB().Table("xt_automatic_reduce_detail as x").Where("x.status = 1")
+	//
+	//if startime > 0 {
+	//  db = db.Where("x.ctime >=?", startime)
+	//}
+	//if endtime > 0{
+	//  db = db.Where("x.ctime<=?", endtime)
+	//}
+	//if orgid > 0 {
+	//  db = db.Where("x.org_id = ?", orgid)
+	//}
+	//err = db.Group("x.good_id").Select("x.good_id,sum(x.count) as count").Scan(&autoMatic).Error
 	return autoMatic, err
 
 }