11月8日库存管理

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -428,8 +428,7 @@ func (this *StaffScheduleApiController) GetSchedulePatient() {
 	schedule, _ := this.GetInt64("schedule", 0) //1已2未
 	contagion, _ := this.GetInt64("contagion", 0)
 	keywords := this.GetString("keywords", "")
-	adminInfo := this.GetAdminUserInfo()
-
+	adminInfo := this.GetMobileAdminUserInfo()
 	thisTime := time.Now()
 	weekDay := int(thisTime.Weekday())
 	if weekDay == 0 {
@@ -453,7 +452,7 @@ func (this *StaffScheduleApiController) GetSchedulePatient() {
 	weekStart := theStarTime.Unix()
 	weekEnd := theEndTime.Unix()
 
-	patients, _ := service.GetPatientWithScheduleAndSolution(adminInfo.CurrentOrgId, keywords, weekStart, weekEnd, schedule, contagion)
+	patients, _ := service.GetPatientWithScheduleAndSolution(adminInfo.Org.Id, keywords, weekStart, weekEnd, schedule, contagion)
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"patients": patients,
@@ -469,8 +468,8 @@ func (c *StaffScheduleApiController) CreateMobileSchedulePatient() {
 		return
 	}
 
-	adminUserInfo := c.GetAdminUserInfo()
-	patientInfo, _ := service.FindPatientById(adminUserInfo.CurrentOrgId, patientID)
+	adminUserInfo := c.GetMobileAdminUserInfo()
+	patientInfo, _ := service.FindPatientById(adminUserInfo.Org.Id, patientID)
 	if patientInfo.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
 		return
@@ -582,9 +581,9 @@ func (c *StaffScheduleApiController) CreateMobileSchedulePatient() {
 	schedule.CreatedTime = time.Now().Unix()
 	schedule.UpdatedTime = time.Now().Unix()
 	schedule.Status = 1
-	schedule.UserOrgId = adminUserInfo.CurrentOrgId
+	schedule.UserOrgId = adminUserInfo.Org.Id
 
-	bed, _ := service.GetDeviceNumberByID(adminUserInfo.CurrentOrgId, schedule.BedId)
+	bed, _ := service.GetDeviceNumberByID(adminUserInfo.Org.Id, schedule.BedId)
 	if bed == nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeviceNumberNotExist)
 		return
@@ -603,14 +602,14 @@ func (c *StaffScheduleApiController) CreateMobileSchedulePatient() {
 	endTime := theEndTime.Unix()
 
 	//一天只有排班一次
-	daySchedule, err := service.GetDaySchedule(adminUserInfo.CurrentOrgId, startTime, endTime, patientID)
+	daySchedule, err := service.GetDaySchedule(adminUserInfo.Org.Id, startTime, endTime, patientID)
 	if daySchedule.ID > 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCantSetScheduleAgainOneDay)
 		return
 	}
 
 	//同天同位置只能排一个
-	pointSchedule, err := service.GetPointSchedule(adminUserInfo.CurrentOrgId, schedule.ScheduleDate, schedule.ScheduleWeek, schedule.ScheduleType, schedule.BedId)
+	pointSchedule, err := service.GetPointSchedule(adminUserInfo.Org.Id, schedule.ScheduleDate, schedule.ScheduleWeek, schedule.ScheduleType, schedule.BedId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
@@ -624,7 +623,7 @@ func (c *StaffScheduleApiController) CreateMobileSchedulePatient() {
 	defer redis.Close()
 	err = service.CreateSchedule(&schedule)
 
-	key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+	key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
 	redis.Set(key, "", time.Second)
 
 	fmt.Println(err)