医保对接

controllers/his_api_controller.go

@@ -5234,6 +5234,8 @@ func (c *HisApiController) GetUploadInfo() {
 			PrivatePrice:          private_price,
 			SettleEndTime:         end_time,
 			SettleStartTime:       start_time,
+			PsnPartAmt:            totals,
+			PsnCashPay:            totals,
 			SettleType:            settle_accounts_type,
 			FaPiaoCode:            fapiao_code,
 			FaPiaoNumber:          fapiao_number,
@@ -7819,6 +7821,8 @@ func (c *HisApiController) PreSettle() {
 		SettleEndTime:      end_time,
 		SettleStartTime:    start_time,
 		SettleType:         settle_accounts_type,
+		PsnPartAmt:         totals,
+		PsnCashPay:         totals,
 		PType:              2,
 		IsPre:              1,
 		MedType:            strconv.Itoa(int(reg_type)),

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -170,9 +170,12 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/savepatientsign", &DialysisAPIController{}, "Post:SavePatientSign")
 	beego.Router("/m/api/getpatientsign", &DialysisAPIController{}, "Get:GetPatientSign")
 
-	beego.Router("/m/api/checksch/get", &DialysisAPIController{}, "Get:CheckSchedule")
-
 	beego.Router("/m/api/patient/getschedulebypatient", &DialysisAPIController{}, "Get:GetScheduleByPatient")
 
 	beego.Router("/m/api/getdialysisrecordeorder", &DialysisAPIController{}, "Get:GetDialysisRecordOrder")
+
+	beego.Router("/m/api/getdialysisrecordeorder", &DialysisAPIController{}, "Get:GetDialysisRecordOrder")
+	beego.Router("/m/api/checksch/get", &DialysisAPIController{}, "Get:CheckSchedule")
+
+	//beego.Router("/m/api/getscheduletypebyidlist",&DialysisAPIController{},"Get:GetScheduleTypeByIdList")
 }

controllers/patient_api_controller.go

@@ -840,6 +840,25 @@ func (c *PatientApiController) CreateDialysisSolution() {
 	solution.ParentId = 0
 	solution.SolutionStatus = 1
 
+	//records, _ := service.GetAllSchedules()
+
+	schs, _ := service.GetAllSchedulesByPatientInfo(adminUserInfo.CurrentOrgId, id, solution.ModeId)
+	for _, sch := range schs {
+		var DialysisMachineName string
+		if len(solution.DialysisDialyszers) > 0 {
+			DialysisMachineName = solution.DialysisDialyszers
+		}
+		if len(solution.DialyzerPerfusionApparatus) > 0 {
+			DialysisMachineName = DialysisMachineName + "," + solution.DialyzerPerfusionApparatus
+		}
+
+		if len(solution.DialysisIrrigation) > 0 {
+			DialysisMachineName = DialysisMachineName + "," + solution.DialysisIrrigation
+		}
+		sch.DialysisMachineName = DialysisMachineName
+		service.UpdateSch(sch)
+	}
+
 	err := service.CreatePatientDialysisSolution(&solution)
 
 	//获取最新1条
@@ -921,6 +940,23 @@ func (c *PatientApiController) UpdateDialysisSolution() {
 		service.UpdatePatientDialysisSolutionOne(solution.PatientId, adminUserInfo.CurrentOrgId, &prescription, todayTime.Unix())
 	}
 
+	schs, _ := service.GetAllSchedulesByPatientInfo(adminUserInfo.CurrentOrgId, solution.PatientId, solution.ModeId)
+	for _, sch := range schs {
+		var DialysisMachineName string
+		if len(solution.DialysisDialyszers) > 0 {
+			DialysisMachineName = solution.DialysisDialyszers
+		}
+		if len(solution.DialyzerPerfusionApparatus) > 0 {
+			DialysisMachineName = DialysisMachineName + "," + solution.DialyzerPerfusionApparatus
+		}
+
+		if len(solution.DialysisIrrigation) > 0 {
+			DialysisMachineName = DialysisMachineName + "," + solution.DialysisIrrigation
+		}
+		sch.DialysisMachineName = DialysisMachineName
+		service.UpdateSch(sch)
+	}
+
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisSolutionUpdate)
 		return

controllers/schedule_api_controller.go

@@ -498,6 +498,42 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 						return
 					}
 
+					//daySchedule, err := service.GetDaySchedule(adminInfo.CurrentOrgId, theTime.Unix(), theTime.Unix(), patient_id)
+					//if daySchedule.ID > 0 && daySchedule.ID != schedule.ID {
+					//	week_type, _ := items["week_type"].(string)
+					//	week_name, _ := items["week_name"].(string)
+					//
+					//	switch week_type {
+					//	case "1":
+					//		json := make(map[string]interface{})
+					//		json["msg"] = "本周" + week_name + "该床位已经有人排班,无法保存"
+					//		json["state"] = 0
+					//		c.Data["json"] = json
+					//		c.ServeJSON()
+					//		break
+					//	case "2":
+					//		json := make(map[string]interface{})
+					//		json["msg"] = "下周" + week_name + "当天该患者已经排班,无法保存"
+					//		json["state"] = 0
+					//		c.Data["json"] = json
+					//		c.ServeJSON()
+					//		break
+					//	case "3":
+					//		json := make(map[string]interface{})
+					//		json["msg"] = "下下周" + week_name + "当天该患者已经排班,无法保存"
+					//		json["state"] = 0
+					//		c.Data["json"] = json
+					//		c.ServeJSON()
+					//		break
+					//	}
+					//
+					//	return
+					//
+					//
+					//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCantSetScheduleAgainOneDay)
+					//	return
+					//}
+					//
 				}
 
 			}
@@ -629,21 +665,29 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 
 					if filedRecordOne.IsShow == 1 {
 						schedule.DialysisMachineName = so.DialysisDialyszers
-						//service.UpdateSchDName(schedule)
 					}
-					if filedRecordTwo.IsShow == 1 {
-						schedule.DialysisMachineName = so.DialysisIrrigation
-						//service.UpdateSchDName(schedule)
+					if filedRecordThree.IsShow == 1 {
+						if len(schedule.DialysisMachineName) > 0 {
+							schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+
+						} else {
+							schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+
+						}
 					}
+					if filedRecordTwo.IsShow == 1 {
+						if len(schedule.DialysisMachineName) > 0 {
+							schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
 
-					if filedRecordThree.IsShow == 1 {
-						schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
-						//service.UpdateSchDName(schedule)
+						} else {
+							schedule.DialysisMachineName = so.DialysisIrrigation
+
+						}
 					}
 
 					service.SaveSch(schedule)
-
 				} else { //新的排班信息
+
 					if items["schedule_date"] == nil || reflect.TypeOf(items["schedule_date"]).String() != "string" {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 						return
@@ -663,6 +707,7 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 						return
 					}
 					schedule.ScheduleDate = theTime.Unix()
+
 					timeNow := time.Now().Format("2006-01-02")
 					if timeNow > scheduleDate {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCantSetScheduleBeforeNow)
@@ -751,20 +796,37 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 
 					if filedRecordOne.IsShow == 1 {
 						schedule.DialysisMachineName = so.DialysisDialyszers
-						//service.UpdateSchDName(schedule)
 					}
-					if filedRecordTwo.IsShow == 1 {
-						schedule.DialysisMachineName = so.DialysisIrrigation
-						//service.UpdateSchDName(schedule)
-					}
-
 					if filedRecordThree.IsShow == 1 {
-						schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
-						//service.UpdateSchDName(schedule)
+						if len(schedule.DialysisMachineName) > 0 {
+							schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+
+						} else {
+							schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+
+						}
 					}
+					if filedRecordTwo.IsShow == 1 {
+						if len(schedule.DialysisMachineName) > 0 {
+							schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
 
-					service.CreateSchedule(&schedule)
+						} else {
+							schedule.DialysisMachineName = so.DialysisIrrigation
 
+						}
+					}
+
+					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)
+					}
 				}
 				c.ServeSuccessJSON(map[string]interface{}{
 					"msg": "保存成功",
@@ -919,12 +981,27 @@ func (c *ScheduleApiController) GetDevicesNumbers() {
 func (c *ScheduleApiController) GetWeekPanels() {
 
 	data, _ := c.GetInt64("data", 1)
-	patitionId, _ := c.GetInt64("patitionid")
+	patitionIdStr := c.GetString("patitionid")
+	var ids []string
+	if len(patitionIdStr) > 0 {
+		ids = strings.Split(patitionIdStr, ",")
+	}
+
 	adminInfo := c.GetAdminUserInfo()
 	thisTime := time.Now()
 	year, monthTime, day := thisTime.Date()
 	month := int(monthTime)
 	_, theWeek := thisTime.ISOWeek()
+
+	lastWeek := thisTime.AddDate(0, 0, -7)
+
+	nextWeek := thisTime.AddDate(0, 0, 7)
+	nextSecWeek := thisTime.AddDate(0, 0, 14)
+
+	_, theLastWeek := lastWeek.ISOWeek()
+	_, theNextWeek := nextWeek.ISOWeek()
+	_, theNextSecWeek := nextSecWeek.ISOWeek()
+
 	weekDay := int(thisTime.Weekday())
 	if weekDay == 0 {
 		weekDay = 7
@@ -941,16 +1018,24 @@ func (c *ScheduleApiController) GetWeekPanels() {
 	}
 
 	returnData := map[string]interface{}{
-		"year":     year,
-		"month":    month,
-		"day":      day,
-		"theWeek":  theWeek,
-		"weekDay":  weekDay,
-		"weekDays": weekDays,
+		"year":           year,
+		"month":          month,
+		"day":            day,
+		"theWeek":        theWeek,
+		"theNextWeek":    theNextWeek,
+		"theNextSecWeek": theNextSecWeek,
+		"theLastWeek":    theLastWeek,
+		"weekDay":        weekDay,
+		"weekDays":       weekDays,
 	}
 
 	if data == 1 {
-		partitions, _ := service.GetSchedulePartitionPanelOne(adminInfo.CurrentOrgId, patitionId)
+		fmt.Println(ids)
+
+		partitions, _ := service.GetSchedulePartitionPanelOne(adminInfo.CurrentOrgId, ids)
+		fmt.Println("````~~")
+		fmt.Println(partitions)
+
 		returnData["partitions"] = partitions
 	}
 
@@ -1184,17 +1269,26 @@ func (c *ScheduleApiController) CreateSchedule() {
 
 	if filedRecordOne.IsShow == 1 {
 		schedule.DialysisMachineName = so.DialysisDialyszers
-		//service.UpdateSchDName(schedule)
 	}
-	if filedRecordTwo.IsShow == 1 {
-		schedule.DialysisMachineName = so.DialysisIrrigation
-		//service.UpdateSchDName(schedule)
+	if filedRecordThree.IsShow == 1 {
+		if len(schedule.DialysisMachineName) > 0 {
+			schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+
+		} else {
+			schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+
+		}
 	}
+	if filedRecordTwo.IsShow == 1 {
+		if len(schedule.DialysisMachineName) > 0 {
+			schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
 
-	if filedRecordThree.IsShow == 1 {
-		schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
-		//service.UpdateSchDName(schedule)
+		} else {
+			schedule.DialysisMachineName = so.DialysisIrrigation
+
+		}
 	}
+
 	bed, _ := service.GetDeviceNumberByID(adminUserInfo.CurrentOrgId, schedule.BedId)
 	if bed == nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeviceNumberNotExist)
@@ -1383,13 +1477,13 @@ func (c *ScheduleApiController) ChangeSchedule() {
 	if changeAction == "change_mode" {
 		if dataBody["mode_id"] == nil || reflect.TypeOf(dataBody["mode_id"]).String() != "float64" {
 			utils.ErrorLog("mode_id")
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrongForSchMode)
 			return
 		}
 		modeId := int64(dataBody["mode_id"].(float64))
 		if modeId < 1 {
 			utils.ErrorLog("modeId < 1")
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrongForSchMode)
 			return
 		}
 		schedule.ModeId = modeId
@@ -1401,16 +1495,24 @@ func (c *ScheduleApiController) ChangeSchedule() {
 
 		if filedRecordOne.IsShow == 1 {
 			schedule.DialysisMachineName = so.DialysisDialyszers
-			//service.UpdateSchDName(schedule)
 		}
-		if filedRecordTwo.IsShow == 1 {
-			schedule.DialysisMachineName = so.DialysisIrrigation
-			//service.UpdateSchDName(schedule)
+		if filedRecordThree.IsShow == 1 {
+			if len(schedule.DialysisMachineName) > 0 {
+				schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+
+			} else {
+				schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+
+			}
 		}
+		if filedRecordTwo.IsShow == 1 {
+			if len(schedule.DialysisMachineName) > 0 {
+				schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
 
-		if filedRecordThree.IsShow == 1 {
-			schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
-			//service.UpdateSchDName(schedule)
+			} else {
+				schedule.DialysisMachineName = so.DialysisIrrigation
+
+			}
 		}
 
 		order, err := service.GetOneDialysisOrder(adminINfo.CurrentOrgId, schedule.ScheduleDate, schedule.PatientId)
@@ -2321,17 +2423,26 @@ func (this *ScheduleApiController) ExportSchedule() {
 
 			if filedRecordOne.IsShow == 1 {
 				sch.DialysisMachineName = so.DialysisDialyszers
-				//service.UpdateSchDName(schedule)
 			}
-			if filedRecordTwo.IsShow == 1 {
-				sch.DialysisMachineName = so.DialysisIrrigation
-				//service.UpdateSchDName(schedule)
+			if filedRecordThree.IsShow == 1 {
+				if len(sch.DialysisMachineName) > 0 {
+					sch.DialysisMachineName = sch.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+
+				} else {
+					sch.DialysisMachineName = so.DialyzerPerfusionApparatus
+
+				}
 			}
+			if filedRecordTwo.IsShow == 1 {
+				if len(sch.DialysisMachineName) > 0 {
+					sch.DialysisMachineName = sch.DialysisMachineName + "," + so.DialysisIrrigation
 
-			if filedRecordThree.IsShow == 1 {
-				sch.DialysisMachineName = so.DialyzerPerfusionApparatus
-				//service.UpdateSchDName(schedule)
+				} else {
+					sch.DialysisMachineName = so.DialysisIrrigation
+
+				}
 			}
+
 			schedules = append(schedules, &sch)
 		}
 
@@ -2785,10 +2896,11 @@ func (this *ScheduleApiController) ExportScheduleTemplate() {
 				sch.Weekday = int8(schedule_week)
 
 			}
-
+			treat_mode, _ := schMapM["treat_mode"].(string)
+			treat_mode_int, _ := strconv.ParseInt(treat_mode, 10, 64)
 			sch.CreateTime = time.Now().Unix()
 			sch.ModifyTime = time.Now().Unix()
-			sch.TreatMode = 1
+			sch.TreatMode = treat_mode_int
 			sch.Status = 1
 			sch.OrgID = this.GetAdminUserInfo().CurrentOrgId
 			sch.IsExport = 1
@@ -2797,22 +2909,26 @@ func (this *ScheduleApiController) ExportScheduleTemplate() {
 
 		errLogs, _ := service.FindSchedualTemplateExportLog(this.GetAdminUserInfo().CurrentOrgId, export_time)
 
+		//for _, item := range schedules {
+		//
+		//}
+
 		if len(schedules) > 0 {
 			err := service.UpdateScheduleTemplateStatus(this.GetAdminUserInfo().CurrentOrgId)
 			if err == nil {
 				for _, item := range schedules {
 					service.CreateScheduleTemplate(item)
 				}
-				//查询已经转出或者死亡的患者
-				patientList, _ := service.GetDeathPatient(this.GetAdminUserInfo().CurrentOrgId)
-				for _, it := range patientList {
-					timeStr := time.Now().Format("2006-01-02")
-					timeLayout := "2006-01-02 15:04:05"
-					timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
-					timenow := timeStringToTime.Unix()
-					service.UpdateScheduleByDeathTime(it.ID, timenow)
-					service.UpdateScheduleItemByPatientId(it.ID)
-				}
+				////查询已经转出或者死亡的患者
+				//patientList, _ := service.GetDeathPatient(this.GetAdminUserInfo().CurrentOrgId)
+				//for _, it := range patientList {
+				//	timeStr := time.Now().Format("2006-01-02")
+				//	timeLayout := "2006-01-02 15:04:05"
+				//	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+				//	timenow := timeStringToTime.Unix()
+				//	service.UpdateScheduleByDeathTime(it.ID, timenow)
+				//	service.UpdateScheduleItemByPatientId(it.ID)
+				//}
 				log := models.ExportLog{
 					LogType:    3,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
@@ -2883,9 +2999,13 @@ func (c *ScheduleApiController) GetInitExcelInitDate() {
 	thisTime := time.Now()
 	thisTime1 := time.Now()
 	thisTime2 := time.Now()
+	thisTime3 := time.Now()
+	thisTime4 := time.Now()
 
 	thisTime1 = thisTime1.AddDate(0, 0, 7)
 	thisTime2 = thisTime2.AddDate(0, 0, 14)
+	thisTime3 = thisTime3.AddDate(0, 0, 21)
+	thisTime4 = thisTime4.AddDate(0, 0, 28)
 
 	weekDay := int(thisTime.Weekday())
 	if weekDay == 0 {
@@ -2921,6 +3041,28 @@ func (c *ScheduleApiController) GetInitExcelInitDate() {
 		days = append(days, theDay.Format("2006-01-02"))
 	}
 
+	weekDay3 := int(thisTime3.Weekday())
+	if weekDay3 == 0 {
+		weekDay3 = 7
+	}
+	weekEnd3 := 7 - weekDay3
+	weekStart3 := weekEnd3 - 6
+	for index := weekStart3; index <= weekEnd3; index++ {
+		theDay := thisTime3.AddDate(0, 0, index)
+		days = append(days, theDay.Format("2006-01-02"))
+	}
+
+	weekDay4 := int(thisTime4.Weekday())
+	if weekDay4 == 0 {
+		weekDay4 = 7
+	}
+	weekEnd4 := 7 - weekDay4
+	weekStart4 := weekEnd4 - 6
+	for index := weekStart4; index <= weekEnd4; index++ {
+		theDay := thisTime4.AddDate(0, 0, index)
+		days = append(days, theDay.Format("2006-01-02"))
+	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"days": days,
 	})
@@ -3135,6 +3277,33 @@ func (this *ScheduleApiController) GetCopyPatientSchedules() {
 			CreatedTime:  time.Now().Unix(),
 		}
 
+		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
+		}
+		if filedRecordThree.IsShow == 1 {
+			if len(schedule.DialysisMachineName) > 0 {
+				schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+
+			} else {
+				schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+
+			}
+		}
+		if filedRecordTwo.IsShow == 1 {
+			if len(schedule.DialysisMachineName) > 0 {
+				schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+
+			} else {
+				schedule.DialysisMachineName = so.DialysisIrrigation
+
+			}
+		}
+
 		err = service.AddPatientSchedule(&schedule)
 
 	}
@@ -3738,7 +3907,6 @@ func (c *ScheduleApiController) SynchroSchedule() {
 
 	recordDateStr := time.Now().Format("2006-01-02")
 	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
-
 	nowtime := recordDate.Unix()
 	fmt.Println("今日时间", nowtime)
 	fmt.Println("后期日期", copy_startime)
@@ -3752,13 +3920,11 @@ func (c *ScheduleApiController) SynchroSchedule() {
 	if copy_startime > nowtime {
 		//清空该时间段的所有排班数据
 		service.DeletePatientSchedule(copy_startime, copy_endtime, orgId)
-
 		tuesday = copy_startime + 86400
 		wednesday = copy_startime + 172800
 		thursday = copy_startime + 259200
 		friday = copy_startime + 345600
 		saturday = copy_startime + 432000
-
 		for _, item := range list {
 			if item.Weekday == 1 {
 				item.ScheduleDate = copy_startime
@@ -3786,7 +3952,6 @@ func (c *ScheduleApiController) SynchroSchedule() {
 			number, _ := service.GetBedNumberById(item.DeviceNumberID, orgId)
 			item.ZoneId = number.ZoneID
 		}
-
 		for _, item := range list {
 			schedule := models.XtSchedule{
 				UserOrgId:    orgId,
@@ -3802,6 +3967,33 @@ func (c *ScheduleApiController) SynchroSchedule() {
 				UpdatedTime:  0,
 			}
 
+			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
+			}
+			if filedRecordThree.IsShow == 1 {
+				if len(schedule.DialysisMachineName) > 0 {
+					schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+
+				} else {
+					schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+
+				}
+			}
+			if filedRecordTwo.IsShow == 1 {
+				if len(schedule.DialysisMachineName) > 0 {
+					schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+
+				} else {
+					schedule.DialysisMachineName = so.DialysisIrrigation
+
+				}
+			}
+
 			service.CreatePatientSchedule(&schedule)
 		}
 	}
@@ -3848,7 +4040,6 @@ func (c *ScheduleApiController) SynchroSchedule() {
 			number, _ := service.GetBedNumberById(item.DeviceNumberID, orgId)
 			item.ZoneId = number.ZoneID
 		}
-
 		for _, item := range list {
 			// 同步今日以后的数据
 			if item.ScheduleDate > nowtime {
@@ -3865,10 +4056,35 @@ func (c *ScheduleApiController) SynchroSchedule() {
 					CreatedTime:  time.Now().Unix(),
 					UpdatedTime:  0,
 				}
+				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
+				}
+				if filedRecordThree.IsShow == 1 {
+					if len(schedule.DialysisMachineName) > 0 {
+						schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+
+					} else {
+						schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+
+					}
+				}
+				if filedRecordTwo.IsShow == 1 {
+					if len(schedule.DialysisMachineName) > 0 {
+						schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+
+					} else {
+						schedule.DialysisMachineName = so.DialysisIrrigation
+
+					}
+				}
 				service.CreatePatientSchedule(&schedule)
 			}
 		}
-
 	}
 
 	returnData := make(map[string]interface{}, 0)

controllers/schedule_template_api_controller.go

@@ -6,6 +6,7 @@ import (
 	"XT_New/service"
 	"encoding/json"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/astaxie/beego"
@@ -53,6 +54,12 @@ type PatientScheduleTemplateAPIController struct {
 func (this *PatientScheduleTemplateAPIController) InitData() {
 	adminUserInfo := this.GetAdminUserInfo()
 
+	patitionIdStr := this.GetString("patitionid")
+	var ids []string
+	if len(patitionIdStr) > 0 {
+		ids = strings.Split(patitionIdStr, ",")
+	}
+
 	mode, getModeErr := service.GetOrgPatientScheduleTemplateMode(adminUserInfo.CurrentOrgId)
 	if getModeErr != nil {
 		this.ErrorLog("获取排班模板启用模式失败：%v", getModeErr)
@@ -77,7 +84,7 @@ func (this *PatientScheduleTemplateAPIController) InitData() {
 		}
 	}
 
-	deviceNumbers, getDeviceNumbersErr := service.GetScheduleValidDeviceNumbers(adminUserInfo.CurrentOrgId)
+	deviceNumbers, getDeviceNumbersErr := service.GetScheduleValidDeviceNumbers(adminUserInfo.CurrentOrgId, ids)
 
 	fmt.Println("deviceNumbers233323232332232323223233223323232323", deviceNumbers)
 	if getDeviceNumbersErr != nil {
@@ -184,7 +191,7 @@ func (this *PatientScheduleTemplateAPIController) SetMode() {
 	templateMode.Week = int64(week_time)
 
 	if mode != templateMode.Mode {
-		if templateMode.Mode == 0 { // 0 -> 1 或 0 -> 2 则直接清除下四周的排班
+		if templateMode.Mode == 0 { // 0 -> 1 或 0 -> 2  则直接清除下四周的排班
 			templateMode.Mode = mode
 			templateMode.ExecuteTimes = 0
 			templateMode.ModifyTime = time.Now().Unix()
@@ -210,7 +217,7 @@ func (this *PatientScheduleTemplateAPIController) SetMode() {
 			templateMode.Mode = mode
 			templateMode.ExecuteTimes = 0
 			templateMode.ModifyTime = time.Now().Unix()
-			updateErr := service.SavePatientScheduleTemplateModeAndClearNextSecondWeekSchedules(templateMode)
+			updateErr := service.SavePatientScheduleTemplateModeAndClearNextTwoWeekSchedules(templateMode)
 			if updateErr != nil {
 				this.ErrorLog("更新排班模板启用方式（1 -> 2）时失败：%v", updateErr)
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -263,7 +270,7 @@ func (this *PatientScheduleTemplateAPIController) SetMode() {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
-		} else if templateMode.Mode == 2 && mode == 3 { // 2 -> 1 清除第二周模板item，清除第二周排班
+		} else if templateMode.Mode == 2 && mode == 3 { //
 			templateMode.Mode = mode
 			templateMode.ExecuteTimes = 0
 			templateMode.ModifyTime = time.Now().Unix()
@@ -273,7 +280,7 @@ func (this *PatientScheduleTemplateAPIController) SetMode() {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
-		} else if templateMode.Mode == 2 && mode == 4 { // 2 -> 1 清除第二周模板item，清除第二周排班
+		} else if templateMode.Mode == 2 && mode == 4 { //
 			templateMode.Mode = mode
 			templateMode.ExecuteTimes = 0
 			templateMode.ModifyTime = time.Now().Unix()
@@ -384,17 +391,29 @@ func (this *PatientScheduleTemplateAPIController) SetMode() {
 		}
 		templates, _ := service.GetOrgPatientScheduleTemplateIDs(adminUserInfo.CurrentOrgId)
 		//处理第几周数问题
-		if mode == 1 {
+		if mode == 0 {
+			service.UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, 0)
+			service.UpdateTemplateItemWeek(templates[1].OrgID, templates[1].ID, 0)
+			service.UpdateTemplateItemWeek(templates[2].OrgID, templates[2].ID, 0)
+			service.UpdateTemplateItemWeek(templates[3].OrgID, templates[3].ID, 0)
+
+		} else if mode == 1 {
 			service.UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, week_time)
+			service.UpdateTemplateItemWeek(templates[1].OrgID, templates[1].ID, 0)
+			service.UpdateTemplateItemWeek(templates[2].OrgID, templates[2].ID, 0)
+			service.UpdateTemplateItemWeek(templates[3].OrgID, templates[3].ID, 0)
 
 		} else if mode == 2 {
 			service.UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, week_time)
 			service.UpdateTemplateItemWeek(templates[1].OrgID, templates[1].ID, week_time+1)
+			service.UpdateTemplateItemWeek(templates[2].OrgID, templates[2].ID, 0)
+			service.UpdateTemplateItemWeek(templates[3].OrgID, templates[3].ID, 0)
 
 		} else if mode == 3 {
 			service.UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, week_time)
 			service.UpdateTemplateItemWeek(templates[1].OrgID, templates[1].ID, week_time+1)
 			service.UpdateTemplateItemWeek(templates[2].OrgID, templates[2].ID, week_time+2)
+			service.UpdateTemplateItemWeek(templates[3].OrgID, templates[3].ID, 0)
 
 		} else if mode == 4 {
 			service.UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, week_time)
@@ -593,7 +612,7 @@ func (this *PatientScheduleTemplateAPIController) UpdateSchedules() {
 	//	}
 	//}
 
-	updateErr := service.UpdateScheduleTemplate(adminUserInfo.CurrentOrgId, templateID, addTemplateItems, delTemplateItems, changeTemplateItems)
+	updateErr := service.UpdateScheduleTemplate(adminUserInfo.CurrentOrgId, templateID, addTemplateItems, delTemplateItems, changeTemplateItems, false, false)
 	if updateErr != nil {
 		this.ErrorLog("更新排班模板排班失败：%v", updateErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)

enums/error_code.go

@@ -266,6 +266,8 @@ const ( // ErrorCode
 	ErrorCodeCantDeleteScheduleBeforeNow = 40000001
 
 	ErrorCodeSchedule = 50000000
+
+	ErrorCodeParamWrongForSchMode = 40000002
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -518,6 +520,7 @@ var ErrCodeMsgs = map[int]string{
 
 	ErrorCodeHisPatientNoRegException: "该患者尚未挂号，请先挂号",
 	ErrorCodeSchedule:                 "该班次该床位已有患者",
+	ErrorCodeParamWrongForSchMode:     "透析模式不能为空",
 }
 
 type SGJError struct {

models/device_models.go

@@ -403,20 +403,21 @@ type Schedules struct {
 }
 
 type XtSchedule 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"`
-	LastAfterWeight AssessmentAfterDislysis `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
+	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"`
+	LastAfterWeight     AssessmentAfterDislysis `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
+	DialysisMachineName string                  `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
 }
 
 func (XtSchedule) TableName() string {

models/patient_schedule_template_models.go

@@ -16,12 +16,10 @@ func (PatientScheduleTemplateMode) TableName() string {
 }
 
 type PatientScheduleTemplateId struct {
-	ID         int64 `gorm:"column:id" json:"id" form:"id"`
-	OrgID      int64 `gorm:"column:org_id" json:"-" form:"org_id"`
-	Status     int8  `gorm:"column:status" json:"-" form:"status"`
-	CreateTime int64 `gorm:"column:ctime" json:"-" form:"ctime"`
-	ModifyTime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Week       int   `gorm:"column:week" json:"week" form:"week"`
+	ID     int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgID  int64 `gorm:"column:org_id" json:"-" form:"org_id"`
+	Status int8  `gorm:"column:status" json:"-" form:"status"`
+	Week   int   `gorm:"column:week" json:"week" form:"week"`
 }
 
 func (PatientScheduleTemplateId) TableName() string {

models/smart_sch.go

@@ -1,9 +1,11 @@
 package models
 
 type SmartSchPatient 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"`
-	Name          string           `gorm:"column:name" json:"name" form:"name"`
+	ID         int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	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"`
 }
 
@@ -12,9 +14,11 @@ func (SmartSchPatient) TableName() string {
 }
 
 type SmartSchTemplatePatient 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"`
-	Name                        string `gorm:"column:name" json:"name" form:"name"`
+	ID         int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Name       string `gorm:"column:name" json:"name" form:"name"`
+	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+
 	XtPatientScheduleTemplateId []*XtPatientScheduleTemplateId
 }
 
@@ -23,21 +27,22 @@ 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;"`
+	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;"`
 }
 
 func (SmartSchedule) TableName() string {
@@ -77,3 +82,20 @@ type XtPatientScheduleTemplateItem struct {
 func (XtPatientScheduleTemplateItem) TableName() string {
 	return "xt_patient_schedule_template_item"
 }
+
+type SmSchDialysisOrder struct {
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	DialysisDate int64  `gorm:"column:dialysis_date" json:"dialysis_date" form:"dialysis_date"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Stage        int64  `gorm:"column:stage" json:"stage" form:"stage"`
+	Remark       string `gorm:"column:remark" json:"remark" form:"remark"`
+	BedId        int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	StartNurse   int64  `gorm:"column:start_nurse" json:"start_nurse" form:"start_nurse"`
+	FinishNurse  int64  `gorm:"column:finish_nurse" json:"finish_nurse" form:"finish_nurse"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (SmSchDialysisOrder) TableName() string {
+	return "xt_dialysis_order"
+}

service/device_service.go

@@ -390,10 +390,23 @@ func UpdateDeviceGroup(group *models.DeviceGroup) error {
 
 //////// 机号 Number
 
+type DeviceNumberVM struct {
+	ID     int64  `gorm:"column:id" json:"id"`
+	OrgID  int64  `gorm:"column:org_id" json:"-"`
+	Number string `gorm:"column:number" json:"number"`
+	ZoneID int64  `gorm:"column:zone_id" json:"zone_id"`
+	Status int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (DeviceNumberVM) TableName() string {
+	return "xt_device_number"
+}
+
 type DeviceNumberViewModel struct {
-	models.DeviceNumber
-	ZoneName  string `gorm:"column:zone_name" json:"zone_name"`
-	GroupName string `gorm:"column:group_name" json:"group_name"`
+	DeviceNumberVM
+	ZoneName  string              `gorm:"column:zone_name" json:"zone_name"`
+	GroupName string              `gorm:"column:group_name" json:"group_name"`
+	Zone      models.VMDeviceZone `gorm:"ForeignKey:ZoneID" json:"zone"`
 }
 
 func GetAllValidDeviceNumbers(orgID int64) ([]*DeviceNumberViewModel, error) {

service/mobile_dialysis_service.go

@@ -2642,14 +2642,15 @@ func (GoodsType) TableName() string {
 }
 
 type VMGoodInfo struct {
-	ID                int64   `gorm:"column:id" json:"id"`
-	SpecificationName string  `gorm:"column:specification_name" json:"specification_name"`
-	GoodTypeId        int64   `gorm:"column:good_type_id" json:"good_type_id"`
-	OrgId             int64   `gorm:"column:org_id" json:"org_id"`
-	GoodName          string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
-	GoodUnit          int64   `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
-	Total             float64 `gorm:"column:total" json:"total" form:"total"`
-	PackingUnit       string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	ID                     int64   `gorm:"column:id" json:"id"`
+	SpecificationName      string  `gorm:"column:specification_name" json:"specification_name"`
+	GoodTypeId             int64   `gorm:"column:good_type_id" json:"good_type_id"`
+	OrgId                  int64   `gorm:"column:org_id" json:"org_id"`
+	GoodName               string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	GoodUnit               int64   `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	Total                  float64 `gorm:"column:total" json:"total" form:"total"`
+	PackingUnit            string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
 }
 
 func (VMGoodInfo) TableName() string {

service/patient_schedule_template_service.go

@@ -47,10 +47,22 @@ func GetOrgPatientScheduleTemplateIDByTemplateID(orgID int64, templateID int64)
 	return &id, nil
 }
 
+type PatientsTwo 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"`
+	UserId    int64  `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	Name      string `gorm:"column:name" json:"name" form:"name"`
+}
+
+func (PatientsTwo) TableName() string {
+	return "xt_patients"
+}
+
 type PatientScheduleTemplateItemViewModel struct {
 	models.PatientScheduleTemplateItem
 
-	Patient *models.Patients `gorm:"ForeignKey:PatientID" json:"patient"`
+	Patient               *PatientsTwo          `gorm:"ForeignKey:PatientID" json:"patient"`
+	DeviceNumberViewModel DeviceNumberViewModel `gorm:"ForeignKey:DeviceNumberID" json:"devices"`
 }
 
 type PatientScheduleTemplateViewModel struct {
@@ -72,6 +84,7 @@ func GetOrgPatientScheduleTemplateItems(orgID int64) ([]*PatientScheduleTemplate
 		Model(&PatientScheduleTemplateViewModel{}).
 		Preload("Items", "org_id = ? AND status = 1", orgID).
 		Preload("Items.Patient", "user_org_id = ? AND status = 1", orgID).
+		Preload("Items.DeviceNumberViewModel.Zone", "status = 1").
 		Where("org_id = ? AND status = 1", orgID).
 		Limit(4).
 		Find(&vms).
@@ -117,41 +130,44 @@ type ScheduleDeviceNumberViewModel struct {
 	Zone *models.DeviceZone `gorm:"ForeignKey:ZoneID" json:"zone"`
 }
 
-func GetScheduleValidDeviceNumbers(orgID int64) ([]*ScheduleDeviceNumberViewModel, error) {
-	var vms []*ScheduleDeviceNumberViewModel
-	err := readDb.Model(&ScheduleDeviceNumberViewModel{}).Preload("Zone", "status = 1").Where("org_id = ? AND status = 1", orgID).Order("zone_id asc").Order("id asc").Find(&vms).Error
-	if err != nil {
-		return nil, err
+func GetScheduleValidDeviceNumbers(orgID int64, ids []string) ([]*ScheduleDeviceNumberViewModel, error) {
+	if len(ids) == 0 {
+		var vms []*ScheduleDeviceNumberViewModel
+		err := readDb.Model(&ScheduleDeviceNumberViewModel{}).Preload("Zone", "status = 1").Where("org_id = ? AND status = 1", orgID).Order("zone_id asc").Order("id asc").Find(&vms).Error
+		if err != nil {
+			return nil, err
+		}
+		return vms, nil
+
+	} else {
+		var vms []*ScheduleDeviceNumberViewModel
+		err := readDb.Model(&ScheduleDeviceNumberViewModel{}).Preload("Zone", "status = 1 AND id in (?)", ids).Where("org_id = ? AND status = 1", orgID).Order("zone_id asc").Order("id asc").Find(&vms).Error
+		if err != nil {
+			return nil, err
+		}
+		return vms, nil
+
 	}
-	return vms, nil
+
 }
 
 // 创建两个默认模板
 func CreateTwoPatientScheduleTemplates(orgID int64) (*PatientScheduleTemplateViewModel, *PatientScheduleTemplateViewModel, *PatientScheduleTemplateViewModel, *PatientScheduleTemplateViewModel, error) {
-	now := time.Now().Unix()
 	firstTemp := models.PatientScheduleTemplateId{}
 	firstTemp.OrgID = orgID
 	firstTemp.Status = 1
-	firstTemp.CreateTime = now
-	firstTemp.ModifyTime = now
 
 	secondTemp := models.PatientScheduleTemplateId{}
 	secondTemp.OrgID = orgID
 	secondTemp.Status = 1
-	secondTemp.CreateTime = now
-	secondTemp.ModifyTime = now
 
 	thirdTemp := models.PatientScheduleTemplateId{}
 	thirdTemp.OrgID = orgID
 	thirdTemp.Status = 1
-	thirdTemp.CreateTime = now
-	thirdTemp.ModifyTime = now
 
 	fourTemp := models.PatientScheduleTemplateId{}
 	fourTemp.OrgID = orgID
 	fourTemp.Status = 1
-	fourTemp.CreateTime = now
-	fourTemp.ModifyTime = now
 
 	tx := writeDb.Begin()
 	if err := tx.Model(&models.PatientScheduleTemplateId{}).Create(&firstTemp).Error; err != nil {
@@ -194,12 +210,9 @@ func CreateTwoPatientScheduleTemplates(orgID int64) (*PatientScheduleTemplateVie
 }
 
 func CreatePatientScheduleTemplate(orgID int64) (*PatientScheduleTemplateViewModel, *PatientScheduleTemplateViewModel, *PatientScheduleTemplateViewModel, error) {
-	now := time.Now().Unix()
 	temp := models.PatientScheduleTemplateId{}
 	temp.OrgID = orgID
 	temp.Status = 1
-	temp.CreateTime = now
-	temp.ModifyTime = now
 	tx := writeDb.Begin()
 	if err := tx.Model(&models.PatientScheduleTemplateId{}).Create(&temp).Error; err != nil {
 		tx.Rollback()
@@ -209,8 +222,6 @@ func CreatePatientScheduleTemplate(orgID int64) (*PatientScheduleTemplateViewMod
 	thirdTemp := models.PatientScheduleTemplateId{}
 	thirdTemp.OrgID = orgID
 	thirdTemp.Status = 1
-	thirdTemp.CreateTime = now
-	thirdTemp.ModifyTime = now
 
 	if err := tx.Model(&models.PatientScheduleTemplateId{}).Create(&thirdTemp).Error; err != nil {
 		tx.Rollback()
@@ -220,8 +231,6 @@ func CreatePatientScheduleTemplate(orgID int64) (*PatientScheduleTemplateViewMod
 	fourTemp := models.PatientScheduleTemplateId{}
 	fourTemp.OrgID = orgID
 	fourTemp.Status = 1
-	fourTemp.CreateTime = now
-	fourTemp.ModifyTime = now
 
 	if err := tx.Model(&models.PatientScheduleTemplateId{}).Create(&fourTemp).Error; err != nil {
 		tx.Rollback()
@@ -244,15 +253,12 @@ func CreatePatientScheduleTemplate(orgID int64) (*PatientScheduleTemplateViewMod
 	return &vm, &vm3, &vm4, nil
 }
 func CreatePatientScheduleTemplateTwo(orgID int64) (*PatientScheduleTemplateViewModel, *PatientScheduleTemplateViewModel, error) {
-	now := time.Now().Unix()
 
 	tx := writeDb.Begin()
 
 	thirdTemp := models.PatientScheduleTemplateId{}
 	thirdTemp.OrgID = orgID
 	thirdTemp.Status = 1
-	thirdTemp.CreateTime = now
-	thirdTemp.ModifyTime = now
 
 	if err := tx.Model(&models.PatientScheduleTemplateId{}).Create(&thirdTemp).Error; err != nil {
 		tx.Rollback()
@@ -262,8 +268,6 @@ func CreatePatientScheduleTemplateTwo(orgID int64) (*PatientScheduleTemplateView
 	fourTemp := models.PatientScheduleTemplateId{}
 	fourTemp.OrgID = orgID
 	fourTemp.Status = 1
-	fourTemp.CreateTime = now
-	fourTemp.ModifyTime = now
 
 	if err := tx.Model(&models.PatientScheduleTemplateId{}).Create(&fourTemp).Error; err != nil {
 		tx.Rollback()
@@ -282,13 +286,10 @@ func CreatePatientScheduleTemplateTwo(orgID int64) (*PatientScheduleTemplateView
 	return &vm3, &vm4, nil
 }
 func CreatePatientScheduleTemplateThree(orgID int64) (*PatientScheduleTemplateViewModel, error) {
-	now := time.Now().Unix()
 	tx := writeDb.Begin()
 	fourTemp := models.PatientScheduleTemplateId{}
 	fourTemp.OrgID = orgID
 	fourTemp.Status = 1
-	fourTemp.CreateTime = now
-	fourTemp.ModifyTime = now
 	if err := tx.Model(&models.PatientScheduleTemplateId{}).Create(&fourTemp).Error; err != nil {
 		tx.Rollback()
 		return nil, err
@@ -302,8 +303,9 @@ func CreatePatientScheduleTemplateThree(orgID int64) (*PatientScheduleTemplateVi
 }
 
 type PatientScheduleTemplatePatientVM struct {
-	ID   int64  `gorm:"column:id" json:"id" form:"id"`
-	Name string `gorm:"column:name" json:"name" form:"name"`
+	ID         int64  `gorm:"column:id" json:"id" form:"id"`
+	Name       string `gorm:"column:name" json:"name" form:"name"`
+	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
 
 	Contagions []*PatientScheduleContagion `gorm:"ForeignKey:PatientID" json:"contagions"`
 }
@@ -313,9 +315,10 @@ func (PatientScheduleTemplatePatientVM) TableName() string {
 }
 
 type PatientScheduleContagion struct {
-	ID        int64 `gorm:"column:id" json:"id" form:"id"`
-	PatientID int64 `gorm:"column:patient_id" json:"-"`
-	DiseaseID int64 `gorm:"column:disease_id" json:"disease_id" form:"disease_id"`
+	ID         int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientID  int64  `gorm:"column:patient_id" json:"-"`
+	DiseaseID  int64  `gorm:"column:disease_id" json:"disease_id" form:"disease_id"`
+	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
 }
 
 func (PatientScheduleContagion) TableName() string {
@@ -346,12 +349,21 @@ func UpdateScheduleTemplate(orgID int64, template_id int64,
 	now := time.Now()
 	tx := writeDb.Begin()
 
+	readDb.Model(&models.XtPatientScheduleTemplateItem{}).Where("template_id = ? AND weekday = ? AND patient_id = ?", template_id)
+
 	// 批量插入 add template item
 	if len(addTemplateItems) > 0 {
+
 		// utils.TraceLog("addTemplateItems len: %v", len(addTemplateItems))
 		valueStrs := make([]string, 0, len(addTemplateItems))
 		values := make([]interface{}, 0, len(addTemplateItems)*10)
 		for _, item := range addTemplateItems {
+			var pst []models.XtPatientScheduleTemplateItem
+			readDb.Model(&models.XtPatientScheduleTemplateItem{}).Where("template_id = ? AND weekday = ? AND patient_id = ? AND status = 1", template_id, item.Weekday, item.PatientID).Find(&pst)
+			for _, item := range pst {
+				item.Status = 0
+				writeDb.Save(item)
+			}
 			valueStrs = append(valueStrs, "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
 			values = append(values, orgID)
 			values = append(values, template_id)
@@ -585,8 +597,33 @@ func SavePatientScheduleTemplateModeAndClearNextTwoWeekSchedules(templateMode *m
 	return nil
 }
 
-// 1 -> 2 清除第二周排班
-func SavePatientScheduleTemplateModeAndClearNextSecondWeekSchedules(templateMode *models.PatientScheduleTemplateMode) error {
+// 1 -> 3 清除第二周排班
+func SavePatientScheduleTemplateModeAndClearNextThirfWeekSchedules(templateMode *models.PatientScheduleTemplateMode) error {
+	tx := writeDb.Begin()
+	saveErr := tx.Save(templateMode).Error
+	if saveErr != nil {
+		tx.Rollback()
+		return saveErr
+	}
+
+	now := time.Now()
+	nextSecWeek := now.AddDate(0, 0, 21)
+	nextSecMonday, nextSecSunday := utils.GetMondayAndSundayOfWeekDate(&nextSecWeek)
+
+	//tx.Model(&models.PatientScheduleTemplateId{}).Where("user_org_id = ? AND status = 1", templateMode.OrgID, nextSecMonday.Unix(), nextSecSunday.Unix()).Updates(map[string]interface{}{"status": 0, "updated_time": now.Unix()}).Error
+
+	disableErr := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", templateMode.OrgID, nextSecMonday.Unix(), nextSecSunday.Unix()).Updates(map[string]interface{}{"status": 0, "updated_time": now.Unix()}).Error
+	if disableErr != nil {
+		tx.Rollback()
+		return disableErr
+	}
+
+	tx.Commit()
+	return nil
+}
+
+// 1 -> 4 清除第二周排班
+func SavePatientScheduleTemplateModeAndClearNextFourWeekSchedules(templateMode *models.PatientScheduleTemplateMode) error {
 	tx := writeDb.Begin()
 	saveErr := tx.Save(templateMode).Error
 	if saveErr != nil {
@@ -609,6 +646,7 @@ func SavePatientScheduleTemplateModeAndClearNextSecondWeekSchedules(templateMode
 	tx.Commit()
 	return nil
 }
+
 func SaveTemplateMode(templateMode *models.PatientScheduleTemplateMode) error {
 	err := writeDb.Model(&models.PatientScheduleTemplateMode{}).Where("id = ? AND status = 1", templateMode.ID).Updates(map[string]interface{}{"mode": templateMode.Mode, "mtime": templateMode.ModifyTime}).Error
 	return err

service/patient_service.go

@@ -1907,7 +1907,7 @@ func FindRemindAdvice(user_org_id int64, advice_name string, advice_desc string,
 }
 
 func UpdateScheduleByDeathTime(patientid int64, shcheduledate int64) error {
-	err := XTWriteDB().Model(models.XtSchedule{}).Where("patient_id = ? and schedule_date>?", patientid, shcheduledate).Updates(map[string]interface{}{"status": 0}).Error
+	err := XTWriteDB().Model(models.XtSchedule{}).Where("patient_id = ? and schedule_date > ?", patientid, shcheduledate).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
 
@@ -2675,3 +2675,19 @@ func GetDialysisSolutionDetailList(orgid int64, patient_id int64, mode_id int64,
 	err = db.Count(&total).Offset(offset).Limit(limit).Find(&solution).Order("created_time desc").Error
 	return solution, total, err
 }
+
+func GetAllSchedulesByPatientInfo(org_id int64, patient_id int64, mode_id int64) ([]Schedule, error) {
+	var record []Schedule
+	loc, _ := time.LoadLocation("Local")
+	date, _ := time.ParseInLocation("2006-01-02 15:04:05", time.Now().Format("2006-01-02")+" 00:00:00", loc)
+
+	err := readDb.Model(&Schedule{}).Where("status = 1 AND schedule_date >= ? AND patient_id = ? AND user_org_id = ? AND mode_id= ?", date, patient_id, org_id, mode_id).Find(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return record, nil
+}

service/schedule_service.go

@@ -18,14 +18,14 @@ func GetSchedulePartitionPanel(orgID int64) (partitions []*models.Partition, err
 	return
 }
 
-func GetSchedulePartitionPanelOne(orgID int64, partionId int64) (partitions []*models.Partition, err error) {
+func GetSchedulePartitionPanelOne(orgID int64, partionId []string) (partitions []*models.Partition, err error) {
 
-	if partionId > 0 {
-		err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", "org_id=? and status=1 and zone_id = ?", orgID, partionId).Where("org_id=? and status=1 and id = ?", orgID, partionId).Find(&partitions).Error
-	}
-	if partionId == 0 {
-		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(partionId) > 0 {
+	//	err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", "org_id=? and status=1 and zone_id in (?)", orgID, partionId).Where("org_id=? and status=1 and id  ?", orgID, partionId).Find(&partitions).Error
+	//}
+	//if len(partionId) == 0 {
+	err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", "org_id=? and status=1", orgID).Where("org_id=? and status=1", orgID).Find(&partitions).Error
+	//}
 
 	return
 }
@@ -306,8 +306,8 @@ func UpdateScheduleTwo(schone models.Schedule, schtwo models.Schedule) {
 	tempPatientIDTwo = schtwo.PatientId
 	schone.PatientId = tempPatientIDTwo
 	schtwo.PatientId = tempPatientID
-	utx.Save(schone)
-	utx.Save(schtwo)
+	utx.Save(&schone)
+	utx.Save(&schtwo)
 
 }
 

service/smart_sch.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"XT_New/models"
+	"github.com/jinzhu/gorm"
 	"time"
 )
 
@@ -26,6 +27,7 @@ func GetSmartSchPatientByKeyWord(orgID int64, keywords string) (patient []*model
 		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
 	}
@@ -79,12 +81,15 @@ 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
 	return
 }
 
 func GetSmartSchTemplatePatientByID(orgID int64, patient_id int64, count int) (schs []*models.XtPatientScheduleTemplateId, err error) {
-	err = readDb.Model(&models.XtPatientScheduleTemplateId{}).Preload("XtPatientScheduleTemplateItem", "status=1 AND patient_id = ?", patient_id).Where("org_id = ? AND status = 1", orgID).Limit(count).Find(&schs).Error
+	err = readDb.Model(&models.XtPatientScheduleTemplateId{}).Preload("XtPatientScheduleTemplateItem", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND patient_id = ?", patient_id).Order("weekday")
+	}).Where("org_id = ? AND status = 1", orgID).Limit(count).Find(&schs).Error
 	for _, items := range schs {
 		for _, subItems := range items.XtPatientScheduleTemplateItem {
 			number, _ := GetBedNumberById(subItems.DeviceNumberId, subItems.OrgId)

utils/tools.go

@@ -226,6 +226,7 @@ func GetMondayAndSundayOfWeekDate(date *time.Time) (time.Time, time.Time) {
 	}
 	loc, _ := time.LoadLocation("Local")
 	monday, _ := time.ParseInLocation("2006-01-02 15:04:05", date.AddDate(0, 0, 1-weekday).Format("2006-01-02")+" 00:00:00", loc)
+
 	sunday, _ := time.ParseInLocation("2006-01-02 15:04:05", date.AddDate(0, 0, 7-weekday).Format("2006-01-02")+" 23:59:59", loc)
 	return monday, sunday
 }