医护排班

models/doctor_schedule_models.go

@@ -42,22 +42,23 @@ func (StaffSchedule) TableName() string {
 }
 
 type XtStaffSchedule struct {
-	ID           int64  `gorm:"column:id" json:"id" form:"id"`
-	DoctorId     int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
-	DoctorType   int64  `gorm:"column:doctor_type" json:"doctor_type" form:"doctor_type"`
-	ScheduleType int64  `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
-	ScheduleWeek int64  `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
-	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	StartTime    int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	EndTime      int64  `gorm:"column:end_time" json:"end_time" form:"end_time"`
-	Status       int64  `gorm:"column:status" json:"status" form:"status"`
-	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	ScheduleDate int64  `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
-	UserName     string `gorm:"column:user_name" json:"user_name" form:"user_name"`
-	ClassName    string `gorm:"column:class_name" json:"class_name" form:"class_name"`
-	AdminUserId  int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	UserType     int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	DoctorId        int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	DoctorType      int64  `gorm:"column:doctor_type" json:"doctor_type" form:"doctor_type"`
+	ScheduleType    int64  `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek    int64  `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	UserOrgId       int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	StartTime       int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	EndTime         int64  `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	Status          int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime           int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime           int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	ScheduleDate    int64  `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	UserName        string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	ClassName       string `gorm:"column:class_name" json:"class_name" form:"class_name"`
+	AdminUserId     int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	UserType        int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
+	ClassAttributes int64  `gorm:"column:class_attributes" json:"class_attributes" form:"class_attributes"`
 }
 
 type XTSgjUserAdminRole struct {

service/doctor_schedule_service.go

@@ -127,7 +127,7 @@ func GetStaffScheduleList(orgid int64, startime int64, endtime int64) (schedule
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
-	err = db.Group("x.id").Select("x.id,x.doctor_id,x.doctor_type,x.schedule_type,x.schedule_week,x.user_org_id,x.start_time,x.end_time,x.schedule_date,r.user_name,s.class_name,r.admin_user_id,r.user_type").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.doctor_id").Joins("left join xt_doctor_schedules as s on s.id = x.schedule_type").Where("r.org_id = ? and r.status = 1", orgid).Scan(&schedule).Error
+	err = db.Group("x.id").Select("x.id,x.doctor_id,x.doctor_type,x.schedule_type,x.schedule_week,x.user_org_id,x.start_time,x.end_time,x.schedule_date,r.user_name,s.class_name,r.admin_user_id,r.user_type,s.class_attributes").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.doctor_id").Joins("left join xt_doctor_schedules as s on s.id = x.schedule_type").Where("r.org_id = ? and r.status = 1 and s.user_org_id = ? and s.status = 1", orgid, orgid).Scan(&schedule).Error
 	return schedule, err
 }
 
@@ -167,7 +167,7 @@ func GetScheduleByDoctorId(doctorid int64, startime int64, endtime int64, orgid
 	if doctorid > 0 {
 		db = db.Where("x.doctor_type = ?", doctorid)
 	}
-	err = db.Group("x.id").Select("x.id,x.doctor_id,x.doctor_type,x.schedule_type,x.schedule_week,x.user_org_id,x.start_time,x.end_time,x.schedule_date,r.user_name,s.class_name,r.admin_user_id").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.doctor_id").Joins("left join xt_doctor_schedules as s on s.id = x.schedule_type").Where("r.org_id = ? and r.status = 1", orgid).Scan(&schedule).Error
+	err = db.Group("x.id").Select("x.id,x.doctor_id,x.doctor_type,x.schedule_type,x.schedule_week,x.user_org_id,x.start_time,x.end_time,x.schedule_date,r.user_name,s.class_name,r.admin_user_id,s.class_attributes").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.doctor_id").Joins("left join xt_doctor_schedules as s on s.id = x.schedule_type").Where("r.org_id = ? and r.status = 1 and s.user_org_id = ?", orgid, orgid).Scan(&schedule).Error
 	return schedule, err
 }
 
@@ -186,7 +186,7 @@ func ToSearchSeacheduleList(keywords string, startime int64, endtime int64, orgi
 	//if(doctorid >0){
 	//  db = db.Where("x.doctor_id = ?", doctorid)
 	//}
-	err = db.Group("x.id").Select("x.id,x.doctor_id,x.doctor_type,x.schedule_type,x.schedule_week,x.user_org_id,x.start_time,x.schedule_date,x.end_time,r.user_type,r.user_name,s.class_name,r.admin_user_id").Joins("left join sgj_users.sgj_user_admin_role AS r ON r.admin_user_id = x.doctor_id").Joins("left join xt_doctor_schedules as s on s.id = x.schedule_type").Where("r.org_id = ? and r.status = 1 and r.user_name like ?", orgid, likeKey).Scan(&schedule).Error
+	err = db.Group("x.id").Select("x.id,x.doctor_id,x.doctor_type,x.schedule_type,x.schedule_week,x.user_org_id,x.start_time,x.schedule_date,x.end_time,r.user_type,r.user_name,s.class_name,r.admin_user_id,s.class_attributes").Joins("left join sgj_users.sgj_user_admin_role AS r ON r.admin_user_id = x.doctor_id").Joins("left join xt_doctor_schedules as s on s.id = x.schedule_type and s.user_org_id = ?", orgid).Where("r.org_id = ? and r.status = 1  and r.user_name like ?", orgid, likeKey).Scan(&schedule).Error
 	return schedule, err
 }