库存调拨修改

controllers/schedule_template_api_controller.go

@@ -718,22 +718,26 @@ func (this *PatientScheduleTemplateAPIController) UpdateSchedulesTemplate() {
 		src_template, _ := service.GetScheduleTemplateItem(item.ID)
 		src_template.Status = 0
 		service.SaveSchTemplateItem(src_template)
-
 	}
-
 	for _, item := range addOrEditSchedules {
-
 		if item.ID > 0 { //已经存在的数据
 			src_template, _ := service.GetScheduleTemplateItem(item.ID)
 			src_template.DeviceNumberID = item.DeviceNumberID
 			src_template.TimeType = int8(item.TimeType)
 			src_template.TreatMode = item.Mode
+			schItem, _ := service.GetScheduleTemplateThree(this.GetAdminUserInfo().CurrentOrgId, src_template.DeviceNumberID, src_template.TemplateID, int64(src_template.Weekday), int64(src_template.TimeType), src_template.PatientID)
+			if schItem.ID > 0 {
+				json := make(map[string]interface{})
+				json["msg"] = item.Title + "周" + strconv.FormatInt(item.Weekday, 10) + "的床位已经有人排班无法保存,可能存在重复排班"
+				json["state"] = 0
+				this.Data["json"] = json
+				this.ServeJSON()
+				break
+			}
 			service.SaveSchTemplateItem(src_template)
-
 		} else {
 			schItemTwo, _ := service.GetScheduleTemplateTwo(this.GetAdminUserInfo().CurrentOrgId, item.TemplateID, item.Weekday, item.PatientID)
 			fmt.Println("222222")
-
 			if schItemTwo.ID > 0 { //当天存在排班，存在则为修改
 				fmt.Println("333333333")
 				src_template, _ := service.GetScheduleTemplateItem(schItemTwo.ID)

service/schedule_service.go

@@ -1457,3 +1457,8 @@ func GetScheduleTen(orgID, id int64) (models.Schedule, error) {
 	err = readDb.Model(&models.Schedule{}).Where("id = ? and user_org_id=? and status=1", id, orgID).First(&schedule).Error
 	return schedule, err
 }
+
+func GetDialysisOrderByPatientAndBed(org_id int64, record_date int64, bed_id int64, patient_id int64) (order models.DialysisOrder, err error) {
+	err = readDb.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND status = 1 AND dialysis_date = ? AND bed_id = ? AND patient_id = ?", org_id, record_date, bed_id, patient_id).First(&order).Error
+	return
+}

service/smart_sch.go

@@ -48,7 +48,7 @@ func GetSmartSchPatientByPatientID(orgID int64, id int64) (sch []*models.SmartSc
 
 	for _, item := range sch {
 		var order models.SmSchDialysisOrder
-		readDb.Model(&models.SmSchDialysisOrder{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND dialysis_date = ? AND bed_id = ?", orgID, item.PatientId, item.ScheduleDate, item.BedId).First(&order)
+		readDb.Model(&models.SmSchDialysisOrder{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND dialysis_date = ? ", orgID, item.PatientId, item.ScheduleDate).First(&order)
 		item.SmSchDialysisOrder = order
 	}
 
@@ -98,13 +98,14 @@ func GetSmartSchPatientByID(orgID int64, patient_id int64) (schs []*models.Smart
 		offset = -6
 	}
 	weekStart := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
+
 	err = readDb.Model(&models.SmartSchedule{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND schedule_date >= ?", orgID, patient_id, weekStart.Unix()).
 		Preload("DeviceZone", "status = 1").
 		Preload("DeviceNumber", "status = 1").Find(&schs).Error
 
 	for _, item := range schs {
 		var order models.SmSchDialysisOrder
-		readDb.Model(&models.SmSchDialysisOrder{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND dialysis_date = ? AND bed_id = ?", orgID, item.PatientId, item.ScheduleDate, item.BedId).First(&order)
+		readDb.Model(&models.SmSchDialysisOrder{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND dialysis_date = ? ", orgID, item.PatientId, item.ScheduleDate).First(&order)
 		item.SmSchDialysisOrder = order
 	}
 	return