111

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -7647,6 +7647,7 @@ func (this *DialysisAPIController) CheckSchedule() {
 					} else {
 						this.ServeSuccessJSON(map[string]interface{}{
 							"status": 0,
+							"msg":    "",
 						})
 					}
 				}
@@ -7663,6 +7664,7 @@ func (this *DialysisAPIController) CheckSchedule() {
 	} else {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"status": 0,
+			"msg":    "",
 		})
 
 	}

controllers/schedule_api_controller.go

@@ -72,7 +72,7 @@ func ScheduleApiRegistRouters() {
 	beego.Router("/api/schedule/getpatientscheduletemplate", &ScheduleApiController{}, "Get:GetPatientScheduleTempalate")
 	beego.Router("/api/schedule/getsolutionschedule", &ScheduleApiController{}, "Get:GetSolutionSchedule")
 
-	beego.Router("/api/schedule/smartpatientsch", &ScheduleApiController{}, "Get:GetPatientSch")
+	beego.Router("/api/schedule/smartpatientsch", &ScheduleApiController{}, "Get:GetPatient")
 	beego.Router("/api/schedule/smartpatientschtemplate", &ScheduleApiController{}, "Get:GetPatientSchTemplate")
 
 	beego.Router("/api/patient/smartpatientsch", &ScheduleApiController{}, "Get:GetPatientSmartSch")
@@ -83,6 +83,8 @@ func ScheduleApiRegistRouters() {
 
 	beego.Router("/api/smartsch/batch", &ScheduleApiController{}, "Post:BatchPostSmartSch")
 
+	beego.Router("/api/smartsch/get", &ScheduleApiController{}, "Get:GetSmartSch")
+
 }
 func (c *ScheduleApiController) BatchPostSmartSch() {
 	patient_id, _ := c.GetInt64("patient_id")
@@ -119,6 +121,7 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 				sch_id := int64(items["sch_id"].(float64))
 				if sch_id > 0 { //修改排班信息
 					schedule, _ = service.GetScheduleTwo(adminInfo.CurrentOrgId, sch_id)
+					fmt.Println("2222222")
 
 					if items["mode_id"] == nil || reflect.TypeOf(items["mode_id"]).String() != "float64" {
 						utils.ErrorLog("mode_id")
@@ -381,7 +384,10 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 
 				} else { //新的排班信息
 
+					fmt.Println("111111111")
 					if items["schedule_date"] == nil || reflect.TypeOf(items["schedule_date"]).String() != "string" {
+						fmt.Println("33333333")
+
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 						return
 					}
@@ -400,6 +406,15 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 						return
 					}
 					schedule.ScheduleDate = theTime.Unix()
+					//existSch,_ := service.GetScheduleByDate(c.GetAdminUserInfo().CurrentOrgId,schedule.ScheduleDate,patient_id)
+					//
+					//if existSch.ID > 0{
+					//	fmt.Println("555555555")
+					//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					//	return
+					//
+					//}
+
 					timeNow := time.Now().Format("2006-01-02")
 					if timeNow > scheduleDate {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCantSetScheduleBeforeNow)
@@ -468,7 +483,10 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 
 					sch, _ := service.GetScheduleByZoneAndBed(adminInfo.CurrentOrgId, partitionId, bedId, schedule.ScheduleDate, schedule.ScheduleType)
 
-					if sch.ID > 0 {
+					fmt.Println(sch.PatientId)
+					fmt.Println(schedule.PatientId)
+
+					if sch.ID > 0 && sch.PatientId != patient_id {
 						week_type, _ := items["week_type"].(string)
 						week_name, _ := items["week_name"].(string)
 
@@ -540,7 +558,32 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 			}
 		}
 	}
+	////删除数据
+	if dataBody["del_schs"] != nil && reflect.TypeOf(dataBody["del_schs"]).String() == "[]interface {}" {
 
+		schs, _ := dataBody["del_schs"].([]interface{})
+		if len(schs) > 0 {
+			for _, item := range schs {
+				items := item.(map[string]interface{})
+				if items["sch_id"] == nil || reflect.TypeOf(items["sch_id"]).String() != "float64" {
+					utils.ErrorLog("id")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				var schedule models.Schedule
+				sch_id := int64(items["sch_id"].(float64))
+				if sch_id > 0 { //修改排班信息
+					schedule, _ = service.GetScheduleTwo(adminInfo.CurrentOrgId, sch_id)
+					schedule.Status = 0
+					service.SaveSch(schedule)
+				}
+
+				HandleRedis(adminInfo.CurrentOrgId, schedule.ScheduleDate)
+
+			}
+		}
+	}
+	////修改或保存数据
 	if dataBody["smart_schs"] != nil && reflect.TypeOf(dataBody["smart_schs"]).String() == "[]interface {}" {
 
 		schs, _ := dataBody["smart_schs"].([]interface{})
@@ -658,33 +701,34 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePointScheduleExist)
 						return
 					}
-
+					var DialysisMachineName string
 					so, _ := service.GetDialysisSolutionTwo(adminInfo.CurrentOrgId, schedule.PatientId, schedule.ModeId)
 					filedRecordOne, _ := service.FindFiledBy(adminInfo.CurrentOrgId, "透析器")
 					filedRecordTwo, _ := service.FindFiledBy(adminInfo.CurrentOrgId, "灌流器")
 					filedRecordThree, _ := service.FindFiledBy(adminInfo.CurrentOrgId, "透析器/灌流器")
 
 					if filedRecordOne.IsShow == 1 {
-						schedule.DialysisMachineName = so.DialysisDialyszers
+						DialysisMachineName = so.DialysisDialyszers
 					}
 					if filedRecordThree.IsShow == 1 {
-						if len(schedule.DialysisMachineName) > 0 {
-							schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+						if len(DialysisMachineName) > 0 {
+							DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
 
 						} else {
-							schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+							DialysisMachineName = so.DialyzerPerfusionApparatus
 
 						}
 					}
 					if filedRecordTwo.IsShow == 1 {
-						if len(schedule.DialysisMachineName) > 0 {
-							schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+						if len(DialysisMachineName) > 0 {
+							DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
 
 						} else {
-							schedule.DialysisMachineName = so.DialysisIrrigation
+							DialysisMachineName = so.DialysisIrrigation
 
 						}
 					}
+					schedule.DialysisMachineName = DialysisMachineName
 
 					service.SaveSch(schedule)
 				} else { //新的排班信息
@@ -778,17 +822,11 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 
 					sch, _ := service.GetScheduleByZoneAndBed(adminInfo.CurrentOrgId, partitionId, bedId, schedule.ScheduleDate, schedule.ScheduleType)
 
-					if sch.ID > 0 {
+					if sch.ID > 0 && sch.PatientId != patient_id {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorSchedualcRepeatBed)
 						return
 					}
-
-					schedule.ModeId = modeId
-					schedule.PatientId = patient_id
-					schedule.CreatedTime = time.Now().Unix()
-					schedule.UpdatedTime = time.Now().Unix()
-					schedule.Status = 1
-					schedule.UserOrgId = adminInfo.CurrentOrgId
+					var DialysisMachineName string
 
 					so, _ := service.GetDialysisSolutionTwo(adminInfo.CurrentOrgId, schedule.PatientId, schedule.ModeId)
 					filedRecordOne, _ := service.FindFiledBy(adminInfo.CurrentOrgId, "透析器")
@@ -796,48 +834,98 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 					filedRecordThree, _ := service.FindFiledBy(adminInfo.CurrentOrgId, "透析器/灌流器")
 
 					if filedRecordOne.IsShow == 1 {
-						schedule.DialysisMachineName = so.DialysisDialyszers
+						DialysisMachineName = so.DialysisDialyszers
 					}
 					if filedRecordThree.IsShow == 1 {
 						if len(schedule.DialysisMachineName) > 0 {
-							schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+							DialysisMachineName = DialysisMachineName + "," + so.DialyzerPerfusionApparatus
 
 						} else {
-							schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+							DialysisMachineName = so.DialyzerPerfusionApparatus
 
 						}
 					}
 					if filedRecordTwo.IsShow == 1 {
-						if len(schedule.DialysisMachineName) > 0 {
-							schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+						if len(DialysisMachineName) > 0 {
+							DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
 
 						} else {
-							schedule.DialysisMachineName = so.DialysisIrrigation
+							DialysisMachineName = so.DialysisIrrigation
 
 						}
 					}
+					schedule.DialysisMachineName = DialysisMachineName
+
+					//判断当前保存的患者是否已经有排班
+					existSchedule, _ := service.GetScheduleByDate(adminInfo.CurrentOrgId, schedule.ScheduleDate, schedule.PatientId)
+					if existSchedule.ID > 0 {
+						existSchedule.ModeId = modeId
+						existSchedule.BedId = schedule.BedId
+						existSchedule.PartitionId = schedule.PartitionId
+						existSchedule.ScheduleType = schedule.ScheduleType
+						existSchedule.DialysisMachineName = schedule.DialysisMachineName
+						service.SaveSmartSch(existSchedule)
 
-					daySchedule, err := service.GetDaySchedule(adminInfo.CurrentOrgId, theTime.Unix(), theTime.Unix(), patient_id)
-					if daySchedule.ID > 0 {
-						daySchedule.ModeId = schedule.ModeId
-						daySchedule.ScheduleType = schedule.ScheduleType
-						daySchedule.PartitionId = schedule.PartitionId
-						daySchedule.BedId = schedule.BedId
-						daySchedule.DialysisMachineName = schedule.DialysisMachineName
-						service.SaveSch(daySchedule)
 					} else {
-						service.CreateSchedule(&schedule)
+						schedule.ModeId = modeId
+						schedule.PatientId = patient_id
+						schedule.CreatedTime = time.Now().Unix()
+						schedule.UpdatedTime = time.Now().Unix()
+						schedule.Status = 1
+						schedule.UserOrgId = adminInfo.CurrentOrgId
+
+						var DialysisMachineName string
+						so, _ := service.GetDialysisSolutionTwo(adminInfo.CurrentOrgId, schedule.PatientId, schedule.ModeId)
+						filedRecordOne, _ := service.FindFiledBy(adminInfo.CurrentOrgId, "透析器")
+						filedRecordTwo, _ := service.FindFiledBy(adminInfo.CurrentOrgId, "灌流器")
+						filedRecordThree, _ := service.FindFiledBy(adminInfo.CurrentOrgId, "透析器/灌流器")
+
+						if filedRecordOne.IsShow == 1 {
+							DialysisMachineName = so.DialysisDialyszers
+						}
+						if filedRecordThree.IsShow == 1 {
+							if len(DialysisMachineName) > 0 {
+								DialysisMachineName = DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+
+							} else {
+								DialysisMachineName = so.DialyzerPerfusionApparatus
+
+							}
+						}
+						if filedRecordTwo.IsShow == 1 {
+							if len(DialysisMachineName) > 0 {
+								DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
+
+							} else {
+								DialysisMachineName = so.DialysisIrrigation
+
+							}
+						}
+						schedule.DialysisMachineName = DialysisMachineName
+						//schedule.DialysisMachineName = schedule.DialysisMachineName
+						daySchedule, _ := service.GetDaySchedule(adminInfo.CurrentOrgId, theTime.Unix(), theTime.Unix(), patient_id)
+						if daySchedule.ID > 0 {
+							daySchedule.ModeId = schedule.ModeId
+							daySchedule.ScheduleType = schedule.ScheduleType
+							daySchedule.PartitionId = schedule.PartitionId
+							daySchedule.BedId = schedule.BedId
+							daySchedule.DialysisMachineName = schedule.DialysisMachineName
+							service.SaveSch(daySchedule)
+						} else {
+							service.CreateSchedule(&schedule)
+						}
 					}
 				}
+
 				c.ServeSuccessJSON(map[string]interface{}{
 					"msg": "保存成功",
 				})
-
 				HandleRedis(adminInfo.CurrentOrgId, schedule.ScheduleDate)
 
 			}
 		}
 	}
+
 }
 func HandleRedis(org_id int64, sch_date int64) {
 	redis := service.RedisClient()
@@ -861,7 +949,25 @@ func HandleRedis(org_id int64, sch_date int64) {
 
 }
 
-func (c *ScheduleApiController) GetPatientSch() {
+func (c *ScheduleApiController) GetSmartSch() {
+	patient_id, _ := c.GetInt64("patient_id")
+	fmt.Println("~~~~~~")
+	fmt.Println(patient_id)
+	fmt.Println("~~~~~~")
+
+	adminUserInfo := c.GetAdminUserInfo()
+	sch, err := service.GetSmartSchPatientByPatientID(adminUserInfo.CurrentOrgId, patient_id)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"sch": sch,
+	})
+}
+
+func (c *ScheduleApiController) GetPatient() {
 	keyWord := c.GetString("keyword")
 	adminUserInfo := c.GetAdminUserInfo()
 	patient, err := service.GetSmartSchPatientByKeyWord(adminUserInfo.CurrentOrgId, keyWord)
@@ -876,6 +982,7 @@ func (c *ScheduleApiController) GetPatientSch() {
 }
 
 func (c *ScheduleApiController) GetPatientSchTemplate() {
+	//patient_id, _ := c.GetInt64("patient_id",0)
 	keyWord := c.GetString("keyword")
 	adminUserInfo := c.GetAdminUserInfo()
 	patient, err := service.GetSmartSchTemplatePatientByKeyWord(adminUserInfo.CurrentOrgId, keyWord)
@@ -1264,32 +1371,34 @@ func (c *ScheduleApiController) CreateSchedule() {
 	schedule.UserOrgId = adminUserInfo.CurrentOrgId
 	schedule.IsExport = 5
 
+	var DialysisMachineName string
 	so, _ := service.GetDialysisSolutionTwo(adminUserInfo.CurrentOrgId, schedule.PatientId, schedule.ModeId)
 	filedRecordOne, _ := service.FindFiledBy(adminUserInfo.CurrentOrgId, "透析器")
 	filedRecordTwo, _ := service.FindFiledBy(adminUserInfo.CurrentOrgId, "灌流器")
 	filedRecordThree, _ := service.FindFiledBy(adminUserInfo.CurrentOrgId, "透析器/灌流器")
 
 	if filedRecordOne.IsShow == 1 {
-		schedule.DialysisMachineName = so.DialysisDialyszers
+		DialysisMachineName = so.DialysisDialyszers
 	}
 	if filedRecordThree.IsShow == 1 {
-		if len(schedule.DialysisMachineName) > 0 {
-			schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+		if len(DialysisMachineName) > 0 {
+			DialysisMachineName = DialysisMachineName + "," + so.DialyzerPerfusionApparatus
 
 		} else {
-			schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+			DialysisMachineName = so.DialyzerPerfusionApparatus
 
 		}
 	}
 	if filedRecordTwo.IsShow == 1 {
-		if len(schedule.DialysisMachineName) > 0 {
-			schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+		if len(DialysisMachineName) > 0 {
+			DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
 
 		} else {
-			schedule.DialysisMachineName = so.DialysisIrrigation
+			DialysisMachineName = so.DialysisIrrigation
 
 		}
 	}
+	schedule.DialysisMachineName = DialysisMachineName
 
 	bed, _ := service.GetDeviceNumberByID(adminUserInfo.CurrentOrgId, schedule.BedId)
 	if bed == nil {
@@ -1494,28 +1603,29 @@ func (c *ScheduleApiController) ChangeSchedule() {
 		filedRecordOne, _ := service.FindFiledBy(adminINfo.CurrentOrgId, "透析器")
 		filedRecordTwo, _ := service.FindFiledBy(adminINfo.CurrentOrgId, "灌流器")
 		filedRecordThree, _ := service.FindFiledBy(adminINfo.CurrentOrgId, "透析器/灌流器")
-
+		var DialysisMachineName string
 		if filedRecordOne.IsShow == 1 {
-			schedule.DialysisMachineName = so.DialysisDialyszers
+			DialysisMachineName = so.DialysisDialyszers
 		}
 		if filedRecordThree.IsShow == 1 {
 			if len(schedule.DialysisMachineName) > 0 {
-				schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+				DialysisMachineName = schedule.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
 
 			} else {
-				schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+				DialysisMachineName = so.DialyzerPerfusionApparatus
 
 			}
 		}
 		if filedRecordTwo.IsShow == 1 {
-			if len(schedule.DialysisMachineName) > 0 {
-				schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+			if len(DialysisMachineName) > 0 {
+				DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
 
 			} else {
-				schedule.DialysisMachineName = so.DialysisIrrigation
+				DialysisMachineName = so.DialysisIrrigation
 
 			}
 		}
+		schedule.DialysisMachineName = DialysisMachineName
 
 		order, err := service.GetOneDialysisOrder(adminINfo.CurrentOrgId, schedule.ScheduleDate, schedule.PatientId)
 		if err != nil {
@@ -2418,32 +2528,35 @@ func (this *ScheduleApiController) ExportSchedule() {
 			sch.Status = 1
 			sch.UserOrgId = this.GetAdminUserInfo().CurrentOrgId
 			sch.IsExport = 1
+
+			var DialysisMachineName string
 			so, _ := service.GetDialysisSolutionTwo(sch.UserOrgId, sch.PatientId, sch.ModeId)
 			filedRecordOne, _ := service.FindFiledBy(sch.UserOrgId, "透析器")
 			filedRecordTwo, _ := service.FindFiledBy(sch.UserOrgId, "灌流器")
 			filedRecordThree, _ := service.FindFiledBy(sch.UserOrgId, "透析器/灌流器")
 
 			if filedRecordOne.IsShow == 1 {
-				sch.DialysisMachineName = so.DialysisDialyszers
+				DialysisMachineName = so.DialysisDialyszers
 			}
 			if filedRecordThree.IsShow == 1 {
-				if len(sch.DialysisMachineName) > 0 {
-					sch.DialysisMachineName = sch.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+				if len(DialysisMachineName) > 0 {
+					DialysisMachineName = DialysisMachineName + "," + so.DialyzerPerfusionApparatus
 
 				} else {
-					sch.DialysisMachineName = so.DialyzerPerfusionApparatus
+					DialysisMachineName = so.DialyzerPerfusionApparatus
 
 				}
 			}
 			if filedRecordTwo.IsShow == 1 {
-				if len(sch.DialysisMachineName) > 0 {
-					sch.DialysisMachineName = sch.DialysisMachineName + "," + so.DialysisIrrigation
+				if len(DialysisMachineName) > 0 {
+					DialysisMachineName = sch.DialysisMachineName + "," + so.DialysisIrrigation
 
 				} else {
-					sch.DialysisMachineName = so.DialysisIrrigation
+					DialysisMachineName = so.DialysisIrrigation
 
 				}
 			}
+			sch.DialysisMachineName = DialysisMachineName
 
 			schedules = append(schedules, &sch)
 		}
@@ -2455,21 +2568,29 @@ func (this *ScheduleApiController) ExportSchedule() {
 			date, _ := utils.ParseTimeStringToTime("2006-01-02", schedule_date)
 			clear_schedule_date := date.Unix() //根据日期去清除，该日期未来的排班数据
 
+			service.UpdateScheduleByExport(this.GetAdminUserInfo().CurrentOrgId, clear_schedule_date)
+
 			if err == nil {
 				for _, item := range schedules {
 					if item.ScheduleDate > clear_schedule_date {
 						//查询该患者是否转出获取死亡
+						fmt.Println("11111323242423")
 
 						//查找当天日期是否存在
 						_, errcode := service.GetTodayScheduleIsExistOne(item.PatientId, item.ScheduleDate, item.UserOrgId)
 						if errcode == gorm.ErrRecordNotFound {
 							//查询该床位是否有患者
+							fmt.Println("errcodes")
 							sch, errcodes := service.GetPatientByBed(item.ScheduleDate, item.BedId, item.ScheduleType, item.UserOrgId)
+							fmt.Println("errcodes")
+							fmt.Println(errcodes)
+							fmt.Println(sch)
 
 							if errcodes == gorm.ErrRecordNotFound {
+								fmt.Println("1111111")
 								service.CreateSchedule(item)
 							} else if errcodes == nil {
-
+								fmt.Println("1111222222222")
 								//清除当天该床位已有的患者
 								service.ModeFyScheduleById(sch.ScheduleDate, sch.BedId, sch.ScheduleType, sch.UserOrgId)
 								service.CreateSchedule(item)
@@ -2477,15 +2598,17 @@ func (this *ScheduleApiController) ExportSchedule() {
 
 						} else if errcode == nil {
 							schedule := models.XtSchedule{
-								PartitionId:  item.PartitionId,
-								BedId:        item.BedId,
-								PatientId:    item.PatientId,
-								ScheduleDate: item.ScheduleDate,
-								ScheduleType: item.ScheduleType,
-								ScheduleWeek: item.ScheduleWeek,
-								ModeId:       item.ModeId,
-								Status:       1,
+								PartitionId:         item.PartitionId,
+								BedId:               item.BedId,
+								PatientId:           item.PatientId,
+								ScheduleDate:        item.ScheduleDate,
+								ScheduleType:        item.ScheduleType,
+								ScheduleWeek:        item.ScheduleWeek,
+								ModeId:              1,
+								Status:              1,
+								DialysisMachineName: item.DialysisMachineName,
 							}
+							fmt.Println("1111222222223333333333333333332")
 
 							service.UpdateScheduleByOrgIdOne(item.PatientId, item.ScheduleDate, item.UserOrgId, &schedule)
 						}
@@ -3321,32 +3444,35 @@ func (this *ScheduleApiController) GetCopyPatientSchedules() {
 			CreatedTime:  time.Now().Unix(),
 		}
 
+		var DialysisMachineName string
+
 		so, _ := service.GetDialysisSolutionTwo(adminUserInfo.CurrentOrgId, schedule.PatientId, schedule.ModeId)
 		filedRecordOne, _ := service.FindFiledBy(adminUserInfo.CurrentOrgId, "透析器")
 		filedRecordTwo, _ := service.FindFiledBy(adminUserInfo.CurrentOrgId, "灌流器")
 		filedRecordThree, _ := service.FindFiledBy(adminUserInfo.CurrentOrgId, "透析器/灌流器")
 
 		if filedRecordOne.IsShow == 1 {
-			schedule.DialysisMachineName = so.DialysisDialyszers
+			DialysisMachineName = so.DialysisDialyszers
 		}
 		if filedRecordThree.IsShow == 1 {
-			if len(schedule.DialysisMachineName) > 0 {
-				schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+			if len(DialysisMachineName) > 0 {
+				DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
 
 			} else {
-				schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+				DialysisMachineName = so.DialyzerPerfusionApparatus
 
 			}
 		}
 		if filedRecordTwo.IsShow == 1 {
-			if len(schedule.DialysisMachineName) > 0 {
-				schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+			if len(DialysisMachineName) > 0 {
+				DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
 
 			} else {
-				schedule.DialysisMachineName = so.DialysisIrrigation
+				DialysisMachineName = so.DialysisIrrigation
 
 			}
 		}
+		schedule.DialysisMachineName = DialysisMachineName
 
 		err = service.AddPatientSchedule(&schedule)
 
@@ -4030,32 +4156,34 @@ func (c *ScheduleApiController) SynchroSchedule() {
 				UpdatedTime:  0,
 			}
 
+			var DialysisMachineName string
 			so, _ := service.GetDialysisSolutionTwo(c.GetAdminUserInfo().CurrentOrgId, schedule.PatientId, schedule.ModeId)
 			filedRecordOne, _ := service.FindFiledBy(c.GetAdminUserInfo().CurrentOrgId, "透析器")
 			filedRecordTwo, _ := service.FindFiledBy(c.GetAdminUserInfo().CurrentOrgId, "灌流器")
 			filedRecordThree, _ := service.FindFiledBy(c.GetAdminUserInfo().CurrentOrgId, "透析器/灌流器")
 
 			if filedRecordOne.IsShow == 1 {
-				schedule.DialysisMachineName = so.DialysisDialyszers
+				DialysisMachineName = so.DialysisDialyszers
 			}
 			if filedRecordThree.IsShow == 1 {
-				if len(schedule.DialysisMachineName) > 0 {
-					schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+				if len(DialysisMachineName) > 0 {
+					DialysisMachineName = DialysisMachineName + "," + so.DialyzerPerfusionApparatus
 
 				} else {
-					schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+					DialysisMachineName = so.DialyzerPerfusionApparatus
 
 				}
 			}
 			if filedRecordTwo.IsShow == 1 {
-				if len(schedule.DialysisMachineName) > 0 {
-					schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+				if len(DialysisMachineName) > 0 {
+					DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
 
 				} else {
-					schedule.DialysisMachineName = so.DialysisIrrigation
+					DialysisMachineName = so.DialysisIrrigation
 
 				}
 			}
+			schedule.DialysisMachineName = DialysisMachineName
 
 			service.CreatePatientSchedule(&schedule)
 		}
@@ -4119,32 +4247,35 @@ func (c *ScheduleApiController) SynchroSchedule() {
 					CreatedTime:  time.Now().Unix(),
 					UpdatedTime:  0,
 				}
+
+				var DialysisMachineName string
 				so, _ := service.GetDialysisSolutionTwo(c.GetAdminUserInfo().CurrentOrgId, schedule.PatientId, schedule.ModeId)
 				filedRecordOne, _ := service.FindFiledBy(c.GetAdminUserInfo().CurrentOrgId, "透析器")
 				filedRecordTwo, _ := service.FindFiledBy(c.GetAdminUserInfo().CurrentOrgId, "灌流器")
 				filedRecordThree, _ := service.FindFiledBy(c.GetAdminUserInfo().CurrentOrgId, "透析器/灌流器")
 
 				if filedRecordOne.IsShow == 1 {
-					schedule.DialysisMachineName = so.DialysisDialyszers
+					DialysisMachineName = so.DialysisDialyszers
 				}
 				if filedRecordThree.IsShow == 1 {
-					if len(schedule.DialysisMachineName) > 0 {
-						schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+					if len(DialysisMachineName) > 0 {
+						DialysisMachineName = DialysisMachineName + "," + so.DialyzerPerfusionApparatus
 
 					} else {
-						schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+						DialysisMachineName = so.DialyzerPerfusionApparatus
 
 					}
 				}
 				if filedRecordTwo.IsShow == 1 {
 					if len(schedule.DialysisMachineName) > 0 {
-						schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+						DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
 
 					} else {
-						schedule.DialysisMachineName = so.DialysisIrrigation
+						DialysisMachineName = so.DialysisIrrigation
 
 					}
 				}
+				schedule.DialysisMachineName = DialysisMachineName
 				service.CreatePatientSchedule(&schedule)
 			}
 		}

controllers/schedule_template_api_controller.go

@@ -6,6 +6,7 @@ import (
 	"XT_New/service"
 	"encoding/json"
 	"fmt"
+	"strconv"
 	"strings"
 	"time"
 
@@ -19,8 +20,30 @@ func PatientScheduleTemplateAPIControllerRegistRouters() {
 
 	beego.Router("/api/patients/list", &PatientScheduleTemplateAPIController{}, "get:GetPatientList")
 
+	beego.Router("/api/schedule/update_schtemplate", &PatientScheduleTemplateAPIController{}, "post:UpdateSchedulesTemplate")
+	beego.Router("/api/schtemplate_device/get", &ScheduleApiController{}, "Get:GetTemplateDevicesNumbers")
+
 	// beego.Router("/api/test", &TestCtr{}, "get:Test")
 }
+func (c *ScheduleApiController) GetTemplateDevicesNumbers() {
+	sch_type, _ := c.GetInt("sch_type", 0)
+	zone_id, _ := c.GetInt64("zone_id", 0)
+	patient_id, _ := c.GetInt64("patient_id", 0)
+	template_id, _ := c.GetInt64("template_id", 0)
+
+	weekday, _ := c.GetInt64("weekday")
+
+	deviceNumbers, getDeviceNumbersErr := service.GetAllAvaildTemplateDeviceNumbersByZone(c.GetAdminUserInfo().CurrentOrgId, weekday, sch_type, zone_id, patient_id, template_id)
+	if getDeviceNumbersErr != nil {
+		c.ErrorLog("获取所有床位失败：%v", getDeviceNumbersErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"devices": deviceNumbers,
+	})
+
+}
 
 // type TestCtr struct {
 // 	BaseAPIController
@@ -189,6 +212,7 @@ func (this *PatientScheduleTemplateAPIController) SetMode() {
 		return
 	}
 	templateMode.Week = int64(week_time)
+	templateMode.OriginalWeek = int64(week_time)
 
 	if mode != templateMode.Mode {
 		if templateMode.Mode == 0 { // 0 -> 1 或 0 -> 2  则直接清除下四周的排班
@@ -422,6 +446,10 @@ func (this *PatientScheduleTemplateAPIController) SetMode() {
 			service.UpdateTemplateItemWeek(templates[3].OrgID, templates[3].ID, week_time+3)
 		}
 
+	} else {
+		fmt.Println("~~~~~~~~")
+		service.UpdateTemplateItemModeWeek(adminUserInfo.CurrentOrgId, templateMode.ID, templateMode.OriginalWeek)
+
 	}
 
 	this.ServeSuccessJSON(nil)
@@ -619,14 +647,17 @@ func (this *PatientScheduleTemplateAPIController) UpdateSchedules() {
 		return
 	}
 
-	newItems, getTemplateItemsErr := service.GetOrgPatientScheduleTemplateItemsByTemplateID(adminUserInfo.CurrentOrgId)
+	//newItems, getTemplateItemsErr := service.GetAllPatientScheduleTemplateItemsWithoutPatientByTemplateID(adminUserInfo.CurrentOrgId)
+	templates, getTemplateItemsErr := service.GetOrgPatientScheduleTemplateItems(adminUserInfo.CurrentOrgId)
+
+	//newItems, getTemplateItemsErr := service.GetAllPatientScheduleTemplateItemsWithoutPatientByTemplateID(adminUserInfo.CurrentOrgId)
 	if getTemplateItemsErr != nil {
 		this.ErrorLog("获取排班模板排班失败：%v", getTemplateItemsErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"items": newItems,
+		"items": templates,
 	})
 }
 
@@ -648,3 +679,109 @@ func (this *PatientScheduleTemplateAPIController) GetPatientList() {
 	})
 
 }
+
+type ParamModelEditSchedule struct {
+	ID             int64  `json:"sch_id"`
+	DeviceNumberID int64  `json:"jihao_id"`
+	PatientID      int64  `json:"patient_id"`
+	Mode           int64  `json:"mode_id"`
+	Weekday        int64  `json:"schedule_week"`
+	TimeType       int64  `json:"time_type"`
+	TemplateID     int64  `json:"t_id"`
+	Title          string `json:"title"`
+}
+
+func (this *PatientScheduleTemplateAPIController) UpdateSchedulesTemplate() {
+	addOrEditSchedulesJSON := this.GetString("edit_schs")
+	//delSchedulesJSON := this.GetString("del_schs")
+
+	fmt.Println(addOrEditSchedulesJSON)
+	var addOrEditSchedules []*ParamModelEditSchedule
+	//var delSchedules []*ParamModelEditSchedule
+
+	parseErr := json.Unmarshal([]byte(addOrEditSchedulesJSON), &addOrEditSchedules)
+	//parseDelErr := json.Unmarshal([]byte(delSchedulesJSON), &delSchedules)
+
+	fmt.Println(parseErr)
+	if parseErr != nil {
+		this.ErrorLog("解析增加编辑排班的数组参数失败：%v", parseErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	//if parseDelErr != nil {
+	//	this.ErrorLog("解析删除排班的数组参数失败：%v", parseErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
+
+	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
+			//service.SaveSchTemplateItem(src_template)
+			fmt.Println("11111")
+		} 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)
+				src_template.DeviceNumberID = item.DeviceNumberID
+				src_template.TimeType = int8(item.TimeType)
+				src_template.TreatMode = item.Mode
+				service.SaveSchTemplateItem(src_template)
+
+			} else {
+				schItem, _ := service.GetScheduleTemplateOne(this.GetAdminUserInfo().CurrentOrgId, item.DeviceNumberID, item.TemplateID, item.Weekday)
+
+				if schItem.ID == 0 { //床位未被占用
+
+					var template models.PatientScheduleTemplateItem
+					template.TreatMode = item.Mode
+					template.TemplateID = int64(item.TemplateID)
+					template.TimeType = int8(item.TimeType)
+					template.DeviceNumberID = item.DeviceNumberID
+					template.CreateTime = time.Now().Unix()
+					template.ModifyTime = time.Now().Unix()
+					template.OrgID = this.GetAdminUserInfo().CurrentOrgId
+					template.PatientID = item.PatientID
+					template.Weekday = int8(item.Weekday)
+					template.Status = 1
+					service.SaveSchTemplateItem(template)
+
+				} else { //床位被占用 1.被自己占用，2。被别人占用
+					//fmt.Println("555555555")
+
+					if schItem.PatientID != 0 && schItem.PatientID == item.PatientID { //当天该患者已经存在排班则设为修改操作
+						//fmt.Println("66666")
+						src_template, _ := service.GetScheduleTemplateItem(schItem.ID)
+						src_template.DeviceNumberID = item.DeviceNumberID
+						src_template.TimeType = int8(item.TimeType)
+						src_template.TreatMode = item.Mode
+						service.SaveSchTemplateItem(src_template)
+
+					} else if schItem.PatientID != 0 && schItem.PatientID != item.PatientID { //当天该床位被其他人占用，则无法保存
+						//fmt.Println("7777777")
+						json := make(map[string]interface{})
+						json["msg"] = item.Title + "周" + strconv.FormatInt(item.Weekday, 10) + "的床位已经有人排班,无法保存"
+						json["state"] = 0
+						this.Data["json"] = json
+						this.ServeJSON()
+						break
+					}
+				}
+
+			}
+
+		}
+	}
+
+	templates, _ := service.GetOrgPatientScheduleTemplateItems(this.GetAdminUserInfo().CurrentOrgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"items": templates,
+	})
+}

models/patient_schedule_template_models.go

@@ -9,6 +9,7 @@ type PatientScheduleTemplateMode struct {
 	CreateTime   int64 `gorm:"column:ctime" json:"-" form:"ctime"`
 	ModifyTime   int64 `gorm:"column:mtime" json:"-" form:"mtime"`
 	Week         int64 `gorm:"column:week" json:"-" form:"week"`
+	OriginalWeek int64 `gorm:"column:original_week" json:"original_week" form:"original_week"`
 }
 
 func (PatientScheduleTemplateMode) TableName() string {

models/smart_sch.go

@@ -6,7 +6,7 @@ type SmartSchPatient struct {
 	Name       string `gorm:"column:name" json:"name" form:"name"`
 	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
 
-	SmartSchedule []*SmartSchedule `gorm:"-" json:"sch"`
+	//SmartSchedule []*SmartSchedule `gorm:"-" json:"sch"`
 }
 
 func (SmartSchPatient) TableName() string {
@@ -27,22 +27,23 @@ func (SmartSchTemplatePatient) TableName() string {
 }
 
 type SmartSchedule struct {
-	ID                 int64              `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId          int64              `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PartitionId        int64              `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
-	BedId              int64              `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	PatientId          int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	ScheduleDate       int64              `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
-	ScheduleType       int64              `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
-	ScheduleWeek       int64              `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
-	ModeId             int64              `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
-	Status             int64              `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime        int64              `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime        int64              `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
-	IsExport           int64              `gorm:"column:is_export" json:"is_export" form:"is_export"`
-	DeviceZone         DeviceZone         `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
-	DeviceNumber       DeviceNumber       `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
-	SmSchDialysisOrder SmSchDialysisOrder `json:"order" gorm:"foreignkey:BedId,PatientId,DialysisDate;AssociationForeignKey:BedId,PatientId,ScheduleDate;"`
+	ID                  int64              `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId           int64              `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId         int64              `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId               int64              `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId           int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate        int64              `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType        int64              `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek        int64              `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId              int64              `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status              int64              `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime         int64              `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime         int64              `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	IsExport            int64              `gorm:"column:is_export" json:"is_export" form:"is_export"`
+	DeviceZone          DeviceZone         `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
+	DeviceNumber        DeviceNumber       `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
+	SmSchDialysisOrder  SmSchDialysisOrder `json:"order" gorm:"-"`
+	DialysisMachineName string             `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
 }
 
 func (SmartSchedule) TableName() string {

service/device_service.go

@@ -834,3 +834,23 @@ func UpdateScheduleById(id int64, schedule models.Schedule) error {
 	err := XTWriteDB().Model(&models.Schedule{}).Where("id = ? and status =1", id).Update(map[string]interface{}{"patient_id": schedule.PatientId, "mode_id": schedule.ModeId}).Error
 	return err
 }
+
+func GetScheduleTemplateForDeviceNumber(orgID int64, deviceNumberID int64, template_id int64, week_type int64, time_type int64) (models.PatientScheduleTemplateItem, error) {
+	var item models.PatientScheduleTemplateItem
+	err := readDb.Model(&models.PatientScheduleTemplateItem{}).Where("device_number_id = ? AND org_id = ? AND status = 1 AND template_id = ? AND weekday = ? AND time_type = ?", deviceNumberID, orgID, template_id, week_type, time_type).First(&item).Error
+	return item, err
+}
+
+//某模板下，某周几下，该床位是否有患者
+func GetScheduleTemplateOne(orgID int64, deviceNumberID int64, template_id int64, week_type int64) (models.PatientScheduleTemplateItem, error) {
+	var item models.PatientScheduleTemplateItem
+	err := readDb.Model(&models.PatientScheduleTemplateItem{}).Where("device_number_id = ? AND org_id = ? AND status = 1 AND template_id = ? AND weekday = ?", deviceNumberID, orgID, template_id, week_type).First(&item).Error
+	return item, err
+}
+
+//某模板下，某周几下，是否有排班
+func GetScheduleTemplateTwo(orgID int64, template_id int64, week_type int64, patient_id int64) (models.PatientScheduleTemplateItem, error) {
+	var item models.PatientScheduleTemplateItem
+	err := readDb.Model(&models.PatientScheduleTemplateItem{}).Where("patient_id = ? AND org_id = ? AND status = 1 AND template_id = ? AND weekday = ?", patient_id, orgID, template_id, week_type).First(&item).Error
+	return item, err
+}

service/patient_schedule_template_service.go

@@ -925,3 +925,32 @@ func GetOrgPatientScheduleTemplateModeTwo(orgID int64) (models.PatientScheduleTe
 	err := readDb.Model(&models.PatientScheduleTemplateMode{}).Where("org_id = ? AND status = 1", orgID).First(&mode).Error
 	return mode, err
 }
+
+func GetAllPatientScheduleTemplateItemsWithoutPatientByTemplateID(orgID int64) ([]*models.PatientScheduleTemplateItem, error) {
+	var items []*models.PatientScheduleTemplateItem
+	err := readDb.Raw("select item.id,item.org_id,item.template_id,item.device_number_id,item.patient_id,item.treat_mode,item.weekday,item.time_type,item.status,item.status,item.ctime,item.mtime from xt_patient_schedule_template_item as item left join xt_patients as patient on item.patient_id = patient.id where item.org_id = ? AND item.status = 1 and patient.lapseto = 1 and patient.status = 1", orgID).Scan(&items).Error
+	// err := readDb.
+	// 	Model(&models.PatientScheduleTemplateItem{}).
+	// 	Where("org_id = ? AND template_id = ? AND status = 1", orgID, templateID).
+	// 	Find(&items).
+	// 	Error
+	if err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+func GetScheduleTemplateItem(id int64) (item models.PatientScheduleTemplateItem, err error) {
+	err = readDb.Model(&models.PatientScheduleTemplateItem{}).Where("id = ?", id).First(&item).Error
+	return
+}
+
+func SaveSchTemplateItem(item models.PatientScheduleTemplateItem) (err error) {
+	err = writeDb.Save(&item).Error
+	return
+}
+
+func UpdateTemplateItemModeWeek(orgID int64, id int64, week_time int64) {
+	readDb.Model(&models.PatientScheduleTemplateMode{}).Where("org_id = ? AND status = 1 AND id = ? ", orgID, id).Updates(map[string]interface{}{"original_week": week_time, "week": week_time})
+	return
+}

service/patient_service.go

@@ -2738,3 +2738,8 @@ func GetAllSchedulesByPatientInfo(org_id int64, patient_id int64, mode_id int64)
 	}
 	return record, nil
 }
+
+func UpdateScheduleByExport(org_id int64, shcheduledate int64) error {
+	err := XTWriteDB().Model(models.XtSchedule{}).Where("user_org_id = ? and schedule_date > ?", org_id, shcheduledate).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/schedule_service.go

@@ -36,7 +36,9 @@ func GetSchedulePartitionPanelTwo(orgID int64, schIDs []string) (partitions []*m
 		err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", "org_id=? and status=1", orgID).Where("org_id=? and status=1", orgID).Find(&partitions).Error
 	}
 	if len(schIDs) > 0 {
-		err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", "org_id=? and status=1 and zone_id in(?)", orgID, schIDs).Where("org_id=? and status=1 and id in(?)", orgID, schIDs).Find(&partitions).Error
+		err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", func(db *gorm.DB) *gorm.DB {
+			return db.Where("org_id=? and status=1 and zone_id in (?)", orgID, schIDs).Order("sort desc")
+		}).Where("org_id=? and status=1 and id in(?)", orgID, schIDs).Find(&partitions).Error
 	}
 
 	return
@@ -259,7 +261,7 @@ func UpdateScheduleByOrgId(patientid int64, scheduledate int64, orgid int64, mod
 }
 
 func UpdateScheduleByOrgIdOne(patientid int64, scheduledate int64, orgid int64, sch *models.XtSchedule) error {
-	err := XTWriteDB().Model(&sch).Where("patient_id = ? and schedule_date= ? and user_org_id = ? and status = 1", patientid, scheduledate, orgid).Updates(map[string]interface{}{"partition_id": sch.PartitionId, "bed_id": sch.BedId, "schedule_type": sch.ScheduleType, "schedule_week": sch.ScheduleWeek, "mode_id": sch.ModeId, "updated_time": time.Now().Unix()}).Error
+	err := XTWriteDB().Model(&sch).Where("patient_id = ? and schedule_date= ? and user_org_id = ? and status = 1", patientid, scheduledate, orgid).Updates(map[string]interface{}{"partition_id": sch.PartitionId, "bed_id": sch.BedId, "schedule_type": sch.ScheduleType, "schedule_week": sch.ScheduleWeek, "mode_id": sch.ModeId, "updated_time": time.Now().Unix(), "dialysis_machine_name": sch.DialysisMachineName}).Error
 	return err
 }
 
@@ -300,12 +302,36 @@ func UpdateScheduleOne(id int64, schedule models.Schedule) error {
 //参数一：当前操作的患者的排班     参数二被替换床位对应的排班
 func UpdateScheduleTwo(schone models.Schedule, schtwo models.Schedule) {
 	utx := XTWriteDB()
-	var tempPatientID int64
-	var tempPatientIDTwo int64
-	tempPatientID = schone.PatientId
-	tempPatientIDTwo = schtwo.PatientId
-	schone.PatientId = tempPatientIDTwo
-	schtwo.PatientId = tempPatientID
+	//床位
+	var tempBedID int64
+	var tempBedIDTwo int64
+
+	//分區
+	var tempPID int64
+	var tempPIDTwo int64
+
+	//上下午
+	var tempTypeID int64
+	var tempTypeTwo int64
+
+	tempBedID = schone.BedId
+	tempBedIDTwo = schtwo.BedId
+
+	tempPID = schone.PartitionId
+	tempPIDTwo = schtwo.PartitionId
+
+	tempTypeID = schone.ScheduleType
+	tempTypeTwo = schtwo.ScheduleType
+
+	schone.BedId = tempBedIDTwo
+	schtwo.BedId = tempBedID
+
+	schone.PartitionId = tempPIDTwo
+	schtwo.PartitionId = tempPID
+
+	schone.ScheduleType = tempTypeTwo
+	schtwo.ScheduleType = tempTypeID
+
 	utx.Save(&schone)
 	utx.Save(&schtwo)
 

service/smart_sch.go

@@ -15,21 +15,41 @@ func GetSmartSchPatientByKeyWord(orgID int64, keywords string) (patient []*model
 		err = db.Find(&patient).Error
 	}
 
-	for _, item := range patient {
-		var sch []*models.SmartSchedule
-		now := time.Now()
+	//for _, item := range patient {
+	//	var sch []*models.SmartSchedule
+	//	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)
+	//	readDb.Model(&models.SmartSchedule{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND schedule_date >= ?", orgID, item.ID, weekStart.Unix()).
+	//		Preload("DeviceZone", "status = 1").
+	//		Preload("SmSchDialysisOrder", "status = 1").
+	//		Preload("DeviceNumber", "status = 1").Find(&sch)
+	//	item.SmartSchedule = sch
+	//}
 
-		offset := int(time.Monday - now.Weekday())
-		if offset > 0 {
-			offset = -6
-		}
+	return
+}
+
+func GetSmartSchPatientByPatientID(orgID int64, id int64) (sch []*models.SmartSchedule, err error) {
+	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)
+	readDb.Model(&models.SmartSchedule{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND schedule_date >= ?", orgID, id, weekStart.Unix()).
+		Preload("DeviceZone", "status = 1").
+		Preload("DeviceNumber", "status = 1").Find(&sch)
 
-		weekStart := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
-		readDb.Model(&models.SmartSchedule{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND schedule_date >= ?", orgID, item.ID, weekStart.Unix()).
-			Preload("DeviceZone", "status = 1").
-			Preload("SmSchDialysisOrder", "status = 1").
-			Preload("DeviceNumber", "status = 1").Find(&sch)
-		item.SmartSchedule = sch
+	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)
+		item.SmSchDialysisOrder = order
 	}
 
 	return
@@ -81,8 +101,13 @@ func GetSmartSchPatientByID(orgID int64, patient_id int64) (schs []*models.Smart
 	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("SmSchDialysisOrder", "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)
+		item.SmSchDialysisOrder = order
+	}
 	return
 }
 
@@ -118,3 +143,27 @@ func GetScheduleByZoneAndBed(org_id int64, partitionId int64, bed_id int64, sche
 	err = readDb.Model(&models.SmartSchedule{}).Where("bed_id = ? AND user_org_id = ? AND schedule_date = ? AND partition_id = ? AND schedule_type = ?  AND status = 1", bed_id, org_id, schedule_date, partitionId, sch_type).First(&sch).Error
 	return
 }
+
+func GetScheduleByDate(org_id int64, schedule_date int64, patient_id int64) (sch models.SmartSchedule, err error) {
+	err = readDb.Model(&models.SmartSchedule{}).Where(" user_org_id = ? AND schedule_date = ? AND status = 1 AND patient_id = ?", org_id, schedule_date, patient_id).First(&sch).Error
+	return
+}
+func SaveSmartSch(sch models.SmartSchedule) {
+	writeDb.Save(&sch)
+	return
+}
+
+func GetAllAvaildTemplateDeviceNumbersByZone(orgID int64, weekday int64, schedule_type int, zone_id int64, patient_id int64, template_id int64) ([]*DeviceNumberViewModel, error) {
+	var vms []*DeviceNumberViewModel = make([]*DeviceNumberViewModel, 0)
+	rows, err := readDb.Raw("SELECT n.*, z.name as zone_name FROM xt_device_number as n join xt_device_zone as z on z.id = n.zone_id AND z.id = ?   WHERE (n.org_id = ? AND n.status = 1) AND NOT EXISTS (Select * FROM xt_patient_schedule_template_item as s Where s.`weekday` = ? AND s.patient_id <> ?  AND  s.org_id = n.org_id AND s.`device_number_id` = n.id  AND s.`time_type` = ? AND s.status = 1 AND s.template_id = ?)", zone_id, orgID, weekday, patient_id, schedule_type, template_id).Rows()
+	defer rows.Close()
+	if err != nil {
+		return nil, err
+	}
+	for rows.Next() {
+		var vm DeviceNumberViewModel
+		readDb.ScanRows(rows, &vm)
+		vms = append(vms, &vm)
+	}
+	return vms, nil
+}