消毒计划

controllers/doctor_schedule_api_controller.go

@@ -0,0 +1,493 @@
+package controllers
+
+import (
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"fmt"
+	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
+	"time"
+)
+
+type DoctorScheduleApiController struct {
+	BaseAuthAPIController
+}
+
+func DoctorScheduleRouters() {
+
+	beego.Router("/api/schedules/savedoctorschedules", &DoctorScheduleApiController{}, "Get:SaveDoctorSchedules")
+	beego.Router("/api/schedules/getdoctorschedulelist", &DoctorScheduleApiController{}, "Get:GetDoctorScheduleList")
+	beego.Router("/api/schedules/getscheduledetail", &DoctorScheduleApiController{}, "Get:GetScheduleDetail")
+	beego.Router("/api/schedules/updateschedule", &DoctorScheduleApiController{}, "Get:UpdateSchedule")
+	beego.Router("/api/schedule/deleteschedule", &DoctorScheduleApiController{}, "Get:DeleteSchedule")
+	beego.Router("/api/schedule/getdoctorlist", &DoctorScheduleApiController{}, "Get:GetDoctorList")
+	beego.Router("/api/schedule/getschedulelist", &DoctorScheduleApiController{}, "Get:GetScheduleList")
+	beego.Router("/api/schedule/addschedule", &DoctorScheduleApiController{}, "Get:AddSchedule")
+	beego.Router("/api/schedule/getstaffschedulelist", &DoctorScheduleApiController{}, "Get:GetStaffScheduleList")
+	beego.Router("/api/schedule/getnextweeklist", &DoctorScheduleApiController{}, "Get:GetNextWeekList")
+	beego.Router("/api/schedule/getschedulebydoctorid", &DoctorScheduleApiController{}, "Get:GetScheduleByDoctorId")
+	beego.Router("/api/schedule/tosearchsechedulelist", &DoctorScheduleApiController{}, "Get:ToSearchScheduleList")
+	beego.Router("api/schedule/deletestaffschedule", &DoctorScheduleApiController{}, "Get:DeleteStaffSchedule")
+	beego.Router("/api/schedule/copystaffschedule", &DoctorScheduleApiController{}, "Get:CopyStaffSchedule")
+	beego.Router("/api/scheudle/updatecontinusschedule", &DoctorScheduleApiController{}, "Get:UpdateContinusSchedule")
+}
+
+func (this *DoctorScheduleApiController) SaveDoctorSchedules() {
+	adminUser := this.GetAdminUserInfo()
+	orgId := adminUser.CurrentOrgId
+	class_name := this.GetString("class_name")
+	class_attributes, _ := this.GetInt64("class_attributes")
+	timeone_start := this.GetString("timeone_start")
+	timeone_type, _ := this.GetInt64("timeone_type")
+	timeone_end := this.GetString("timeone_end")
+	timetwo_start := this.GetString("timetwo_start")
+	timetwo_type, _ := this.GetInt64("timetwo_type")
+	timetwo_end := this.GetString("timetwo_end")
+	work_time := this.GetString("work_time")
+	remarks := this.GetString("remarks")
+
+	schedules := models.DoctorSchedules{
+		ClassName:       class_name,
+		ClassAttributes: class_attributes,
+		TimeoneStart:    timeone_start,
+		TimeoneType:     timeone_type,
+		TimeoneEnd:      timeone_end,
+		TimetwoStart:    timetwo_start,
+		TimetwoEnd:      timetwo_end,
+		TimetwoType:     timetwo_type,
+		WorkTime:        work_time,
+		Remarks:         remarks,
+		UserOrgId:       orgId,
+		Status:          1,
+		Ctime:           time.Now().Unix(),
+	}
+
+	//查询班种名称是否存在
+	_, errcode := service.GetClassName(orgId, class_name)
+	//如果不存在
+	if errcode == gorm.ErrRecordNotFound {
+		err := service.CreateDotorSchedule(&schedules)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+			return
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"schedules": schedules,
+		})
+	} else if errcode == nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "班种名称已存在")
+		return
+	}
+
+}
+
+func (this *DoctorScheduleApiController) GetDoctorScheduleList() {
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	page, _ := this.GetInt64("page")
+	limit, _ := this.GetInt64("limit")
+	schedules, total, err := service.GetDoctorScheduleList(orgId, page, limit)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"schedules": schedules,
+		"total":     total,
+	})
+	//查询该机构是否有班种，如果没有去读系统默认的
+	//_, errcode := service.GetDoctorScheduleByOrgId(orgId)
+	//if errcode == gorm.ErrRecordNotFound{
+	//  schedules, total, err := service.GetDoctorScheduleList(0,page, limit)
+	//  if err != nil {
+	//    this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+	//    return
+	//  }
+	//
+	//  this.ServeSuccessJSON(map[string]interface{}{
+	//    "schedules": schedules,
+	//    "total":total,
+	//  })
+	//}else if errcode == nil{
+	//  schedules, total, err := service.GetDoctorScheduleList(orgId, page, limit)
+	//  if err != nil {
+	//    this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+	//    return
+	//  }
+	//
+	//  this.ServeSuccessJSON(map[string]interface{}{
+	//    "schedules": schedules,
+	//    "total":total,
+	//  })
+	//}
+}
+
+func (this *DoctorScheduleApiController) GetScheduleDetail() {
+
+	id, _ := this.GetInt64("id")
+	scheduleDetail, err := service.GetScheduleDetail(id)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"scheduleDetail": scheduleDetail,
+	})
+}
+
+func (this *DoctorScheduleApiController) UpdateSchedule() {
+
+	id, _ := this.GetInt64("id")
+	class_name := this.GetString("class_name")
+	class_attributes, _ := this.GetInt64("class_attributes")
+	timeone_start := this.GetString("timeone_start")
+	timeone_type, _ := this.GetInt64("timeone_type")
+	timeone_end := this.GetString("timeone_end")
+	timetwo_start := this.GetString("timetwo_start")
+	timetwo_type, _ := this.GetInt64("timetwo_type")
+	timetwo_end := this.GetString("timetwo_end")
+	work_time := this.GetString("work_time")
+	remarks := this.GetString("remarks")
+	user_org_id, _ := this.GetInt64("user_org_id")
+
+	schedules := models.DoctorSchedules{
+		ClassName:       class_name,
+		ClassAttributes: class_attributes,
+		TimeoneStart:    timeone_start,
+		TimeoneType:     timeone_type,
+		TimeoneEnd:      timeone_end,
+		TimetwoStart:    timetwo_start,
+		TimetwoEnd:      timetwo_end,
+		TimetwoType:     timetwo_type,
+		WorkTime:        work_time,
+		Remarks:         remarks,
+	}
+
+	if user_org_id == 0 {
+		err := service.CreateDotorSchedule(&schedules)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+			return
+		}
+	} else {
+		//查询是否班种名称已存在
+		scheduledata, _ := service.GetClassNameIsExsit(class_name, user_org_id, id)
+
+		if scheduledata.ID > 0 && scheduledata.ID != id {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "班种名称已存在")
+			return
+		}
+
+		err := service.UpdateScheduleList(id, &schedules)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+			return
+		}
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"schedules": schedules,
+	})
+}
+
+func (this *DoctorScheduleApiController) DeleteSchedule() {
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	id, _ := this.GetInt64("id")
+	//产寻该班种是否存在排班，如果存在不能删除
+	_, errcode := service.GetStaffScheduleByScheduleType(id, orgId)
+	if errcode == gorm.ErrRecordNotFound {
+		err := service.DeleteScheduleById(id)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+			return
+		}
+		returnData := make(map[string]interface{}, 0)
+		returnData["msg"] = "ok"
+		this.ServeSuccessJSON(returnData)
+		return
+	} else if errcode == nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "该班种已存在排班,不能删除")
+		return
+	}
+
+}
+
+func (this *DoctorScheduleApiController) GetDoctorList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	appId := this.GetAdminUserInfo().CurrentAppId
+	//admin_user_id := this.GetAdminUserInfo().AdminUser.Id
+	list, err := service.GetDoctorList(orgId, appId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *DoctorScheduleApiController) GetScheduleList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	_, errcode := service.GetDoctorScheduleByOrgId(orgId)
+	if errcode == gorm.ErrRecordNotFound {
+		scheduleList, err := service.GetScheduleList(0)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+			return
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"scheduleList": scheduleList,
+		})
+	} else {
+		scheduleList, err := service.GetScheduleList(orgId)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+			return
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"scheduleList": scheduleList,
+		})
+	}
+}
+
+func (this *DoctorScheduleApiController) AddSchedule() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	doctor_id, _ := this.GetInt64("doctor_id")
+	fmt.Println("doctor_id", doctor_id)
+	doctor_type, _ := this.GetInt64("doctor_type")
+	fmt.Println("doctor_type", doctor_type)
+	start_time, _ := this.GetInt64("start_time")
+	fmt.Println("start_time", start_time)
+	end_time, _ := this.GetInt64("end_time")
+	fmt.Println("end_time", end_time)
+	schedule_type, _ := this.GetInt64("schedule_type")
+	fmt.Println("schedule_type", schedule_type)
+	schedule_week, _ := this.GetInt64("schedule_week")
+	fmt.Println("schedule_week", schedule_week)
+	schedule_date, _ := this.GetInt64("schedule_date")
+	schedule := models.StaffSchedule{
+		DoctorId:     doctor_id,
+		DoctorType:   doctor_type,
+		ScheduleType: schedule_type,
+		ScheduleWeek: schedule_week,
+		UserOrgId:    orgId,
+		StartTime:    start_time,
+		EndTime:      end_time,
+		Status:       1,
+		Ctime:        time.Now().Unix(),
+		ScheduleDate: schedule_date,
+	}
+
+	_, errcode := service.GetScheduleListDetail(doctor_id, orgId, schedule_date)
+	fmt.Println("errcode-----", errcode)
+	if errcode == gorm.ErrRecordNotFound {
+		err := service.AddSchedule(&schedule)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+			return
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"schedule": schedule,
+		})
+	} else if errcode == nil {
+		schedules, _ := service.GetScheduleListDetail(doctor_id, orgId, schedule_date)
+		err := service.UpdateStaffList(&schedule, schedules.ID)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+			return
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"schedule": schedule,
+		})
+	}
+
+}
+
+func (this *DoctorScheduleApiController) GetStaffScheduleList() {
+
+	start_time, _ := this.GetInt64("start_time")
+	fmt.Println("start_time", start_time)
+	end_time, _ := this.GetInt64("end_time")
+	fmt.Println("end_time", end_time)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	staffList, err := service.GetStaffScheduleList(orgId, start_time, end_time)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"staffList": staffList,
+	})
+}
+
+func (this *DoctorScheduleApiController) GetNextWeekList() {
+	start_time, _ := this.GetInt64("start_time")
+	fmt.Println("start_time", start_time)
+	end_time, _ := this.GetInt64("end_time")
+	fmt.Println("end_time", end_time)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	staffList, err := service.GetStaffScheduleList(orgId, start_time, end_time)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"staffList": staffList,
+	})
+}
+
+func (this *DoctorScheduleApiController) GetScheduleByDoctorId() {
+
+	doctor_id, _ := this.GetInt64("doctor_id")
+	start_time, _ := this.GetInt64("start_time")
+	end_time, _ := this.GetInt64("end_time")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	staffList, err := service.GetScheduleByDoctorId(doctor_id, start_time, end_time, orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"staffList": staffList,
+	})
+}
+
+func (this *DoctorScheduleApiController) ToSearchScheduleList() {
+
+	//doctor_id, _ := this.GetInt64("doctor_id")
+	user_name := this.GetString("user_name")
+	start_time, _ := this.GetInt64("start_time")
+	end_time, _ := this.GetInt64("end_time")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	staffList, err := service.ToSearchSeacheduleList(user_name, start_time, end_time, orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"staffList": staffList,
+	})
+}
+
+func (this *DoctorScheduleApiController) DeleteStaffSchedule() {
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	start_time, _ := this.GetInt64("start_time")
+	fmt.Println("start_time", start_time)
+	end_time, _ := this.GetInt64("end_time")
+	err := service.DeleteStaffSchedule(orgId, start_time, end_time)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *DoctorScheduleApiController) CopyStaffSchedule() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	start_time, _ := this.GetInt64("start_time")
+	fmt.Println("start_time", start_time)
+	end_time, _ := this.GetInt64("end_time")
+	fmt.Println("end_time", end_time)
+	copy_startime, _ := this.GetInt64("copy_startime")
+	fmt.Println("copy_startime", copy_startime)
+	copy_endtime, _ := this.GetInt64("copy_endtime")
+	schedule, err := service.GetStaffScheduleListTwo(orgId, start_time, end_time)
+	//查询选中日期的排班是否存在
+	_, errcode := service.GetNextWeekSchedule(orgId, copy_startime, copy_endtime)
+	if errcode == gorm.ErrRecordNotFound {
+		for _, item := range schedule {
+			//fmt.Println(item.StartTime+604800)
+			//礼拜1
+			if item.ScheduleWeek == 1 {
+				item.ScheduleDate = copy_startime
+			}
+			if item.ScheduleWeek == 2 {
+				item.ScheduleDate = copy_startime + 86400
+			}
+			if item.ScheduleWeek == 3 {
+				item.ScheduleDate = copy_startime + 172800
+			}
+			if item.ScheduleWeek == 4 {
+				item.ScheduleDate = copy_startime + 259200
+			}
+			if item.ScheduleWeek == 5 {
+				item.ScheduleDate = copy_startime + 345600
+			}
+
+			if item.ScheduleWeek == 6 {
+				item.ScheduleDate = copy_startime + 432000
+			}
+			//礼拜天
+			if item.ScheduleWeek == 0 {
+				item.ScheduleDate = copy_endtime
+			}
+			staffSchedule := models.StaffSchedule{
+				DoctorId:     item.DoctorId,
+				DoctorType:   item.DoctorType,
+				ScheduleType: item.ScheduleType,
+				ScheduleWeek: item.ScheduleWeek,
+				UserOrgId:    item.UserOrgId,
+				StartTime:    copy_startime,
+				EndTime:      copy_endtime,
+				Status:       1,
+				Ctime:        time.Now().Unix(),
+				ScheduleDate: item.ScheduleDate,
+			}
+			service.AddSchedule(&staffSchedule)
+		}
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+			return
+		}
+		returnData := make(map[string]interface{}, 0)
+		returnData["msg"] = "ok"
+		this.ServeSuccessJSON(returnData)
+		return
+	} else if errcode == nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "排班数据已存在")
+		fmt.Print("下周排班已存在")
+		return
+	}
+
+}
+
+func (this *DoctorScheduleApiController) UpdateContinusSchedule() {
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	is_status, _ := this.GetInt64("is_status")
+	fmt.Println("is_status", is_status)
+	schedule := models.ContinueSchedule{
+		IsStatus: is_status,
+	}
+	err := service.UpdateContinusSchedule(&schedule, orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"schedule": schedule,
+	})
+}

controllers/doctors_api_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"XT_New/service"
+	"strconv"
 
 	"XT_New/models"
 	"XT_New/utils"
@@ -22,6 +23,9 @@ func DoctorApiRegistRouters() {
 	beego.Router("/api/patient/getAllDoctor", &DoctorsApiController{}, "Get:GetAllDoctor")
 	beego.Router("/api/patient/updatedryweightdata", &DoctorsApiController{}, "Post:UpdatedDryWeightData")
 	beego.Router("/api/patient/getalldata", &DoctorsApiController{}, "Get:GetAllData")
+	beego.Router("/api/paients/getdryweightdetail", &DoctorsApiController{}, "Get:GetDryWeightDetail")
+	beego.Router("/api/patients/modifydryweightdata", &DoctorsApiController{}, "Get:ModifydryWeightData")
+	beego.Router("/api/patient/deletedryweight", &DoctorsApiController{}, "Delete:DeleteDryWeight")
 }
 
 func (c *DoctorsApiController) GetAllDoctorAndNurse() {
@@ -154,8 +158,6 @@ func (c *DoctorsApiController) UpdatedDryWeightData() {
 
 	err := service.CreatePatientWeight(&patientDryweight)
 	//sgjPatientDryweight, _ := service.GetLastData(orgid)
-	//fmt.Println("fffffffffffffffffffffffffffffffffffffffffffff")
-	//fmt.Println("sgjPatientDryWeight",sgjPatientDryweight)s
 	recordDateStr := time.Now().Format("2006-01-02")
 	recordDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
 	fmt.Scan("parseDateErr", parseDateErr)
@@ -192,3 +194,47 @@ func (c *DoctorsApiController) GetAllData() {
 		"total": total,
 	})
 }
+
+func (c *DoctorsApiController) GetDryWeightDetail() {
+
+	id, _ := c.GetInt64("id")
+	dryweight, _ := service.GetDryWeightDetailById(id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"dryweight": dryweight,
+	})
+}
+
+func (c *DoctorsApiController) ModifydryWeightData() {
+
+	adjustvalue := c.GetString("adjustvalue")
+
+	creator, _ := c.GetInt64("creator")
+
+	dryweight, _ := c.GetInt64("dryweight")
+	dry := strconv.FormatInt(dryweight, 10)
+	dry_weight, _ := strconv.ParseFloat(dry, 64)
+	id, _ := c.GetInt64("id")
+
+	remark := c.GetString("remark")
+
+	patientDryweight := models.SgjPatientDryweight{
+		AdjustedValue: adjustvalue,
+		Creator:       creator,
+		DryWeight:     dry_weight,
+		Remakes:       remark,
+	}
+	service.ModifyDryWeightData(&patientDryweight, id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"patientDryweight": patientDryweight,
+	})
+}
+
+func (c *DoctorsApiController) DeleteDryWeight() {
+
+	id, _ := c.GetInt64("id")
+	service.DeleteDryWeight(id)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	c.ServeSuccessJSON(returnData)
+	return
+}

controllers/gobal_config_api_controller.go

@@ -1054,6 +1054,15 @@ func (this *GobalConfigApiController) ChangeOrg() {
 			utils.ErrorLog("字段批量插入失败：%v", err)
 		}
 
+		//查询该机构是否存在医护排班
+		_, errcode := service.GetDoctorScheduleByOrgId(tempOrg.Id)
+		//如果没有就插入
+		if errcode == gorm.ErrRecordNotFound {
+			err = service.BatchInsertDoctorSchedule(tempOrg.Id)
+		} else {
+			utils.ErrorLog("医护排班默认数据插入失败：%v", err)
+		}
+
 		var didRegistedForSCRM bool = false
 		var didRegistedForCDM bool = false
 		var didRegistedForMall bool = false

controllers/mobile_api_controllers/login_api_controller.go

@@ -7,6 +7,7 @@ import (
 	"XT_New/utils"
 	"encoding/json"
 	"fmt"
+	"github.com/jinzhu/gorm"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -199,6 +200,15 @@ func (this *LoginAPIController) LoginByPwd() {
 			utils.ErrorLog("字段批量插入失败：%v", requestErr)
 		}
 
+		//查询该机构是否存在医护排班
+		_, errcode := service.GetDoctorScheduleByOrgId(org.Id)
+		//如果没有就插入
+		if errcode == gorm.ErrRecordNotFound {
+			err = service.BatchInsertDoctorSchedule(org.Id)
+		} else {
+			utils.ErrorLog("医护排班默认数据插入失败：%v", err)
+		}
+
 		this.ServeSuccessJSON(map[string]interface{}{
 			"admin": adminUser,
 			"user":  appRole,

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -0,0 +1,98 @@
+package new_mobile_api_controllers
+
+import (
+	"XT_New/controllers/mobile_api_controllers"
+	"XT_New/enums"
+	"XT_New/service"
+	"fmt"
+)
+
+type StaffScheduleApiController struct {
+	mobile_api_controllers.MobileBaseAPIAuthController
+}
+
+func (this *StaffScheduleApiController) GetMobileDoctorList() {
+
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+	appId := this.GetMobileAdminUserInfo().App.Id
+	staffList, err := service.GetDoctorList(orgId, appId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"staffList": staffList,
+	})
+}
+
+func (this *StaffScheduleApiController) GetMobileStaffScheduleList() {
+
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+	fmt.Println("orgid", orgId)
+	start_time, _ := this.GetInt64("start_time")
+	fmt.Println("staft_time", start_time)
+	end_time, _ := this.GetInt64("end_time")
+	fmt.Println("end_time", end_time)
+	staffList, err := service.GetStaffScheduleList(orgId, start_time, end_time)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"staffList": staffList,
+	})
+}
+
+func (this *StaffScheduleApiController) GetMobileNextWeekScheduleLIst() {
+
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+	fmt.Println("orgid", orgId)
+	start_time, _ := this.GetInt64("start_time")
+	fmt.Println("staft_time", start_time)
+	end_time, _ := this.GetInt64("end_time")
+	fmt.Println("end_time", end_time)
+	staffList, err := service.GetStaffScheduleList(orgId, start_time, end_time)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"staffList": staffList,
+	})
+}
+
+func (this *StaffScheduleApiController) GetScheduleByUserType() {
+	doctor_id, _ := this.GetInt64("doctor_id")
+	start_time, _ := this.GetInt64("start_time")
+	end_time, _ := this.GetInt64("end_time")
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+	staffList, err := service.GetScheduleByDoctorId(doctor_id, start_time, end_time, orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"staffList": staffList,
+	})
+}
+
+func (this *StaffScheduleApiController) GetSearchPatientByDoctorId() {
+
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+	user_name := this.GetString("user_name")
+	start_time, _ := this.GetInt64("start_time")
+	end_time, _ := this.GetInt64("end_time")
+	staffList, err := service.ToSearchSeacheduleList(user_name, start_time, end_time, orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"staffList": staffList,
+	})
+}

controllers/new_mobile_api_controllers/staff_schedule_api_router.go

@@ -0,0 +1,12 @@
+package new_mobile_api_controllers
+
+import "github.com/astaxie/beego"
+
+func StaffScheduleApiControllersRegisterRouters() {
+
+	beego.Router("/m/api/getmobiledoctorlist", &StaffScheduleApiController{}, "Get:GetMobileDoctorList")
+	beego.Router("/m/api/getmobilestaffschedulelist", &StaffScheduleApiController{}, "Get:GetMobileStaffScheduleList")
+	beego.Router("/m/api/getmobilenextweekschedulelist", &StaffScheduleApiController{}, "Get:GetMobileNextWeekScheduleLIst")
+	beego.Router("/m/api/getschedulebyusertype", &StaffScheduleApiController{}, "Get:GetScheduleByUserType")
+	beego.Router("/m/api/getsearchpatientbydoctorid", &StaffScheduleApiController{}, "Get:GetSearchPatientByDoctorId")
+}

controllers/schedule_api_controller.go

@@ -334,7 +334,13 @@ func (c *ScheduleApiController) CreateSchedule() {
 		return
 	}
 
+	redis := service.RedisClient()
+	defer redis.Close()
 	err = service.CreateSchedule(&schedule)
+
+	key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+	redis.Set(key, "", time.Second)
+
 	fmt.Println(err)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateScheduleFail)

controllers/verify_login_controller.go

@@ -7,10 +7,12 @@ import (
 	"XT_New/utils"
 	"fmt"
 	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
 	"net/url"
 	"regexp"
 	"strconv"
 	"strings"
+	"time"
 )
 
 func VerifyUserLoginControllerRegistRouters() {
@@ -184,6 +186,33 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 				utils.ErrorLog("字段批量插入失败：%v", err)
 			}
 
+			//查询该机构是否存在医护排班
+			_, errcode := service.GetDoctorScheduleByOrgId(curOrg.Id)
+			fmt.Println("errcode2------------------", errcode)
+			//如果没有就插入
+			if errcode == gorm.ErrRecordNotFound {
+				err = service.BatchInsertDoctorSchedule(curOrg.Id)
+			} else {
+				utils.ErrorLog("医护排班默认数据插入失败：%v", err)
+			}
+
+			//产询该机构是否连续排班的状态值
+			_, errcodes := service.GetContinueScheduleByOrgId(curOrg.Id)
+			if errcodes == gorm.ErrRecordNotFound {
+				schedule := models.ContinueSchedule{
+					IsStatus:  1,
+					UserOrgId: curOrg.Id,
+					Status:    1,
+					Ctime:     time.Now().Unix(),
+				}
+				err := service.CreateContinueSchedule(&schedule)
+				if err == nil {
+					utils.ErrorLog("创建连续排班值成功：%v", err)
+				}
+			} else {
+				utils.ErrorLog("连续排班已存在数据：%v", err)
+			}
+
 			var pruviews []*models.Purview
 			var curAppUrlfors []string
 			if len(curAppUrlfors) == 0 {

main.go

@@ -16,6 +16,6 @@ func main() {
 	service.BeginAutoCreateWeekDisinfectionJob()
 	//service.BeginAutoCreatePlanJob()
 	//service.AutoClearSchedules()
-
+	service.BeginAutoCreateStaffScheduleJob()
 	beego.Run()
 }

models/doctor_schedule_models.go

@@ -0,0 +1,85 @@
+package models
+
+type DoctorSchedules struct {
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	ClassName       string `gorm:"column:class_name" json:"class_name" form:"class_name"`
+	ClassAttributes int64  `gorm:"column:class_attributes" json:"class_attributes" form:"class_attributes"`
+	TimeoneStart    string `gorm:"column:timeone_start" json:"timeone_start" form:"timeone_start"`
+	TimeoneType     int64  `gorm:"column:timeone_type" json:"timeone_type" form:"timeone_type"`
+	TimeoneEnd      string `gorm:"column:timeone_end" json:"timeone_end" form:"timeone_end"`
+	TimetwoStart    string `gorm:"column:timetwo_start" json:"timetwo_start" form:"timetwo_start"`
+	TimetwoType     int64  `gorm:"column:timetwo_type" json:"timetwo_type" form:"timetwo_type"`
+	TimetwoEnd      string `gorm:"column:timetwo_end" json:"timetwo_end" form:"timetwo_end"`
+	WorkTime        string `gorm:"column:work_time" json:"work_time" form:"work_time"`
+	Remarks         string `gorm:"column:remarks" json:"remarks" form:"remarks"`
+	UserOrgId       int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	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"`
+}
+
+func (DoctorSchedules) TableName() string {
+	return "xt_doctor_schedules"
+}
+
+type StaffSchedule 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"`
+}
+
+func (StaffSchedule) TableName() string {
+	return "xt_staff_schedule"
+}
+
+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"`
+}
+
+type XTSgjUserAdminRole struct {
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	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"`
+}
+
+func (XTSgjUserAdminRole) TableName() string {
+	return "sgj_user_admin_role"
+}
+
+type ContinueSchedule struct {
+	IsStatus  int64 `gorm:"column:is_status" json:"is_status" form:"is_status"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (ContinueSchedule) TableName() string {
+	return "xt_continue_schedule"
+}

routers/router.go

@@ -62,4 +62,6 @@ func init() {
 	new_m_api.NewManageApiControllersRegisterRouters()
 	controllers.ManageRouters()
 	//controllers.PatientRouters()
+	controllers.DoctorScheduleRouters()
+	new_m_api.StaffScheduleApiControllersRegisterRouters()
 }

service/auto_create_staff_schedule_service.go

@@ -0,0 +1,147 @@
+package service
+
+import (
+	"XT_New/models"
+	"fmt"
+	"github.com/jinzhu/gorm"
+	"github.com/robfig/cron"
+	"time"
+)
+
+//// cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
+//var createWeekDisinfectionCronJob *cron.Cron
+//
+//func init() {
+//  createWeekDisinfectionCronJob = cron.New()
+//  //spec := "0 0 23 * * ?" // 每天23点执行一次
+//  spec := "0 55 23 * * ?" // 每天23点55执行一次
+//  //spec := "0 0 5 * * ?" // 每天23点55执行一次
+//  //spec := "0 */1 * * * ?" // 每1分钟执行一次
+//  createWeekDisinfectionCronJob.AddFunc(spec, func() {
+//
+//    AutoCreateWeekDisinfectionJob()
+//  })
+//}
+//
+//func BeginAutoCreateWeekDisinfectionJob() {
+//
+//  createWeekDisinfectionCronJob.Start()
+//}
+
+//// cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
+
+var createStaffScheduleCronJob *cron.Cron
+
+func init() {
+	createStaffScheduleCronJob = cron.New()
+	//spec := "0 */1 * * * ?" // 每1分钟执行一次
+	spec := "0 55 23 * * ?" // 每天23点55执行一次
+	createStaffScheduleCronJob.AddFunc(spec, func() {
+		AutoCreateStaffScheduleJob()
+	})
+}
+
+func BeginAutoCreateStaffScheduleJob() {
+
+	createStaffScheduleCronJob.Start()
+}
+
+func AutoCreateStaffScheduleJob() {
+
+	now := time.Now()
+
+	offset := int(time.Monday - now.Weekday())
+	if offset > 0 {
+		offset = -6
+	}
+	weekStart := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
+	fmt.Println("weekStart", weekStart.Unix())
+	start_time := weekStart.Unix()
+	fmt.Println("start_time", start_time)
+	weekEnd := time.Date(now.Year(), now.Month(), now.Day()+6, 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
+	fmt.Println("weekEnd", weekEnd.Unix())
+	end_time := weekEnd.Unix()
+	fmt.Println("end_time", end_time)
+
+	//查询该机构的连续排班是否开启
+	// 获取所有机构信息
+	orgs, _ := GetAllOrgs()
+	for _, item := range orgs {
+		fmt.Println(item)
+		//查询该机构是否开启连续排班功能
+		schdule, _ := GetAutoContinueSchdule(item.ID)
+		//如果状态值未开启不生成连续排班
+		if schdule.IsStatus == 0 {
+			fmt.Println("连续排班未开启")
+		}
+		//连续排班开启
+		if schdule.IsStatus == 1 {
+			//查询该机构本周的排班数据
+			schedules, _ := GeThisWeekScheduleData(item.ID, start_time, end_time)
+			for _, it := range schedules {
+				staffSchedule := models.StaffSchedule{
+					DoctorId:     it.DoctorId,
+					DoctorType:   it.DoctorType,
+					ScheduleType: it.ScheduleType,
+					ScheduleWeek: it.ScheduleWeek,
+					UserOrgId:    it.UserOrgId,
+					StartTime:    it.StartTime + 604800,
+					EndTime:      it.EndTime + 604800,
+					Status:       1,
+					Ctime:        time.Now().Unix(),
+					ScheduleDate: it.ScheduleDate + 604800,
+				}
+				//产询该机构下周是否填加了数据
+				_, errcode := GetNextWeekData(it.UserOrgId, it.DoctorId, it.ScheduleDate+604800)
+				if errcode == gorm.ErrRecordNotFound {
+					AddSchedules(&staffSchedule)
+				} else {
+					fmt.Println("下周数据已生成")
+				}
+				//if len(schedules) != len(schedule) {
+				//    AddSchedules(&staffSchedule)
+				//}else{
+				//   fmt.Println("下周数据已生成")
+				//   //createStaffScheduleCronJob.Stop()
+				//}
+			}
+		}
+	}
+}
+
+func GetAllOrgs() (orgs []*models.SgjUserOrg, err error) {
+
+	err = UserReadDB().Model(&orgs).Where("status = 1").Find(&orgs).Error
+	return orgs, err
+}
+
+func GetAutoContinueSchdule(orgid int64) (models.ContinueSchedule, error) {
+
+	schedule := models.ContinueSchedule{}
+	err := XTReadDB().Model(&schedule).Where("user_org_id = ? and status = 1", orgid).Find(&schedule).Error
+	return schedule, err
+}
+
+func GeThisWeekScheduleData(orgid int64, startime int64, endtime int64) (staffschedule []*models.StaffSchedule, err error) {
+
+	err = XTReadDB().Model(&staffschedule).Where("user_org_id = ? and status = 1 and start_time>=? and end_time<=?", orgid, startime, endtime).Find(&staffschedule).Error
+	return staffschedule, err
+}
+
+func AddSchedules(schedule *models.StaffSchedule) error {
+
+	err := XTWriteDB().Model(&schedule).Create(&schedule).Error
+	return err
+}
+
+func GetNextWeekData(orgid int64, docid int64, scheduledate int64) (*models.StaffSchedule, error) {
+	schedule := models.StaffSchedule{}
+	err := XTReadDB().Model(&schedule).Where("user_org_id = ? and status = 1 and doctor_id =? and schedule_date =?", orgid, docid, scheduledate).Find(&schedule).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &schedule, nil
+}

service/data.go

@@ -225,3 +225,15 @@ func BatchInsertFiledSystemConfig(org_id int64) (err error) {
 	err = readDb.Exec("INSERT  INTO sgj_xt.xt_filed_config  ( org_id,  module,  filed_name,  filed_name_cn,  is_show ) SELECT ?,  module,  filed_name,  filed_name_cn,  is_show FROM sgj_xt.xt_filed_config  WHERE org_id = 9442", org_id).Error
 	return
 }
+
+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
+	return
+}
+
+func CreateContinueSchedule(schedule *models.ContinueSchedule) error {
+
+	err := writeDb.Model(&schedule).Create(&schedule).Error
+	return err
+}

service/doctor_schedule_service.go

@@ -0,0 +1,226 @@
+package service
+
+import (
+	"XT_New/models"
+	"fmt"
+	"github.com/jinzhu/gorm"
+	"time"
+)
+
+func GetClassName(orgid int64, class_name string) (*models.DoctorSchedules, error) {
+
+	schedules := models.DoctorSchedules{}
+	err := XTReadDB().Model(&schedules).Where("user_org_id = ? and status = 1 and class_name = ?", orgid, class_name).Find(&schedules).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &schedules, nil
+}
+
+func CreateDotorSchedule(schedules *models.DoctorSchedules) error {
+
+	err := XTWriteDB().Create(&schedules).Error
+	return err
+}
+
+func GetDoctorScheduleByOrgId(orgid int64) (*models.DoctorSchedules, error) {
+	schedules := models.DoctorSchedules{}
+	err := XTReadDB().Model(&schedules).Where("user_org_id = ? and status = 1", orgid).Find(&schedules).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &schedules, nil
+}
+
+func GetDoctorScheduleList(orgid int64, page int64, limit int64) (schedules []*models.DoctorSchedules, total int64, err error) {
+	offset := (page - 1) * limit
+	err = XTReadDB().Model(&schedules).Where("user_org_id = ? and status =1", orgid).Count(&total).Offset(offset).Limit(limit).Find(&schedules).Error
+	return schedules, total, err
+}
+
+func GetScheduleDetail(id int64) (models.DoctorSchedules, error) {
+	schedules := models.DoctorSchedules{}
+	err := XTReadDB().Model(&schedules).Where("id=? and status = 1", id).Find(&schedules).Error
+	return schedules, err
+}
+
+func GetClassNameIsExsit(classname string, orgid int64, id int64) (schedule models.DoctorSchedules, err error) {
+
+	err = XTReadDB().Model(&schedule).Where("class_name = ? and user_org_id =? and id <> ?", classname, orgid, id).First(&schedule).Error
+	return schedule, err
+}
+
+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
+	return err
+}
+
+func GetStaffScheduleByScheduleType(id int64, orgid int64) (*models.StaffSchedule, error) {
+	schedule := models.StaffSchedule{}
+	err := XTReadDB().Model(&schedule).Where("schedule_type = ? and user_org_id = ? and status = 1", id, orgid).Find(&schedule).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &schedule, nil
+}
+
+func DeleteScheduleById(id int64) error {
+	schedules := models.DoctorSchedules{}
+	err := XTWriteDB().Model(&schedules).Where("id=?", id).Updates(map[string]interface{}{"status": 0}).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
+	return role, err
+}
+
+func GetScheduleList(orgid int64) (schedule []*models.DoctorSchedules, err error) {
+
+	err = XTReadDB().Model(&schedule).Where("user_org_id = ? and status = 1", orgid).Find(&schedule).Error
+	return schedule, err
+}
+
+func GetScheduleListDetail(doctor_id int64, orgid int64, scheduledate int64) (*models.StaffSchedule, error) {
+	schedule := models.StaffSchedule{}
+	err := XTReadDB().Model(&schedule).Where("doctor_id = ? and user_org_id = ? and status =1 and schedule_date = ?", doctor_id, orgid, scheduledate).Find(&schedule).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &schedule, nil
+}
+
+func AddSchedule(schedule *models.StaffSchedule) error {
+
+	err := XTWriteDB().Create(&schedule).Error
+	return err
+}
+
+func UpdateStaffList(schedule *models.StaffSchedule, id int64) error {
+	err := XTReadDB().Model(&schedule).Where("id=?", id).Updates(map[string]interface{}{"doctor_id": schedule.DoctorId, "doctor_type": schedule.DoctorType, "schedule_type": schedule.ScheduleType, "schedule_week": schedule.ScheduleWeek, "schedule_date": schedule.ScheduleDate, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func GetStaffScheduleList(orgid int64, startime int64, endtime int64) (schedule []*models.XtStaffSchedule, 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.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
+	return schedule, err
+}
+
+func GetStaffScheduleListTwo(orgid int64, startime int64, endtime int64) (schedule []*models.StaffSchedule, err error) {
+
+	err = XTReadDB().Model(&schedule).Where("user_org_id = ? and start_time>=? and end_time<=? and status = 1", orgid, startime, endtime).Find(&schedule).Error
+	return schedule, err
+}
+
+func GetNextWeekSchedule(orgid int64, startime int64, endtime int64) (*models.StaffSchedule, error) {
+	schedule := models.StaffSchedule{}
+	err := XTReadDB().Model(&schedule).Where("user_org_id = ? and status = 1 and start_time >=? and end_time<=?", orgid, startime, endtime).Find(&schedule).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &schedule, nil
+}
+
+func GetScheduleByDoctorId(doctorid int64, startime int64, endtime int64, orgid int64) (schedule []*models.XtStaffSchedule, err error) {
+	fmt.Println(doctorid, startime, endtime)
+	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)
+	}
+	if doctorid == 0 {
+		db = db.Where("x.doctor_type = 2 or x.doctor_type = 3")
+	}
+	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
+	return schedule, err
+}
+
+func ToSearchSeacheduleList(keywords string, startime int64, endtime int64, orgid int64) (schedule []*models.XtStaffSchedule, 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)
+	}
+	likeKey := "%" + keywords + "%"
+	//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
+	return schedule, err
+}
+
+func DeleteStaffSchedule(orgid int64, startime int64, endtime int64) error {
+
+	schedule := models.StaffSchedule{}
+	err := XTWriteDB().Model(&schedule).Where("user_org_id = ? and start_time >= ? and end_time <=?", orgid, startime, endtime).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func GetContinueScheduleByOrgId(orgid int64) (*models.ContinueSchedule, error) {
+
+	//schedules := models.DoctorSchedules{}
+	//err := XTReadDB().Model(&schedules).Where("user_org_id = ? and status = 1", orgid).Find(&schedules).Error
+	//if err == gorm.ErrRecordNotFound {
+	//  return nil, err
+	//}
+	//if err != nil {
+	//  return nil, err
+	//}
+	//return &schedules, nil
+	schedule := models.ContinueSchedule{}
+	err := XTReadDB().Model(&schedule).Where("user_org_id = ? and status = 1", orgid).Find(&schedule).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &schedule, nil
+}
+
+func UpdateContinusSchedule(schedule *models.ContinueSchedule, orgid int64) error {
+
+	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
+}