XMLWAN 3 лет назад
Родитель
Сommit
45b0853d62
2 измененных файлов: 4 добавлений и 4 удалений
  1. 1 1
      service/doctor_schedule_service.go
  2. 3 3
      service/schedule_service.go

+ 1 - 1
service/doctor_schedule_service.go Просмотреть файл

650
 	db := XTReadDB().Table("xt_schedule as s")
650
 	db := XTReadDB().Table("xt_schedule as s")
651
 	err = db.Preload("DeviceZone", " status= 1").Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
651
 	err = db.Preload("DeviceZone", " status= 1").Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
652
 		return db.Where("status =1").Preload("DeviceZone", "status = 1")
652
 		return db.Where("status =1").Preload("DeviceZone", "status = 1")
653
-	}).Preload("DialysisOrder", "status =1").
653
+	}).Preload("DialysisOrder", "status =1").Preload("DialysisPrescription", "status =1").
654
 		Joins("JOIN xt_patients as p ON p.id = s.patient_id And(p.name LIKE ? OR p.dialysis_no LIKE ?)", likeKey, likeKey).Where("s.user_org_id = ? and s.schedule_date = ? and s.status =1", orgid, startime).
654
 		Joins("JOIN xt_patients as p ON p.id = s.patient_id And(p.name LIKE ? OR p.dialysis_no LIKE ?)", likeKey, likeKey).Where("s.user_org_id = ? and s.schedule_date = ? and s.status =1", orgid, startime).
655
 		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id,p.name as patient").Find(&schedule).Error
655
 		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id,p.name as patient").Find(&schedule).Error
656
 	return schedule, err
656
 	return schedule, err

+ 3 - 3
service/schedule_service.go Просмотреть файл

591
 
591
 
592
 func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
592
 func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
593
 
593
 
594
-	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
594
+	db := readDb2.Table("xt_schedule as x").Where("x.status = 1")
595
 	if orgid > 0 {
595
 	if orgid > 0 {
596
 		db = db.Where("x.user_org_id = ?", orgid)
596
 		db = db.Where("x.user_org_id = ?", orgid)
597
 	}
597
 	}
618
 
618
 
619
 func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int64, startDate int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
619
 func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int64, startDate int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
620
 
620
 
621
-	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
621
+	db := readDb2.Table("xt_schedule as x").Where("x.status = 1")
622
 	if orgid > 0 {
622
 	if orgid > 0 {
623
 		db = db.Where("x.user_org_id = ?", orgid)
623
 		db = db.Where("x.user_org_id = ?", orgid)
624
 	}
624
 	}
991
 
991
 
992
 func GetNextWeekPanels(startime int64, endtime int64, orgid int64) (schedule []*models.XtSchedule, err error) {
992
 func GetNextWeekPanels(startime int64, endtime int64, orgid int64) (schedule []*models.XtSchedule, err error) {
993
 
993
 
994
-	err = XTReadDB().Model(&schedule).Where("schedule_date >=? and schedule_date<=? and status = 1 and user_org_id = ?", startime, endtime, orgid).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
994
+	err = readDb2.Model(&schedule).Where("schedule_date >=? and schedule_date<=? and status = 1 and user_org_id = ?", startime, endtime, orgid).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
995
 		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, endtime)
995
 		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, endtime)
996
 	}).Find(&schedule).Error
996
 	}).Find(&schedule).Error
997
 	return schedule, err
997
 	return schedule, err