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

controllers/doctor_schedule_api_controller.go

 	beego.Router("api/schedule/deletestaffschedule", &DoctorScheduleApiController{}, "Get:DeleteStaffSchedule")
 	beego.Router("/api/schedule/copystaffschedule", &DoctorScheduleApiController{}, "Get:CopyStaffSchedule")
 	beego.Router("/api/scheudle/updatecontinusschedule", &DoctorScheduleApiController{}, "Get:UpdateContinusSchedule")
+	beego.Router("/api/schedule/savenursesort", &DoctorScheduleApiController{}, "Get:SaveNureSort")
+	beego.Router("/api/schedule/saveisschedule", &DoctorScheduleApiController{}, "Get:SaveIsSchedule")
+	beego.Router("/api/schedule/getscheudlelisttotal", &DoctorScheduleApiController{}, "Get:GetScheduleListTotal")
 }
 
 func (this *DoctorScheduleApiController) SaveDoctorSchedules() {
 	timetwo_end := this.GetString("timetwo_end")
 	work_time := this.GetString("work_time")
 	remarks := this.GetString("remarks")
-
+	minute, _ := this.GetInt64("minute")
 	schedules := models.DoctorSchedules{
 		ClassName:       class_name,
 		ClassAttributes: class_attributes,
 		UserOrgId:       orgId,
 		Status:          1,
 		Ctime:           time.Now().Unix(),
+		Minute:          minute,
 	}
 
 	//查询班种名称是否存在
 	work_time := this.GetString("work_time")
 	remarks := this.GetString("remarks")
 	user_org_id, _ := this.GetInt64("user_org_id")
-
+	minute, _ := this.GetInt64("minute")
 	schedules := models.DoctorSchedules{
 		ClassName:       class_name,
 		ClassAttributes: class_attributes,
 		TimetwoType:     timetwo_type,
 		WorkTime:        work_time,
 		Remarks:         remarks,
+		Minute:          minute,
 	}
 
 	if user_org_id == 0 {
 	appId := this.GetAdminUserInfo().CurrentAppId
 	//admin_user_id := this.GetAdminUserInfo().AdminUser.Id
 	list, err := service.GetDoctorList(orgId, appId)
+
+	//获取所有的医生
+	doctorList, err := service.GetAllDoctorList(orgId, appId)
+
+	//获取所有的护士
+	nurseList, err := service.GetAllNurseList(orgId, appId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 		return
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": list,
+		"list":       list,
+		"doctorlist": doctorList,
+		"nurselist":  nurseList,
 	})
 }
 
 		"schedule": schedule,
 	})
 }
+
+func (this *DoctorScheduleApiController) SaveNureSort() {
+
+	id, _ := this.GetInt64("id")
+	fmt.Println("id", id)
+	sort, _ := this.GetInt64("sort")
+	fmt.Println("sort", sort)
+	role := models.App_Role{
+		Sort: sort,
+	}
+	err := service.SaveNurseSort(&role, id)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"role": role,
+	})
+}
+
+func (this *DoctorScheduleApiController) SaveIsSchedule() {
+
+	id, _ := this.GetInt64("id")
+	fmt.Println("id", id)
+	is_sort, _ := this.GetInt64("is_sort")
+	fmt.Println("is_sort", is_sort)
+	role := models.App_Role{
+		IsSort: is_sort,
+	}
+	err := service.SaveIsSchedule(id, &role)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"role": role,
+	})
+}
+
+func (this *DoctorScheduleApiController) GetScheduleListTotal() {
+
+	start_time, _ := this.GetInt64("start_time")
+	fmt.Println(start_time)
+	end_time, _ := this.GetInt64("end_time")
+	fmt.Println("end_time", end_time)
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	//统计总工时
+	scheudletotal, err := service.GetScheduleListTotal(orgId, start_time, end_time)
+	list, err := service.GetTotalMinutes(orgId, start_time, end_time)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"scheudletotal": scheudletotal,
+		"list":          list,
+	})
+}

models/doctor_schedule_models.go

 	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"`
+	Minute          int64  `gorm:"column:minute" json:"minute" form:"minute"`
 }
 
 func (DoctorSchedules) TableName() string {
 	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"`
+	Sort            int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	IsSort          int64  `gorm:"column:is_sort" json:"is_sort" form:"is_sort"`
+	WorkTime        string `gorm:"column:work_time" json:"work_time" form:"work_time"`
+	Minute          int64  `gorm:"column:minute" json:"minute" form:"minute"`
 }
 
 type XTSgjUserAdminRole struct {
 	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 	UserName    string `gorm:"column:user_name" json:"user_name" form:"user_name"`
 	UserType    int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
+	UserTitle   int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
+	Sort        int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	IsSort      int64  `gorm:"column:is_sort" json:"is_sort" form:"is_sort"`
 }
 
 func (XTSgjUserAdminRole) TableName() string {
 func (ContinueSchedule) TableName() string {
 	return "xt_continue_schedule"
 }
+
+type CountStaffSchedule struct {
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	DoctorId      int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_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"`
+	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"`
+	Sort          int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	Count         int64
+	TotalMininute int64 `gorm:"column:totalminute" json:"totalminute" form:"totalminute"`
+}

models/role_models.go

 	Sex             int64  `gorm:"column:sex" json:"sex" form:"sex"`
 	Birthday        int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
 	Sort            int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	IsSort          int64  `gorm:"column:is_sort" json:"is_sort" form:"is_sort"`
 }
 
 func (App_Role) TableName() string {

service/data.go

 
 func BatchInsertDoctorSchedule(orgid int64) (err error) {
 
-	err = readDb.Exec("INSERT INTO sgj_xt.xt_doctor_schedules(user_org_id,class_name,class_attributes,timeone_start,timeone_type,timeone_end,timetwo_start,timetwo_type,timetwo_end,work_time,remarks,status,ctime) SELECT ?, class_name,class_attributes,timeone_start,timeone_type,timeone_end,timetwo_start,timetwo_type,timetwo_end,work_time,remarks,status,ctime FROM xt_doctor_schedules WHERE user_org_id = 0", orgid).Error
+	err = readDb.Exec("INSERT INTO sgj_xt.xt_doctor_schedules(user_org_id,class_name,class_attributes,timeone_start,timeone_type,timeone_end,timetwo_start,timetwo_type,timetwo_end,work_time,remarks,status,ctime,minute) SELECT ?, class_name,class_attributes,timeone_start,timeone_type,timeone_end,timetwo_start,timetwo_type,timetwo_end,work_time,remarks,status,ctime,minute FROM xt_doctor_schedules WHERE user_org_id = 0", orgid).Error
 	return
 }
 

service/doctor_schedule_service.go

 
 func UpdateScheduleList(id int64, schedules *models.DoctorSchedules) error {
 
-	err := XTReadDB().Model(&schedules).Where("id=?", id).Updates(map[string]interface{}{"class_name": schedules.ClassName, "class_attributes": schedules.ClassAttributes, "timeone_start": schedules.TimeoneStart, "timeone_type": schedules.TimeoneType, "timeone_end": schedules.TimeoneEnd, "timetwo_start": schedules.TimetwoStart, "timetwo_type": schedules.TimetwoType, "timetwo_end": schedules.TimetwoEnd, "work_time": schedules.WorkTime, "remarks": schedules.Remarks, "mtime": time.Now().Unix()}).Error
+	err := XTReadDB().Model(&schedules).Where("id=?", id).Updates(map[string]interface{}{"class_name": schedules.ClassName, "class_attributes": schedules.ClassAttributes, "timeone_start": schedules.TimeoneStart, "timeone_type": schedules.TimeoneType, "timeone_end": schedules.TimeoneEnd, "timetwo_start": schedules.TimetwoStart, "timetwo_type": schedules.TimetwoType, "timetwo_end": schedules.TimetwoEnd, "work_time": schedules.WorkTime, "remarks": schedules.Remarks, "minute": schedules.Minute, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
 
 func GetDoctorList(orgid int64, appid int64) (role []*models.XTSgjUserAdminRole, err error) {
 
-	err = UserReadDB().Model(&role).Where("org_id = ? and app_id = ? and status = 1 ", orgid, appid).Order("user_type desc").Find(&role).Error
+	err = UserReadDB().Model(&role).Where("org_id = ? and app_id = ? and (user_type = 2 or user_type = 3) and status = 1 and is_sort = 1", orgid, appid).Order("user_type desc").Find(&role).Error
+	return role, err
+}
+
+func GetAllDoctorList(orgid int64, appid int64) (role []*models.XTSgjUserAdminRole, err error) {
+
+	err = UserReadDB().Model(&role).Where("org_id =? and app_id = ? and user_type = 2 and status = 1", orgid, appid).Order("sort desc").Find(&role).Error
+	return role, err
+}
+
+func GetAllNurseList(orgid int64, appid int64) (role []*models.XTSgjUserAdminRole, err error) {
+
+	err = UserReadDB().Model(&role).Where("org_id = ? and app_id = ? and user_type =3 and status =1", orgid, appid).Order("sort desc").Find(&role).Error
 	return role, err
 }
 
 	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,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
+	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,r.sort,r.is_sort,s.work_time,s.minute").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
 }
 
 	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,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
+	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,r.sort,r.is_sort").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
 }
 
 	//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,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
+	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,r.sort,r.is_sort").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
 }
 
 	err := XTWriteDB().Model(&schedule).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"is_status": schedule.IsStatus, "mtime": time.Now().Unix()}).Error
 	return err
 }
+
+func SaveNurseSort(role *models.App_Role, id int64) error {
+
+	err := UserWriteDB().Model(&role).Where("id = ?", id).Updates(map[string]interface{}{"sort": role.Sort}).Error
+	return err
+}
+
+func SaveIsSchedule(id int64, role *models.App_Role) error {
+
+	err := UserWriteDB().Model(&role).Where("id=?", id).Updates(map[string]interface{}{"is_sort": role.IsSort}).Error
+	return err
+}
+
+func GetScheduleListTotal(orgid int64, startime int64, endtime int64) (schedule []*models.CountStaffSchedule, err error) {
+
+	db := XTReadDB().Table("xt_staff_schedule as x").Where("x.status = 1")
+	if startime > 0 {
+		db = db.Where("x.start_time >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.end_time <=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Group("x.doctor_id,x.schedule_type").Select("x.doctor_id,x.schedule_type,x.start_time,x.end_time,x.schedule_date,r.user_name,s.class_name,r.sort,r.is_sort,count(s.class_name) as count").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
+}
+
+func GetTotalMinutes(orgid int64, startime int64, endtime int64) (schedule []*models.CountStaffSchedule, err error) {
+
+	db := XTReadDB().Table("xt_staff_schedule as x").Where("x.status = 1")
+	if startime > 0 {
+		db = db.Where("x.start_time >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.end_time <=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Group("x.doctor_id").Select("x.doctor_id,x.schedule_type,x.start_time,x.end_time,x.schedule_date,r.user_name,s.class_name,r.sort,r.is_sort,sum(s.minute) as totalminute").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
+}

service/role_service.go

 		CreateTime:    now,
 		ModifyTime:    now,
 		RoleIds:       roleIds,
+		IsSort:        1,
 	}
 	if createApp_RoleErr := tx.Create(&app_role).Error; createApp_RoleErr != nil {
 		tx.Rollback()