Merge branch '20220812' of http://git.shengws.com/csx/XT_New into 20220812

.idea/XT_New.iml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true" />
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />

.idea/misc.xml

@@ -3,9 +3,6 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="RustProjectSettings">
-    <option name="toolchainHomeDirectory" value="$USER_HOME$/.cargo/bin" />
-  </component>
   <component name="SvnBranchConfigurationManager">
     <option name="myConfigurationMap">
       <map>

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
-httpport = 9529
-runmode = dev
+httpport = 9531
+runmode =dev
 #dev/prod
 
 #

controllers/his_api_controller.go

@@ -5276,6 +5276,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,
@@ -5641,6 +5643,7 @@ func (c *HisApiController) GetUploadInfo() {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "结算成功",
 			})
+
 		}
 	} else {
 		if tempOrder.IsPre > 0 {
@@ -8211,6 +8214,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/dialysis_api_controller.go

@@ -2217,11 +2217,12 @@ func (this *DialysisAPIController) StartDialysis() {
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
 	//查询更改的机号，是否有人用了,如果只是排班了，但是没上机，直接替换，如果排班且上机了，就提示他无法上机
+	//sch, _ := service.GetSourceSch(adminUserInfo.Org.Id, patientID, scheduleendTime)
 
 	schedule, err := service.GetDayScheduleByBedid(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
 
 	//查询该床位是否有人用了
-	order, order_err := service.GetDialysisOrderByBedId(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
+	order, _ := service.GetDialysisOrderByBedIdTwo(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
 
 	if err == gorm.ErrRecordNotFound { //空床位
 		// 修改了床位逻辑
@@ -2247,33 +2248,10 @@ func (this *DialysisAPIController) StartDialysis() {
 	} else if err == nil {
 		if schedule.ID > 0 && schedule.DialysisOrder.ID == 0 { //有排班没上机记录
 
-			if order_err == nil {
-				if order.ID > 0 { //该机位被其他人占用了
-					this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
-					return
-
-				} else {
-					daySchedule, _ := service.GetDaySchedule(adminUserInfo.Org.Id, schedulestartTime, scheduleendTime, patientID)
-					if daySchedule.ID > 0 {
-						//daySchedule.PartitionId = deviceNumber.ZoneID
-						//daySchedule.BedId = bedID
-						//daySchedule.ScheduleType = schedual_type
-						//daySchedule.UpdatedTime = time.Now().Unix()
-						//err := service.UpdateSchedule(&daySchedule)
-						xtSchedule := models.Schedule{
-							PartitionId:  deviceNumber.ZoneID,
-							BedId:        bedID,
-							ScheduleType: schedual_type,
-							UpdatedTime:  time.Now().Unix(),
-						}
-						err := service.UpdateScheduleOne(daySchedule.ID, xtSchedule)
-						if err != nil {
-							this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-							return
-						}
-					}
-				}
-			} else if order_err == gorm.ErrRecordNotFound { //该床位没被占用
+			if order.ID > 0 { //该机位被其他人占用了
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
+				return
+			} else { //2022-11-04 更变需求，如果改床位有排班，但是没上机，则进行互换床位操作
 				daySchedule, _ := service.GetDaySchedule(adminUserInfo.Org.Id, schedulestartTime, scheduleendTime, patientID)
 				if daySchedule.ID > 0 {
 					//daySchedule.PartitionId = deviceNumber.ZoneID
@@ -2281,23 +2259,44 @@ func (this *DialysisAPIController) StartDialysis() {
 					//daySchedule.ScheduleType = schedual_type
 					//daySchedule.UpdatedTime = time.Now().Unix()
 					//err := service.UpdateSchedule(&daySchedule)
-					xtSchedule := models.Schedule{
-						PartitionId:  deviceNumber.ZoneID,
-						BedId:        bedID,
-						ScheduleType: schedual_type,
-						UpdatedTime:  time.Now().Unix(),
-					}
-					err := service.UpdateScheduleOne(daySchedule.ID, xtSchedule)
-					if err != nil {
-						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
+					//xtSchedule := models.Schedule{
+					//	PartitionId:  deviceNumber.ZoneID,
+					//	BedId:        bedID,
+					//	ScheduleType: schedual_type,
+					//	UpdatedTime:  time.Now().Unix(),
+					//}
+					//err := service.UpdateScheduleOne(daySchedule.ID, xtSchedule)
+					service.UpdateScheduleTwo(daySchedule, schedule)
+
 				}
 			}
 		} else if schedule.ID > 0 && schedule.DialysisOrder.ID > 0 { //有排班且有上机记录
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
 			return
 		}
+		//else if order.ID == 0 { //该床位没被占用
+		//	daySchedule, _ := service.GetDaySchedule(adminUserInfo.Org.Id, schedulestartTime, scheduleendTime, patientID)
+		//	if daySchedule.ID > 0 {
+		//		//daySchedule.PartitionId = deviceNumber.ZoneID
+		//		//daySchedule.BedId = bedID
+		//		//daySchedule.ScheduleType = schedual_type
+		//		//daySchedule.UpdatedTime = time.Now().Unix()
+		//		//err := service.UpdateSchedule(&daySchedule)
+		//		xtSchedule := models.Schedule{
+		//			PartitionId:  deviceNumber.ZoneID,
+		//			BedId:        bedID,
+		//			ScheduleType: schedual_type,
+		//			UpdatedTime:  time.Now().Unix(),
+		//		}
+		//		err := service.UpdateScheduleOne(daySchedule.ID, xtSchedule)
+		//		if err != nil {
+		//			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//			return
+		//		}
+		//	}
+		//}
+		//}
+
 	} else if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
@@ -7525,3 +7524,138 @@ func (this *DialysisAPIController) GetCheckMobileAdvice() {
 	}
 
 }
+
+func (this *DialysisAPIController) CheckSchedule() {
+
+	patientID, _ := this.GetInt64("patient_id")
+	recordDateStr := this.GetString("record_date")
+	nurseID, _ := this.GetInt64("nurse")
+	schedual_type, _ := this.GetInt64("schedual_type")
+
+	bedID, _ := this.GetInt64("bed")
+	start_time := this.GetString("start_time")
+
+	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	startDate, parseStartDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", start_time)
+	if parseStartDateErr != nil {
+		this.ErrorLog("时间解析失败:%v", parseStartDateErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	recordDate, parseErr := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+	if parseErr != nil {
+		this.ErrorLog("时间解析失败:%v", parseErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	patient, getPatientErr := service.MobileGetPatientById(adminUserInfo.Org.Id, patientID)
+	if getPatientErr != nil {
+		this.ErrorLog("获取患者信息失败：%v", getPatientErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	} else if patient == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+		return
+	}
+
+	nurse, getNurseErr := service.GetAdminUserByUserID(nurseID)
+	if getNurseErr != nil {
+		this.ErrorLog("获取护士失败:%v", getNurseErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	} else if nurse == nil {
+		this.ErrorLog("护士不存在")
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	deviceNumber, getDeviceNumberErr := service.GetDeviceNumberByID(adminUserInfo.Org.Id, bedID)
+	if getDeviceNumberErr != nil {
+		this.ErrorLog("获取床位号失败:%v", getDeviceNumberErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	} else if deviceNumber == nil {
+		this.ErrorLog("床位号不存在")
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	dialysisRecord, getRecordErr := service.MobileGetDialysisRecord(adminUserInfo.Org.Id, patientID, recordDate.Unix())
+	if getRecordErr != nil {
+		this.ErrorLog("获取透析记录失败:%v", getRecordErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	} else if dialysisRecord != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatStart)
+		return
+	}
+
+	scheduleDateStart := startDate.Format("2006-01-02") + " 00:00:00"
+	scheduleDateEnd := startDate.Format("2006-01-02") + " 23:59:59"
+	timeLayout := "2006-01-02 15:04:05"
+	loc, _ := time.LoadLocation("Local")
+	theStartTime, _ := time.ParseInLocation(timeLayout, scheduleDateStart, loc)
+	theEndTime, _ := time.ParseInLocation(timeLayout, scheduleDateEnd, loc)
+	schedulestartTime := theStartTime.Unix()
+	scheduleendTime := theEndTime.Unix()
+
+	//查询更改的机号，是否有人用了,如果只是排班了，但是没上机，直接替换，如果排班且上机了，就提示他无法上机
+	//sch, _ := service.GetSourceSch(adminUserInfo.Org.Id, patientID, scheduleendTime)
+
+	schedule, err := service.GetDayScheduleByBedid(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
+
+	//查询该床位是否有人用了
+	order, _ := service.GetDialysisOrderByBedIdTwo(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
+
+	if err == nil {
+		if schedule.ID == 0 {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"status": 0,
+			})
+
+		} else {
+
+			if schedule.ID > 0 && schedule.DialysisOrder.ID == 0 { //有排班没上机记录
+				if order.ID > 0 { //该机位被其他人占用了
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
+					return
+				} else { //2022-11-04 更变需求，如果改床位有排班，但是没上机，则进行互换床位操作,如果改床位是本人的话，不做处理
+					daySchedule, _ := service.GetDaySchedule(adminUserInfo.Org.Id, schedulestartTime, scheduleendTime, patientID)
+					if daySchedule.ID > 0 && schedule.PatientId != daySchedule.PatientId {
+
+						this.ServeSuccessJSON(map[string]interface{}{
+							"status": 1,
+							"msg":    "该机位已有排班，继续操作将会与原来的排班信息进行互调，请问是否继续?",
+						})
+						return
+					} else {
+						this.ServeSuccessJSON(map[string]interface{}{
+							"status": 0,
+						})
+					}
+				}
+			} else if schedule.ID > 0 && schedule.DialysisOrder.ID > 0 {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"status": 2,
+					"msg":    "当前机位已有患者在使用，请重新选择！",
+				})
+
+			}
+
+		}
+
+	} else {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"status": 0,
+		})
+
+	}
+
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -174,6 +174,11 @@ func MobileAPIControllersRegisterRouters() {
 
 	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")
+
 	beego.Router("/m/api/getscheduletypebyidlist", &DialysisAPIController{}, "Get:GetScheduleTypeByIdList")
 
 	beego.Router("/m/api/savepatientpicture", &DialysisAPIController{}, "Get:SavePatientPicture")

controllers/patient_api_controller.go

@@ -841,6 +841,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条
@@ -923,6 +942,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_template_api_controller.go

@@ -4,9 +4,9 @@ import (
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
-	"XT_New/utils"
 	"encoding/json"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/astaxie/beego"
@@ -17,6 +17,8 @@ func PatientScheduleTemplateAPIControllerRegistRouters() {
 	beego.Router("/api/schtemp/p/setmode", &PatientScheduleTemplateAPIController{}, "post:SetMode")
 	beego.Router("/api/schtemp/p/update_sch", &PatientScheduleTemplateAPIController{}, "post:UpdateSchedules")
 
+	beego.Router("/api/patients/list", &PatientScheduleTemplateAPIController{}, "get:GetPatientList")
+
 	// beego.Router("/api/test", &TestCtr{}, "get:Test")
 }
 
@@ -52,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)
@@ -76,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 {
@@ -92,18 +100,34 @@ func (this *PatientScheduleTemplateAPIController) InitData() {
 		return
 	}
 	if len(templates) == 0 {
-		firstTemp, secondTemp, createTempErr := service.CreateTwoPatientScheduleTemplates(adminUserInfo.CurrentOrgId)
+		firstTemp, secondTemp, thirdTemp, fourTemp, createTempErr := service.CreateTwoPatientScheduleTemplates(adminUserInfo.CurrentOrgId)
 		if createTempErr != nil {
-			this.ErrorLog("创建两个排班模板失败：%v", createTempErr)
+			this.ErrorLog("创建4个排班模板失败：%v", createTempErr)
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
-		templates = append(templates, firstTemp, secondTemp)
+		templates = append(templates, firstTemp, secondTemp, thirdTemp, fourTemp)
 
 	} else if len(templates) == 1 {
-		temp, createTempErr := service.CreatePatientScheduleTemplate(adminUserInfo.CurrentOrgId)
+		temp, thirdTemp, fourTemp, createTempErr := service.CreatePatientScheduleTemplate(adminUserInfo.CurrentOrgId)
+		if createTempErr != nil {
+			this.ErrorLog("创建3个排班模板失败：%v", createTempErr)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		templates = append(templates, temp, thirdTemp, fourTemp)
+	} else if len(templates) == 2 {
+		thirdTemp, fourTemp, createTempErr := service.CreatePatientScheduleTemplateTwo(adminUserInfo.CurrentOrgId)
+		if createTempErr != nil {
+			this.ErrorLog("创建2个排班模板失败：%v", createTempErr)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		templates = append(templates, thirdTemp, fourTemp)
+	} else if len(templates) == 3 {
+		temp, createTempErr := service.CreatePatientScheduleTemplateThree(adminUserInfo.CurrentOrgId)
 		if createTempErr != nil {
-			this.ErrorLog("创建两个排班模板失败：%v", createTempErr)
+			this.ErrorLog("创建1个排班模板失败：%v", createTempErr)
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
@@ -118,31 +142,39 @@ func (this *PatientScheduleTemplateAPIController) InitData() {
 	}
 
 	// 获取本周的排班
-	monday, sunday := utils.GetMondayAndSundayOfWeekDate(&now)
-	schedules, getScheduleErr := service.GetWeekSchedule(adminUserInfo.CurrentOrgId, monday.Unix(), sunday.Unix())
-	if getScheduleErr != nil {
-		this.ErrorLog("获取本周排班失败：%v", getScheduleErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
+	//monday, sunday := utils.GetMondayAndSundayOfWeekDate(&now)
+	//schedules, getScheduleErr := service.GetWeekSchedule(adminUserInfo.CurrentOrgId, monday.Unix(), sunday.Unix())
+	//if getScheduleErr != nil {
+	//	this.ErrorLog("获取本周排班失败：%v", getScheduleErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//}
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"template_mode":  mode,
 		"device_numbers": deviceNumbers,
 		"templates":      templates,
 		"patients":       patients,
-		"schedules":      schedules,
+		//"schedules":      schedules,
 	})
 }
 
 // /api/schtemp/p/setmode [post]
-// @param mode:int 0.不启用模板 1.单周模板 2.双周模板
+// @param mode:int 0.不启用模板 1.单周模板 2.双周模板 3.三周模版   4.四周模版
 func (this *PatientScheduleTemplateAPIController) SetMode() {
 	mode, _ := this.GetInt8("mode")
+	week_time, _ := this.GetInt8("week_time")
+
 	if mode != 1 && mode != 2 && mode != 0 && mode != 3 && mode != 4 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+	if mode > 0 {
+		if week_time == 0 {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+	}
 
 	adminUserInfo := this.GetAdminUserInfo()
 
@@ -156,9 +188,10 @@ func (this *PatientScheduleTemplateAPIController) SetMode() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
+	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()
@@ -184,14 +217,36 @@ 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)
 				return
 			}
 
-		} else if templateMode.Mode == 2 && mode == 1 { // 2 -> 1 清除第二周模板item，清除第二周排班，将第一周的排班重复到第二周
+		} else if templateMode.Mode == 1 && mode == 3 {
+			templateMode.Mode = mode
+			templateMode.ExecuteTimes = 0
+			templateMode.ModifyTime = time.Now().Unix()
+			updateErr := service.SaveTemplateMode(templateMode)
+			if updateErr != nil {
+				this.ErrorLog("更新排班模板启用方式（1 -> 3）时失败：%v", updateErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+		} else if templateMode.Mode == 1 && mode == 4 {
+			templateMode.Mode = mode
+			templateMode.ExecuteTimes = 0
+			templateMode.ModifyTime = time.Now().Unix()
+			updateErr := service.SaveTemplateMode(templateMode)
+			if updateErr != nil {
+				this.ErrorLog("更新排班模板启用方式（1 -> 4）时失败：%v", updateErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+		} else if templateMode.Mode == 2 && mode == 1 { // 2 -> 1 清除第二周模板item，清除第二周排班
 			templateIDs, getTemplateIDsErr := service.GetOrgPatientScheduleTemplateIDs(adminUserInfo.CurrentOrgId)
 			if getTemplateIDsErr != nil {
 				this.ErrorLog("获取排班模板失败：%v", getTemplateIDsErr)
@@ -215,8 +270,160 @@ func (this *PatientScheduleTemplateAPIController) SetMode() {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
+		} else if templateMode.Mode == 2 && mode == 3 { //
+			templateMode.Mode = mode
+			templateMode.ExecuteTimes = 0
+			templateMode.ModifyTime = time.Now().Unix()
+			updateErr := service.SaveTemplateMode(templateMode)
+			if updateErr != nil {
+				this.ErrorLog("更新排班模板启用方式（1 -> 4）时失败：%v", updateErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+		} else if templateMode.Mode == 2 && mode == 4 { //
+			templateMode.Mode = mode
+			templateMode.ExecuteTimes = 0
+			templateMode.ModifyTime = time.Now().Unix()
+			updateErr := service.SaveTemplateMode(templateMode)
+			if updateErr != nil {
+				this.ErrorLog("更新排班模板启用方式（1 -> 4）时失败：%v", updateErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+		} else if templateMode.Mode == 3 && mode == 1 { // 3 -> 1 清除第三，二周模板item，清除第三，二周排班
+			templateIDs, getTemplateIDsErr := service.GetOrgPatientScheduleTemplateIDs(adminUserInfo.CurrentOrgId)
+			if getTemplateIDsErr != nil {
+				this.ErrorLog("获取排班模板失败：%v", getTemplateIDsErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			templateMode.Mode = mode
+			templateMode.ExecuteTimes = 0
+			templateMode.ModifyTime = time.Now().Unix()
+			updateErr := service.SavePatientScheduleTemplateMode3To1(templateMode, templateIDs[1].ID, templateIDs[2].ID)
+			if updateErr != nil {
+				this.ErrorLog("更新排班模板启用方式（1 -> 3）时失败：%v", updateErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+		} else if templateMode.Mode == 3 && mode == 2 { // 3 -> 1 清除第三周模板item，清除第三周排班，将第一周的排班重复到第二周
+			templateIDs, getTemplateIDsErr := service.GetOrgPatientScheduleTemplateIDs(adminUserInfo.CurrentOrgId)
+			if getTemplateIDsErr != nil {
+				this.ErrorLog("获取排班模板失败：%v", getTemplateIDsErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			templateMode.Mode = mode
+			templateMode.ExecuteTimes = 0
+			templateMode.ModifyTime = time.Now().Unix()
+			updateErr := service.SavePatientScheduleTemplateMode3To2(templateMode, templateIDs[2].ID)
+			if updateErr != nil {
+				this.ErrorLog("更新排班模板启用方式（2 -> 3）时失败：%v", updateErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+		} else if templateMode.Mode == 3 && mode == 4 { // 2 -> 1 清除第二周模板item，清除第二周排班
+			templateMode.Mode = mode
+			templateMode.ExecuteTimes = 0
+			templateMode.ModifyTime = time.Now().Unix()
+			updateErr := service.SaveTemplateMode(templateMode)
+			if updateErr != nil {
+				this.ErrorLog("更新排班模板启用方式（1 -> 4）时失败：%v", updateErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+		} else if templateMode.Mode == 4 && mode == 1 { // 4 -> 1 清除第三周模板item，清除第三周排班，将第一周的排班重复到第二周
+			templateIDs, getTemplateIDsErr := service.GetOrgPatientScheduleTemplateIDs(adminUserInfo.CurrentOrgId)
+			if getTemplateIDsErr != nil {
+				this.ErrorLog("获取排班模板失败：%v", getTemplateIDsErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			templateMode.Mode = mode
+			templateMode.ExecuteTimes = 0
+			templateMode.ModifyTime = time.Now().Unix()
+			updateErr := service.SavePatientScheduleTemplateMode4To1(templateMode, templateIDs[1].ID, templateIDs[2].ID, templateIDs[3].ID)
+			if updateErr != nil {
+				this.ErrorLog("更新排班模板启用方式（1 -> 4）时失败：%v", updateErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+		} else if templateMode.Mode == 4 && mode == 2 { // 4 -> 2
+			templateIDs, getTemplateIDsErr := service.GetOrgPatientScheduleTemplateIDs(adminUserInfo.CurrentOrgId)
+			if getTemplateIDsErr != nil {
+				this.ErrorLog("获取排班模板失败：%v", getTemplateIDsErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			templateMode.Mode = mode
+			templateMode.ExecuteTimes = 0
+			templateMode.ModifyTime = time.Now().Unix()
+			updateErr := service.SavePatientScheduleTemplateMode4To2(templateMode, templateIDs[2].ID, templateIDs[3].ID)
+			if updateErr != nil {
+				this.ErrorLog("更新排班模板启用方式（2 -> 4）时失败：%v", updateErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+		} else if templateMode.Mode == 4 && mode == 3 { // 4 -> 3
+			templateIDs, getTemplateIDsErr := service.GetOrgPatientScheduleTemplateIDs(adminUserInfo.CurrentOrgId)
+			if getTemplateIDsErr != nil {
+				this.ErrorLog("获取排班模板失败：%v", getTemplateIDsErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			templateMode.Mode = mode
+			templateMode.ExecuteTimes = 0
+			templateMode.ModifyTime = time.Now().Unix()
+			updateErr := service.SavePatientScheduleTemplateMode4To3(templateMode, templateIDs[3].ID)
+			if updateErr != nil {
+				this.ErrorLog("更新排班模板启用方式（3 -> 4）时失败：%v", updateErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 		}
+		templates, _ := service.GetOrgPatientScheduleTemplateIDs(adminUserInfo.CurrentOrgId)
+		//处理第几周数问题
+		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)
+			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, week_time+3)
+		}
+
 	}
+
 	this.ServeSuccessJSON(nil)
 }
 
@@ -230,7 +437,7 @@ func (this *PatientScheduleTemplateAPIController) UpdateSchedules() {
 	addSchedulesJSON := this.GetString("add_schs")
 	delSchedulesJSON := this.GetString("del_schs")
 	changeSchedulesJSON := this.GetString("change_schs")
-	if templateID <= 0 || len(addSchedulesJSON) == 0 || len(delSchedulesJSON) == 0 || len(changeSchedulesJSON) == 0 {
+	if len(addSchedulesJSON) == 0 || len(delSchedulesJSON) == 0 || len(changeSchedulesJSON) == 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
@@ -329,59 +536,90 @@ func (this *PatientScheduleTemplateAPIController) UpdateSchedules() {
 		return
 	}
 
-	shouldUpdateNextWeekSchedules := false
-	shouldUpdateNextSecondWeekSchedules := false
+	//shouldUpdateNextWeekSchedules := false
+	//shouldUpdateNextSecondWeekSchedules := false
+	//shouldUpdateNextThirdWeekSchedules := false
+	//shouldUpdateNextFourWeekSchedules := false
+	//
 	if templateMode.Mode == 0 {
 		this.ErrorLog("当前未开启排班模板，所以更新模板的操作将被无视")
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	templateIDIndex := 1
-	for index, templateIDObject := range templateIDs {
-		if templateIDObject.ID == templateID {
-			templateIDIndex = index + 1
-		}
-	}
-	if templateMode.Mode == 1 {
-		if templateIDIndex == 1 {
-			shouldUpdateNextWeekSchedules = true
-			shouldUpdateNextSecondWeekSchedules = true
-		} else {
-			this.ErrorLog("当前开启的是单周模板，所以不会更新第二个模板")
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-			return
-		}
-
-	} else { // mode == 2 => 开启双周模板时，只需更新一周排班
-		if templateIDIndex == 1 {
-			if templateMode.ExecuteTimes%2 == 0 {
-				shouldUpdateNextWeekSchedules = true
-				shouldUpdateNextSecondWeekSchedules = false
-			} else {
-				shouldUpdateNextWeekSchedules = false
-				shouldUpdateNextSecondWeekSchedules = true
-			}
-
-		} else {
-			if templateMode.ExecuteTimes%2 == 0 {
-				shouldUpdateNextWeekSchedules = false
-				shouldUpdateNextSecondWeekSchedules = true
-			} else {
-				shouldUpdateNextWeekSchedules = true
-				shouldUpdateNextSecondWeekSchedules = false
-			}
-
-		}
-	}
-
-	updateErr := service.UpdateScheduleTemplate(adminUserInfo.CurrentOrgId, templateID, addTemplateItems, delTemplateItems, changeTemplateItems, shouldUpdateNextWeekSchedules, shouldUpdateNextSecondWeekSchedules)
+	//判断当前用的是模版几
+	//templateIDIndex := 1
+	//for index, templateIDObject := range templateIDs {
+	//	if templateIDObject.ID == templateID {
+	//		//templateIDIndex = index + 1
+	//	}
+	//}
+	//if templateMode.Mode == 1 {
+	//	if templateIDIndex == 1 {
+	//		shouldUpdateNextWeekSchedules = true
+	//		shouldUpdateNextSecondWeekSchedules = true
+	//	} else {
+	//		this.ErrorLog("当前开启的是单周模板，所以不会更新第二个模板")
+	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//		return
+	//	}
+	//
+	//} else if templateMode.Mode == 2 { // mode == 2 => 开启双周模板时，只需更新一周排班
+	//	if templateIDIndex == 1 {
+	//		if templateMode.ExecuteTimes%2 == 0 {
+	//			shouldUpdateNextWeekSchedules = true
+	//			shouldUpdateNextSecondWeekSchedules = false
+	//		} else {
+	//			shouldUpdateNextWeekSchedules = false
+	//			shouldUpdateNextSecondWeekSchedules = true
+	//		}
+	//
+	//	} else {
+	//		if templateMode.ExecuteTimes%2 == 0 {
+	//			shouldUpdateNextWeekSchedules = false
+	//			shouldUpdateNextSecondWeekSchedules = true
+	//		} else {
+	//			shouldUpdateNextWeekSchedules = true
+	//			shouldUpdateNextSecondWeekSchedules = false
+	//		}
+	//
+	//	}
+	//} else if templateMode.Mode == 3 { // mode == 2 => 开启双周模板时，只需更新一周排班
+	//	if templateIDIndex == 1 { //当前修改的是第一个模版
+	//		if templateMode.ExecuteTimes%3 == 0 {
+	//			shouldUpdateNextWeekSchedules = true
+	//			shouldUpdateNextSecondWeekSchedules = false
+	//			shouldUpdateNextThirdWeekSchedules = false
+	//		} else if templateMode.ExecuteTimes%3 == 1 {
+	//			shouldUpdateNextWeekSchedules = false
+	//			shouldUpdateNextSecondWeekSchedules = true
+	//			shouldUpdateNextThirdWeekSchedules = false
+	//		} else {
+	//			shouldUpdateNextWeekSchedules = false
+	//			shouldUpdateNextSecondWeekSchedules = false
+	//			shouldUpdateNextThirdWeekSchedules = true
+	//		}
+	//	} else if templateIDIndex == 2 {
+	//		if templateMode.ExecuteTimes%2 == 0 {
+	//			shouldUpdateNextWeekSchedules = false
+	//			shouldUpdateNextSecondWeekSchedules = true
+	//		} else {
+	//			shouldUpdateNextWeekSchedules = true
+	//			shouldUpdateNextSecondWeekSchedules = false
+	//		}
+	//
+	//	} else {
+	//
+	//	}
+	//}
+
+	updateErr := service.UpdateScheduleTemplate(adminUserInfo.CurrentOrgId, templateID, addTemplateItems, delTemplateItems, changeTemplateItems, false, false)
 	if updateErr != nil {
 		this.ErrorLog("更新排班模板排班失败：%v", updateErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
 		return
 	}
 
-	newItems, getTemplateItemsErr := service.GetOrgPatientScheduleTemplateItemsByTemplateID(adminUserInfo.CurrentOrgId, templateID)
+	newItems, getTemplateItemsErr := service.GetOrgPatientScheduleTemplateItemsByTemplateID(adminUserInfo.CurrentOrgId)
 	if getTemplateItemsErr != nil {
 		this.ErrorLog("获取排班模板排班失败：%v", getTemplateItemsErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -399,3 +637,14 @@ type ParamModelSchedule struct {
 	Weekday        int8  `json:"weekday"`
 	TimeType       int8  `json:"time_type"`
 }
+
+func (this *PatientScheduleTemplateAPIController) GetPatientList() {
+	patients, err := service.GetSchTemplatePatientList(this.GetAdminUserInfo().CurrentOrgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": patients,
+	})
+
+}

controllers/stock_in_api_controller.go

@@ -151,10 +151,10 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/stock/getwarehouseinfolist", &StockManagerApiController{}, "Get:GetInvetoryWarehouseInfoList")
 
 	//结算成功后调用操作库存相关接口
-	//beego.Router("/api/settle/stock", &StockManagerApiController{}, "Get:HandleSettleStock")
-	//beego.Router("/api/settle/cancelstock", &StockManagerApiController{}, "Get:HandleRefundStock")
-}
+	beego.Router("/api/settle/stock", &StockManagerApiController{}, "Get:HandleSettleStock")
+	beego.Router("/api/settle/cancelstock", &StockManagerApiController{}, "Get:HandleRefundStock")
 
+}
 func (c *StockManagerApiController) HandleRefundStock() {
 	order_id, _ := c.GetInt64("order_id", 0)
 	order, _ := service.GetHisOrderByIDThree(order_id)
@@ -202,14 +202,12 @@ func (c *StockManagerApiController) HandleRefundStock() {
 
 }
 func (c *StockManagerApiController) HandleSettleStock() {
-
 	order_id, _ := c.GetInt64("order_id", 0)
 	order, _ := service.GetHisOrderByID(order_id)
 	if order.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-
 	orders, _ := service.GetHisOrderDetailByNumberTwo(order.Number, order.UserOrgId)
 	houseConfig, _ := service.GetAllStoreHouseConfig(order.UserOrgId)
 	var goods []*models.DialysisBeforePrepareGoods
@@ -247,6 +245,7 @@ func (c *StockManagerApiController) HandleSettleStock() {
 		service.HisDrugsDelivery(item.UserOrgId, order.Creator, item)
 	}
 }
+
 func (c *StockManagerApiController) CreateWarehouse() {
 
 	warehousing_time := c.GetString("warehousing_time")

enums/error_code.go

@@ -263,7 +263,11 @@ const ( // ErrorCode
 
 	ErrorCodeHisPatientNoRegException = 4000000
 
+	ErrorCodeCantDeleteScheduleBeforeNow = 40000001
+
 	ErrorCodeSchedule = 50000000
+
+	ErrorCodeParamWrongForSchMode = 40000002
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -337,6 +341,7 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeCreateScheduleFail:             "添加排班失败",
 	ErrorCodeCantSetScheduleAgainOneDay:     "同一天不可有两次排班",
 	ErrorCodeCantSetScheduleBeforeNow:       "不能给今天之前的日期排班",
+	ErrorCodeCantDeleteScheduleBeforeNow:    "不能删除今天之前的日期排班",
 	ErrorCodeScheduleNotExist:               "排班不存在",
 	ErrorCodePointScheduleExist:             "所先位置排班已经存在",
 	ErrorCodeDeleteScheduleFail:             "取消排班失败",
@@ -514,7 +519,8 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeDeletePChargeWrongTwo: "该医嘱所属处方已经收费或已经上传的处方,无法删除",
 
 	ErrorCodeHisPatientNoRegException: "该患者尚未挂号，请先挂号",
-	ErrorCodeSchedule:                 "被调用床位已有患者上机",
+	ErrorCodeSchedule:                 "该班次该床位已有患者",
+	ErrorCodeParamWrongForSchMode:     "透析模式不能为空",
 }
 
 type SGJError struct {

models/device_models.go

@@ -495,20 +495,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

@@ -8,6 +8,7 @@ type PatientScheduleTemplateMode struct {
 	Status       int8  `gorm:"column:status" json:"-" form:"status"`
 	CreateTime   int64 `gorm:"column:ctime" json:"-" form:"ctime"`
 	ModifyTime   int64 `gorm:"column:mtime" json:"-" form:"mtime"`
+	Week         int64 `gorm:"column:week" json:"-" form:"week"`
 }
 
 func (PatientScheduleTemplateMode) TableName() string {
@@ -15,11 +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"`
+	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/schedule_models.go

@@ -44,13 +44,15 @@ type Schedule struct {
 	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	IsExport     int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
 
-	Patient                   string               `gorm:"-" json:"patient" form:"patient"`
-	DeviceZone                DeviceZone           `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
-	DeviceNumber              DeviceNumber         `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
+	Patient      string       `gorm:"-" json:"patient" form:"patient"`
+	DeviceZone   DeviceZone   `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
+	DeviceNumber DeviceNumber `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
+
 	TreatmentMode             TreatmentMode        `json:"mode" gorm:"foreignkey:ModeId"`
 	DialysisOrder             DialysisOrder        `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 	DialysisPrescription      DialysisPrescription `json:"dialysis_prescription" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:RecordDate,PatientId;"`
 	PatientInfectiousDiseases []InfectiousDiseases `json:"patient_contagions" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	DialysisMachineName       string               `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
 }
 
 func (Schedule) TableName() string {

models/smart_sch.go

@@ -0,0 +1,101 @@
+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"`
+	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+
+	SmartSchedule []*SmartSchedule `gorm:"-" json:"sch"`
+}
+
+func (SmartSchPatient) TableName() string {
+	return "xt_patients"
+}
+
+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"`
+	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+
+	XtPatientScheduleTemplateId []*XtPatientScheduleTemplateId
+}
+
+func (SmartSchTemplatePatient) TableName() string {
+	return "xt_patients"
+}
+
+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;"`
+}
+
+func (SmartSchedule) TableName() string {
+	return "xt_schedule"
+}
+
+type XtPatientScheduleTemplateId struct {
+	ID                            int64                            `gorm:"column:id" json:"id" form:"id"`
+	OrgId                         int64                            `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Status                        int64                            `gorm:"column:status" json:"status" form:"status"`
+	Ctime                         int64                            `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                         int64                            `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Week                          int64                            `gorm:"column:week" json:"week" form:"week"`
+	XtPatientScheduleTemplateItem []*XtPatientScheduleTemplateItem `gorm:"foreignkey:TemplateId;AssociationForeignKey:ID;" json:"template" form:"template"`
+}
+
+func (XtPatientScheduleTemplateId) TableName() string {
+	return "xt_patient_schedule_template_id"
+}
+
+type XtPatientScheduleTemplateItem struct {
+	ID             int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgId          int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	TemplateId     int64 `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	DeviceNumberId int64 `gorm:"column:device_number_id" json:"device_number_id" form:"device_number_id"`
+	PatientId      int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	TreatMode      int64 `gorm:"column:treat_mode" json:"treat_mode" form:"treat_mode"`
+	Weekday        int64 `gorm:"column:weekday" json:"weekday" form:"weekday"`
+	TimeType       int64 `gorm:"column:time_type" json:"time_type" form:"time_type"`
+	Status         int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime          int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime          int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	IsExport       int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
+	ZoneId         int64 `gorm:"-" json:"zone_id" form:"zone_id"`
+}
+
+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"
+}

models/vm_models.go

@@ -230,6 +230,7 @@ type VMPatientScheduleTemplateMode struct {
 	Status       int64 `gorm:"column:status" json:"status" form:"status"`
 	Ctime        int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime        int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Week         int64 `gorm:"column:week" json:"-" form:"week"`
 }
 
 func (VMPatientScheduleTemplateMode) TableName() string {

routers/router.go

@@ -14,7 +14,7 @@ func init() {
 		AllowOrigins: []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://localhost:9529", "http://localhost:9531", "http://xt.test.shengws.com", "http://new_mobile.test.sgjyun.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://mobile.sgjyun.com", "http://mobile.kuyicloud.com"},
 		//AllowOrigins:     []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://xt.test.shengws.com","https://xt.test.shengws.com", "http://xt.test.sgjyun.com","https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com","https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com","http://mobile.sgjyun.com","http://mobile.kuyicloud.com"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
-		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type", "X-XSRF-TOKEN", "Permission"},
+		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type", "X-XSRF-TOKEN", "Permission", "KyToken"},
 		ExposeHeaders:    []string{"Content-Length", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
 		AllowCredentials: true,
 	}))

service/auto_create_week_schedules_service.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	"fmt"
-	"strings"
 	"time"
 
 	"XT_New/models"
@@ -21,7 +20,8 @@ func init() {
 	spec := "0 0 0 ? * MON" // 每周一凌晨0点生成排班
 	//spec := "0 */1 * * * ?"
 	createWeekSchedulesCronJob.AddFunc(spec, func() {
-		AutoCreateWeekSchedules()
+		//AutoCreateWeekSchedules()
+		NewAutoCreateWeekSchedules()
 	})
 }
 
@@ -29,6 +29,669 @@ func BeginAutoCreateWeekSchedulesJob() {
 	createWeekSchedulesCronJob.Start()
 }
 
+func NewAutoCreateWeekSchedules() {
+	utils.TraceLog("自动排班任务开始执行")
+	var modes []*models.PatientScheduleTemplateMode
+	getModesErr := readDb.Model(&models.PatientScheduleTemplateMode{}).Where("mode <> 0 AND status = 1 ").Find(&modes).Error
+	if getModesErr != nil {
+		utils.ErrorLog("自动排班-获取启用模板模式列表失败:%v", getModesErr)
+		CreateDBErrorRecord(0, "自动排班-获取启用模板模式列表失败:%v", getModesErr)
+		return
+	}
+
+	for _, mode := range modes {
+		templates, getTemplatesErr := GetOrgPatientScheduleTemplateIDs(mode.OrgID)
+		if getTemplatesErr != nil {
+			utils.ErrorLog("自动排班-org_id: %v ：获取模板 ID 失败：%v", mode.OrgID, getTemplatesErr)
+			CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取模板 ID 失败：%v", mode.OrgID, getTemplatesErr)
+			continue
+		} else if len(templates) == 0 {
+			utils.WarningLog("自动排班-org_id: %v ：没有模板", mode.OrgID)
+			continue
+		}
+
+		now := time.Now()
+		nextSecWeek := now.AddDate(0, 0, 14)
+		//nextThridWeek := now.AddDate(0, 0, 21)
+		//nextFourWeek := now.AddDate(0, 0, 28)
+		curWeek := now.AddDate(0, 0, 0)
+		nextWeek := now.AddDate(0, 0, 7)
+
+		tx := writeDb.Begin()
+		thisTime := time.Now()
+		_, theWeek := thisTime.ISOWeek()
+		fmt.Println(theWeek)
+
+		//mode.Week == 0 为了兼容开发新功能前的老数据
+		//新功能加了，预约排班生成的，int64(theWeek) >= mode.Week 当判断当前周数是否小大于或者等于模版预约第几周生成的周数
+		if mode.Week == 0 || int64(theWeek) >= mode.Week {
+			if mode.Week > 0 { //新机构或者重新设置模版的机构需要帮他们根据选择的模版模式，来生成本周，下周，下下周数据
+				if mode.Mode == 1 {
+					items, getItemsErr := GetOrgPatientScheduleTemplateItemsWithoutPatientByTemplateID(mode.OrgID, templates[0].ID)
+					if getItemsErr != nil {
+						utils.ErrorLog("自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+						continue
+
+					}
+					insertErr, count := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, curWeek, items, nil)
+					if insertErr != "" {
+						utils.ErrorLog("自动排班-org_id: %v ：使用第一周模板插入本周排班失败：%v", mode.OrgID, insertErr)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第一周模板插入本周排班失败：%v", mode.OrgID, insertErr)
+						tx.Rollback()
+						continue
+
+					} else {
+						//更新周次
+						templates[0].Week = count
+						UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
+
+					}
+
+					items2, getItemsErr2 := GetOrgPatientScheduleTemplateItemsWithoutPatientByTemplateID(mode.OrgID, templates[0].ID)
+					if getItemsErr2 != nil {
+						utils.ErrorLog("自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr2)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr2)
+						continue
+
+					}
+					insertErr2, count2 := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextWeek, items2, nil)
+					if insertErr2 != "" {
+						utils.ErrorLog("自动排班-org_id: %v ：使用第一周模板插入本周排班失败：%v", mode.OrgID, insertErr2)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第一周模板插入本周排班失败：%v", mode.OrgID, insertErr2)
+						tx.Rollback()
+						continue
+
+					} else {
+						//更新周次
+						templates[0].Week = count2
+						UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
+
+					}
+
+					items3, getItemsErr3 := GetOrgPatientScheduleTemplateItemsWithoutPatientByTemplateID(mode.OrgID, templates[0].ID)
+					if getItemsErr3 != nil {
+						utils.ErrorLog("自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr3)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr3)
+						continue
+
+					}
+					insertErr3, count3 := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextSecWeek, items3, nil)
+					if insertErr != "" {
+						utils.ErrorLog("自动排班-org_id: %v ：使用第一周模板插入本周排班失败：%v", mode.OrgID, insertErr3)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第一周模板插入本周排班失败：%v", mode.OrgID, insertErr3)
+						tx.Rollback()
+						continue
+
+					} else {
+						//更新周次
+						templates[0].Week = count3
+						UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
+
+					}
+
+					mode.Week = 0
+					mode.ExecuteTimes += 3
+					mode.ModifyTime = now.Unix()
+					updateModeErr := tx.Save(mode).Error
+					if updateModeErr != nil {
+						utils.ErrorLog("自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+						tx.Rollback()
+						continue
+
+					}
+					tx.Commit()
+					utils.SuccessLog("自动排班-插入排班成功：org_id: %v", mode.OrgID)
+					time.Sleep(time.Second * 30)
+
+				} else if mode.Mode == 2 {
+
+					items, getItemsErr := GetOrgPatientScheduleTemplateItemsWithoutPatientByTemplateID(mode.OrgID, templates[0].ID)
+					if getItemsErr != nil {
+						utils.ErrorLog("自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+						continue
+
+					}
+					insertErr, count := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, curWeek, items, nil)
+					if insertErr != "" {
+						utils.ErrorLog("自动排班-org_id: %v ：使用第一周模板插入本周排班失败：%v", mode.OrgID, insertErr)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第一周模板插入本周排班失败：%v", mode.OrgID, insertErr)
+						tx.Rollback()
+						continue
+
+					} else {
+						//更新周次
+						templates[0].Week = count
+						UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
+					}
+
+					items2, getItemsErr2 := GetOrgPatientScheduleTemplateItemsWithoutPatientByTemplateID(mode.OrgID, templates[1].ID)
+					if getItemsErr2 != nil {
+						utils.ErrorLog("自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr2)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr2)
+						continue
+
+					}
+					insertErr2, count2 := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextWeek, items2, nil)
+					if insertErr2 != "" {
+						utils.ErrorLog("自动排班-org_id: %v ：使用第一周模板插入本周排班失败：%v", mode.OrgID, insertErr2)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第一周模板插入本周排班失败：%v", mode.OrgID, insertErr2)
+						tx.Rollback()
+						continue
+
+					} else {
+						//更新周次
+						templates[1].Week = count2
+						UpdateTemplateItemWeek(templates[1].OrgID, templates[1].ID, int8(templates[1].Week))
+
+					}
+
+					items3, getItemsErr3 := GetOrgPatientScheduleTemplateItemsWithoutPatientByTemplateID(mode.OrgID, templates[0].ID)
+					if getItemsErr3 != nil {
+						utils.ErrorLog("自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr3)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr3)
+						continue
+
+					}
+					insertErr3, count3 := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextSecWeek, items3, nil)
+					if insertErr != "" {
+						utils.ErrorLog("自动排班-org_id: %v ：使用第一周模板插入本周排班失败：%v", mode.OrgID, insertErr3)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第一周模板插入本周排班失败：%v", mode.OrgID, insertErr3)
+						tx.Rollback()
+						continue
+
+					} else {
+						//更新周次
+						templates[0].Week = count3
+						UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
+
+					}
+
+					mode.Week = 0
+					mode.ExecuteTimes += 3
+					mode.ModifyTime = now.Unix()
+					updateModeErr := tx.Save(mode).Error
+					if updateModeErr != nil {
+						utils.ErrorLog("自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+						tx.Rollback()
+						continue
+
+					}
+					tx.Commit()
+					utils.SuccessLog("自动排班-插入排班成功：org_id: %v", mode.OrgID)
+					time.Sleep(time.Second * 30)
+
+				} else if mode.Mode == 3 || mode.Mode == 4 {
+					fmt.Println("---------")
+					items, getItemsErr := GetOrgPatientScheduleTemplateItemsWithoutPatientByTemplateID(mode.OrgID, templates[0].ID)
+					if getItemsErr != nil {
+						utils.ErrorLog("自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+						continue
+
+					}
+					insertErr, count := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, curWeek, items, nil)
+					if insertErr != "" {
+						utils.ErrorLog("自动排班-org_id: %v ：使用第一周模板插入本周排班失败：%v", mode.OrgID, insertErr)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第一周模板插入本周排班失败：%v", mode.OrgID, insertErr)
+						tx.Rollback()
+						continue
+
+					} else {
+						//更新周次
+						templates[0].Week = count
+						UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
+
+					}
+
+					items12, getItemsErr12 := GetOrgPatientScheduleTemplateItemsWithoutPatientByTemplateID(mode.OrgID, templates[1].ID)
+					fmt.Println("------22222")
+					if getItemsErr12 != nil {
+						utils.ErrorLog("自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr12)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr12)
+						continue
+
+					}
+					insertErr12, count12 := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextWeek, items12, nil)
+					if insertErr12 != "" {
+						utils.ErrorLog("自动排班-org_id: %v ：使用第一周模板插入本周排班失败：%v", mode.OrgID, insertErr12)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第一周模板插入本周排班失败：%v", mode.OrgID, insertErr12)
+						tx.Rollback()
+						continue
+
+					} else {
+						//更新周次
+						templates[1].Week = count12
+						UpdateTemplateItemWeek(templates[1].OrgID, templates[1].ID, int8(templates[1].Week))
+
+					}
+
+					items3, getItemsErr3 := GetOrgPatientScheduleTemplateItemsWithoutPatientByTemplateID(mode.OrgID, templates[2].ID)
+					if getItemsErr3 != nil {
+						utils.ErrorLog("自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr3)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr3)
+						continue
+
+					}
+					insertErr3, count3 := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextSecWeek, items3, nil)
+					if insertErr != "" {
+						utils.ErrorLog("自动排班-org_id: %v ：使用第一周模板插入本周排班失败：%v", mode.OrgID, insertErr3)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第一周模板插入本周排班失败：%v", mode.OrgID, insertErr3)
+						tx.Rollback()
+						continue
+
+					} else {
+						//更新周次
+						templates[2].Week = count3
+						UpdateTemplateItemWeek(templates[2].OrgID, templates[2].ID, int8(templates[2].Week))
+
+					}
+
+					mode.Week = 0
+					mode.ExecuteTimes += 3
+					mode.ModifyTime = now.Unix()
+					updateModeErr := tx.Save(mode).Error
+					if updateModeErr != nil {
+						utils.ErrorLog("自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+						tx.Rollback()
+						continue
+
+					}
+					tx.Commit()
+					utils.SuccessLog("自动排班-插入排班成功：org_id: %v", mode.OrgID)
+					time.Sleep(time.Second * 30)
+				}
+			} else {
+				if mode.Mode == 1 { // 用第一周模板生成下第二周的排班
+					items, getItemsErr := GetOrgPatientScheduleTemplateItemsWithoutPatientByTemplateID(mode.OrgID, templates[0].ID)
+					if getItemsErr != nil {
+						utils.ErrorLog("自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+						continue
+					}
+					insertErr, _ := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextSecWeek, items, nil)
+					if insertErr != "" {
+						utils.ErrorLog("自动排班-org_id: %v ：使用第一周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第一周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
+						tx.Rollback()
+						continue
+					} else {
+						//thisTime := time.Now()
+						//_, theWeek := thisTime.ISOWeek()
+
+						//更新周次
+						templates[0].Week = GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
+						UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
+					}
+
+					mode.Week = 0
+					mode.ExecuteTimes += 1
+					mode.ModifyTime = now.Unix()
+					updateModeErr := tx.Save(mode).Error
+					if updateModeErr != nil {
+						utils.ErrorLog("自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+						CreateDBErrorRecord(mode.OrgID, "自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+						tx.Rollback()
+						continue
+					}
+					tx.Commit()
+					utils.SuccessLog("自动排班-插入排班成功：org_id: %v", mode.OrgID)
+					time.Sleep(time.Second * 30)
+
+				} else if mode.Mode == 2 { // mode.ExecuteTimes % 2 的结果，如果为0，用第一周模板生成下第二周的排班，否则用第二周的模板生成排班
+					if mode.ExecuteTimes%2 == 0 {
+						items, getItemsErr := GetOrgPatientScheduleTemplateItemsWithoutPatientByTemplateID(mode.OrgID, templates[0].ID)
+						if getItemsErr != nil {
+							utils.ErrorLog("自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+							continue
+						}
+
+						insertErr, _ := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextSecWeek, items, nil)
+						if insertErr != "" {
+							utils.ErrorLog("自动排班-org_id: %v ：使用第一周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第一周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
+							tx.Rollback()
+							continue
+						} else {
+
+							templates[0].Week = GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
+
+							UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
+
+						}
+
+						mode.Week = 0
+						mode.ExecuteTimes += 1
+						mode.ModifyTime = now.Unix()
+						updateModeErr := tx.Save(mode).Error
+						if updateModeErr != nil {
+							utils.ErrorLog("自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+							tx.Rollback()
+							continue
+						}
+						tx.Commit()
+						utils.SuccessLog("自动排班-插入排班成功：org_id: %v", mode.OrgID)
+						time.Sleep(time.Second * 30)
+
+					} else {
+						if len(templates) < 2 {
+							utils.WarningLog("自动排班-org_id: %v ：没有第二周的模板")
+							continue
+						}
+						items, getItemsErr := GetOrgPatientScheduleTemplateItemsWithoutPatientByTemplateID(mode.OrgID, templates[1].ID)
+						if getItemsErr != nil {
+							utils.ErrorLog("自动排班-org_id: %v ：获取第二周模板Item失败：%v", mode.OrgID, getItemsErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第二周模板Item失败：%v", mode.OrgID, getItemsErr)
+							continue
+						}
+
+						insertErr, _ := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextSecWeek, items, nil)
+						if insertErr != "" {
+							utils.ErrorLog("自动排班-org_id: %v ：使用第二周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第二周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
+							tx.Rollback()
+							continue
+						} else {
+
+							//thisTime := time.Now()
+							//_, week := thisTime.ISOWeek()
+
+							//更新周次
+							templates[1].Week = GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
+
+							//templates[1].Week = week + 2
+							UpdateTemplateItemWeek(templates[1].OrgID, templates[1].ID, int8(templates[1].Week))
+
+						}
+
+						mode.Week = 0
+						mode.ExecuteTimes += 1
+						mode.ModifyTime = now.Unix()
+						updateModeErr := tx.Save(mode).Error
+						if updateModeErr != nil {
+							utils.ErrorLog("自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+							tx.Rollback()
+							continue
+						}
+						tx.Commit()
+						utils.SuccessLog("自动排班-插入排班成功：org_id: %v", mode.OrgID)
+						time.Sleep(time.Second * 30)
+
+					}
+				} else if mode.Mode == 3 { // mode.ExecuteTimes % 2 的结果，如果为0，用第一周模板生成下第二周的排班，否则用第二周的模板生成排班
+					if mode.ExecuteTimes%3 == 0 {
+						items, getItemsErr := GetOrgPatientScheduleTemplateItemsWithoutPatientByTemplateID(mode.OrgID, templates[0].ID)
+						if getItemsErr != nil {
+							utils.ErrorLog("自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+							continue
+						}
+
+						insertErr, _ := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextSecWeek, items, nil)
+						if insertErr != "" {
+							utils.ErrorLog("自动排班-org_id: %v ：使用第一周模板插入下第三周排班失败：%v", mode.OrgID, insertErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第一周模板插入下第三周排班失败：%v", mode.OrgID, insertErr)
+							tx.Rollback()
+							continue
+						} else {
+							templates[0].Week = GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
+
+							UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
+						}
+						mode.Week = 0
+						mode.ExecuteTimes += 1
+						mode.ModifyTime = now.Unix()
+						updateModeErr := tx.Save(mode).Error
+						if updateModeErr != nil {
+							utils.ErrorLog("自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+							tx.Rollback()
+							continue
+						}
+						tx.Commit()
+						utils.SuccessLog("自动排班-插入排班成功：org_id: %v", mode.OrgID)
+						time.Sleep(time.Second * 30)
+
+					} else if mode.ExecuteTimes%3 == 1 {
+						if len(templates) < 2 {
+							utils.WarningLog("自动排班-org_id: %v ：没有第二周的模板")
+							continue
+						}
+						items, getItemsErr := GetOrgPatientScheduleTemplateItemsWithoutPatientByTemplateID(mode.OrgID, templates[1].ID)
+						if getItemsErr != nil {
+							utils.ErrorLog("自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+							continue
+						}
+
+						insertErr, _ := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextSecWeek, items, nil)
+						if insertErr != "" {
+							utils.ErrorLog("自动排班-org_id: %v ：使用第一周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第一周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
+							tx.Rollback()
+							continue
+						} else {
+							templates[1].Week = GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
+
+							UpdateTemplateItemWeek(templates[1].OrgID, templates[1].ID, int8(templates[1].Week))
+
+						}
+						mode.Week = 0
+						mode.ExecuteTimes += 1
+						mode.ModifyTime = now.Unix()
+						updateModeErr := tx.Save(mode).Error
+						if updateModeErr != nil {
+							utils.ErrorLog("自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+							tx.Rollback()
+							continue
+						}
+						tx.Commit()
+						utils.SuccessLog("自动排班-插入排班成功：org_id: %v", mode.OrgID)
+						time.Sleep(time.Second * 30)
+
+					} else {
+						if len(templates) < 3 {
+							utils.WarningLog("自动排班-org_id: %v ：没有第三周的模板")
+							continue
+						}
+						items, getItemsErr := GetOrgPatientScheduleTemplateItemsWithoutPatientByTemplateID(mode.OrgID, templates[2].ID)
+						if getItemsErr != nil {
+							utils.ErrorLog("自动排班-org_id: %v ：获取第三周模板Item失败：%v", mode.OrgID, getItemsErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第三周模板Item失败：%v", mode.OrgID, getItemsErr)
+							continue
+						}
+
+						insertErr, _ := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextSecWeek, items, nil)
+						if insertErr != "" {
+							utils.ErrorLog("自动排班-org_id: %v ：使用第三周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第三周模板插入下第三周排班失败：%v", mode.OrgID, insertErr)
+							tx.Rollback()
+							continue
+						} else {
+							templates[2].Week = GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
+
+							UpdateTemplateItemWeek(templates[2].OrgID, templates[2].ID, int8(templates[2].Week))
+
+						}
+						mode.Week = 0
+						mode.ExecuteTimes += 1
+						mode.ModifyTime = now.Unix()
+						updateModeErr := tx.Save(mode).Error
+						if updateModeErr != nil {
+							utils.ErrorLog("自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+							tx.Rollback()
+							continue
+						}
+						tx.Commit()
+						utils.SuccessLog("自动排班-插入排班成功：org_id: %v", mode.OrgID)
+						time.Sleep(time.Second * 30)
+
+					}
+				} else if mode.Mode == 4 { // mode.ExecuteTimes % 2 的结果，如果为0，用第一周模板生成下第二周的排班，否则用第二周的模板生成排班
+					if mode.ExecuteTimes%4 == 0 {
+						items, getItemsErr := GetOrgPatientScheduleTemplateItemsWithoutPatientByTemplateID(mode.OrgID, templates[0].ID)
+						if getItemsErr != nil {
+							utils.ErrorLog("自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+							continue
+						}
+
+						insertErr, _ := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextSecWeek, items, nil)
+						if insertErr != "" {
+							utils.ErrorLog("自动排班-org_id: %v ：使用第一周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第一周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
+							tx.Rollback()
+							continue
+						} else {
+							templates[0].Week = GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
+
+							UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
+
+						}
+						mode.Week = 0
+						mode.ExecuteTimes += 1
+						mode.ModifyTime = now.Unix()
+						updateModeErr := tx.Save(mode).Error
+						if updateModeErr != nil {
+							utils.ErrorLog("自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+							tx.Rollback()
+							continue
+						}
+						tx.Commit()
+						utils.SuccessLog("自动排班-插入排班成功：org_id: %v", mode.OrgID)
+						time.Sleep(time.Second * 30)
+
+					} else if mode.ExecuteTimes%4 == 1 {
+						items, getItemsErr := GetOrgPatientScheduleTemplateItemsWithoutPatientByTemplateID(mode.OrgID, templates[1].ID)
+						if getItemsErr != nil {
+							utils.ErrorLog("自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+							continue
+						}
+
+						insertErr, _ := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextSecWeek, items, nil)
+						if insertErr != "" {
+							utils.ErrorLog("自动排班-org_id: %v ：使用第一周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第一周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
+							tx.Rollback()
+							continue
+						} else {
+							templates[1].Week = GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
+
+							UpdateTemplateItemWeek(templates[1].OrgID, templates[1].ID, int8(templates[1].Week))
+
+						}
+						mode.Week = 0
+						mode.ExecuteTimes += 1
+						mode.ModifyTime = now.Unix()
+						updateModeErr := tx.Save(mode).Error
+						if updateModeErr != nil {
+							utils.ErrorLog("自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+							tx.Rollback()
+							continue
+						}
+						tx.Commit()
+						utils.SuccessLog("自动排班-插入排班成功：org_id: %v", mode.OrgID)
+						time.Sleep(time.Second * 30)
+
+					} else if mode.ExecuteTimes%4 == 2 {
+						if len(templates) < 2 {
+							utils.WarningLog("自动排班-org_id: %v ：没有第二周的模板")
+							continue
+						}
+						items, getItemsErr := GetOrgPatientScheduleTemplateItemsWithoutPatientByTemplateID(mode.OrgID, templates[2].ID)
+						if getItemsErr != nil {
+							utils.ErrorLog("自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
+							continue
+						}
+
+						insertErr, _ := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextSecWeek, items, nil)
+						if insertErr != "" {
+							utils.ErrorLog("自动排班-org_id: %v ：使用第一周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第一周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
+							tx.Rollback()
+							continue
+						} else {
+							templates[2].Week = GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
+
+							UpdateTemplateItemWeek(templates[2].OrgID, templates[2].ID, int8(templates[2].Week))
+
+						}
+						mode.Week = 0
+						mode.ExecuteTimes += 1
+						mode.ModifyTime = now.Unix()
+						updateModeErr := tx.Save(mode).Error
+						if updateModeErr != nil {
+							utils.ErrorLog("自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+							tx.Rollback()
+							continue
+						}
+						tx.Commit()
+						utils.SuccessLog("自动排班-插入排班成功：org_id: %v", mode.OrgID)
+						time.Sleep(time.Second * 30)
+
+					} else if mode.ExecuteTimes%4 == 3 {
+						if len(templates) < 3 {
+							utils.WarningLog("自动排班-org_id: %v ：没有第三周的模板")
+							continue
+						}
+						items, getItemsErr := GetOrgPatientScheduleTemplateItemsWithoutPatientByTemplateID(mode.OrgID, templates[3].ID)
+						if getItemsErr != nil {
+							utils.ErrorLog("自动排班-org_id: %v ：获取第三周模板Item失败：%v", mode.OrgID, getItemsErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第三周模板Item失败：%v", mode.OrgID, getItemsErr)
+							continue
+						}
+
+						insertErr, _ := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextSecWeek, items, nil)
+						if insertErr != "" {
+							utils.ErrorLog("自动排班-org_id: %v ：使用第一周模板插入下第四周排班失败：%v", mode.OrgID, insertErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第一周模板插入下第三周排班失败：%v", mode.OrgID, insertErr)
+							tx.Rollback()
+							continue
+						} else {
+							templates[3].Week = GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
+
+							UpdateTemplateItemWeek(templates[3].OrgID, templates[3].ID, int8(templates[3].Week))
+
+						}
+
+						mode.Week = 0
+						mode.ExecuteTimes += 1
+						mode.ModifyTime = now.Unix()
+						updateModeErr := tx.Save(mode).Error
+						if updateModeErr != nil {
+							utils.ErrorLog("自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+							CreateDBErrorRecord(mode.OrgID, "自动排班-org_id：%v ：更新启用模板模式的执行次数失败：%v", mode.OrgID, updateModeErr)
+							tx.Rollback()
+							continue
+						}
+						tx.Commit()
+						utils.SuccessLog("自动排班-插入排班成功：org_id: %v", mode.OrgID)
+						time.Sleep(time.Second * 30)
+
+					}
+				}
+
+			}
+			utils.SuccessLog("自动排班任务完成")
+		}
+	}
+
+}
+
 func AutoCreateWeekSchedules() {
 	utils.TraceLog("自动排班任务开始执行")
 	var modes []*models.PatientScheduleTemplateMode
@@ -61,8 +724,8 @@ func AutoCreateWeekSchedules() {
 				CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：获取第一周模板Item失败：%v", mode.OrgID, getItemsErr)
 				continue
 			}
-			insertErr := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextSecWeek, items, nil)
-			if insertErr != nil {
+			insertErr, _ := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextSecWeek, items, nil)
+			if insertErr != "" {
 				utils.ErrorLog("自动排班-org_id: %v ：使用第一周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
 				CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第一周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
 				tx.Rollback()
@@ -78,8 +741,8 @@ func AutoCreateWeekSchedules() {
 					continue
 				}
 
-				insertErr := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextSecWeek, items, nil)
-				if insertErr != nil {
+				insertErr, _ := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextSecWeek, items, nil)
+				if insertErr != "" {
 					utils.ErrorLog("自动排班-org_id: %v ：使用第一周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
 					CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第一周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
 					tx.Rollback()
@@ -98,16 +761,17 @@ func AutoCreateWeekSchedules() {
 					continue
 				}
 
-				insertErr := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextSecWeek, items, nil)
-				if insertErr != nil {
+				insertErr, _ := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, nextSecWeek, items, nil)
+				if insertErr != "" {
 					utils.ErrorLog("自动排班-org_id: %v ：使用第二周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
 					CreateDBErrorRecord(mode.OrgID, "自动排班-org_id: %v ：使用第二周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
 					tx.Rollback()
 					continue
+				} else {
+
 				}
 			}
 		}
-
 		mode.ExecuteTimes += 1
 		mode.ModifyTime = now.Unix()
 		updateModeErr := tx.Save(mode).Error
@@ -117,22 +781,20 @@ func AutoCreateWeekSchedules() {
 			tx.Rollback()
 			continue
 		}
-
 		tx.Commit()
 		utils.SuccessLog("自动排班-插入排班成功：org_id: %v", mode.OrgID)
-
 		time.Sleep(time.Second * 30)
 	}
 
 	utils.SuccessLog("自动排班任务完成")
 }
 
-func _refreshWeekSchedulesWithTemplateItems(tx *gorm.DB, orgID int64, week time.Time, templateItems []*models.PatientScheduleTemplateItem, deviceNumberMap map[int64]*DeviceNumberViewModel) error {
+func _refreshWeekSchedulesWithTemplateItems(tx *gorm.DB, orgID int64, week time.Time, templateItems []*models.PatientScheduleTemplateItem, deviceNumberMap map[int64]*DeviceNumberViewModel) (string, int) {
 	if deviceNumberMap == nil {
 		deviceNumbers, getDeviceNumbersErr := GetAllValidDeviceNumbers(orgID)
 		//fmt.Println("getDeviceNumbersErr3232322332323232323323223232323",getDeviceNumbersErr)
 		if getDeviceNumbersErr != nil {
-			return getDeviceNumbersErr
+			return getDeviceNumbersErr.Error(), 0
 		}
 		deviceNumberMap = make(map[int64]*DeviceNumberViewModel, 0)
 		for _, deviceNumber := range deviceNumbers {
@@ -145,42 +807,107 @@ func _refreshWeekSchedulesWithTemplateItems(tx *gorm.DB, orgID int64, week time.
 	disableErr := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", orgID, monday.Unix(), sunday.Unix()).Updates(map[string]interface{}{"status": 0, "updated_time": now.Unix()}).Error
 	//fmt.Println("disableErr323232332323232233222332232332",disableErr)
 	if disableErr != nil {
-		return disableErr
+		return disableErr.Error(), 0
 	}
 
+	var week_count int
 	// 批量插入排班
 	if len(templateItems) > 0 {
 
-		valueStrs := make([]string, 0, len(templateItems))
-		values := make([]interface{}, 0, len(templateItems)*11)
+		timeLayout := "2006-01-02"
+		loc, _ := time.LoadLocation("Local")
+		tmp, _ := time.ParseInLocation(timeLayout, time.Unix(monday.Unix(), 0).Format("2006-01-02"), loc)
+		_, weeks := tmp.ISOWeek()
+		week_count = weeks
 
+		//valueStrs := make([]string, 0, len(templateItems))
+		//values := make([]interface{}, 0, len(templateItems)*11)
+		var errs string
 		for _, item := range templateItems {
 			deviceNumber := deviceNumberMap[item.DeviceNumberID]
 			if deviceNumber == nil {
 				continue
 			}
 
-			valueStrs = append(valueStrs, "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
-			values = append(values, orgID)
-			values = append(values, deviceNumber.ZoneID)
-			values = append(values, item.DeviceNumberID)
-			values = append(values, item.PatientID)
-			values = append(values, monday.AddDate(0, 0, int(item.Weekday-1)).Unix())
-			values = append(values, item.Weekday)
-			values = append(values, item.TimeType)
-			values = append(values, item.TreatMode)
-			values = append(values, 1)
-			values = append(values, now.Unix())
-			values = append(values, now.Unix())
-		}
+			so, _ := GetDialysisSolutionTwo(item.OrgID, item.PatientID, item.TreatMode)
+			filedRecordOne, _ := FindFiledBy(item.OrgID, "透析器")
+			filedRecordTwo, _ := FindFiledBy(item.OrgID, "灌流器")
+			filedRecordThree, _ := FindFiledBy(item.OrgID, "透析器/灌流器")
+			var DialysisMachineName string
+			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
 
-		sql := fmt.Sprintf("INSERT INTO xt_schedule (user_org_id, partition_id, bed_id, patient_id, schedule_date, schedule_week, schedule_type, mode_id, status, created_time, updated_time) VALUES %v;", strings.Join(valueStrs, ", "))
-		if insertErr := tx.Exec(sql, values...).Error; insertErr != nil {
-			//fmt.Println("insertErr232332233223332232323222222www",insertErr)
-			return insertErr
+				} else {
+					DialysisMachineName = so.DialysisIrrigation
+
+				}
+			}
+
+			var sch models.Schedule
+			sch.UserOrgId = orgID
+			sch.PartitionId = deviceNumber.ZoneID
+			sch.BedId = item.DeviceNumberID
+			sch.PatientId = item.PatientID
+			sch.ScheduleDate = monday.AddDate(0, 0, int(item.Weekday-1)).Unix()
+			sch.ScheduleWeek = int64(item.Weekday)
+			sch.ScheduleType = int64(item.TimeType)
+			sch.ModeId = int64(item.TreatMode)
+			sch.Status = 1
+			sch.CreatedTime = now.Unix()
+			sch.UpdatedTime = now.Unix()
+			sch.IsExport = 0
+			sch.DialysisMachineName = DialysisMachineName
+
+			//为了防止数据重复，先查询有无记录
+			//var othSch []*models.Schedule
+			//readDb.Model(&models.Schedule{}).Where("status = 1 AND schedule_date = ? AND user_org_id = ? AND patient_id = ?", sch.ScheduleDate, sch.UserOrgId, sch.PatientId).Find(&othSch)
+			//for _, items := range othSch {
+			//	items.Status = 0
+			//	writeDb.Save(&items)
+			//}
+			err := writeDb.Create(&sch).Error
+			if err != nil {
+				errs = errs + err.Error()
+			}
+
+			//valueStrs = append(valueStrs, "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
+			//values = append(values, orgID)
+			//values = append(values, deviceNumber.ZoneID)
+			//values = append(values, item.DeviceNumberID)
+			//values = append(values, item.PatientID)
+			//values = append(values, monday.AddDate(0, 0, int(item.Weekday-1)).Unix())
+			//values = append(values, item.Weekday)
+			//values = append(values, item.TimeType)
+			//values = append(values, item.TreatMode)
+			//values = append(values, 1)
+			//values = append(values, now.Unix())
+			//values = append(values, now.Unix())
+			//values = append(values, 0)
+			//values = append(values, DialysisMachineName)
+		}
+		//sql := fmt.Sprintf("INSERT INTO xt_schedule (user_org_id, partition_id, bed_id, patient_id, schedule_date, schedule_week, schedule_type, mode_id, status, created_time, updated_time,is_export,dialysis_machine_name) VALUES %v;", strings.Join(valueStrs, ", "))
+		//if insertErr := tx.Exec(sql, values...).Error; insertErr != nil {
+		//	fmt.Println("insertErr232332233223332232323222222www", insertErr)
+		//}
+		if len(errs) != 0 {
+			return errs, 0
 		}
 	}
-	return nil
+
+	return "", week_count
 }
 
 func FakeAutoCreateNextTwoWeekSchedules(orgID int64) {
@@ -218,14 +945,14 @@ func FakeAutoCreateNextTwoWeekSchedules(orgID int64) {
 			utils.ErrorLog("获取第一周模板Item失败：%v", getItemsErr)
 			return
 		}
-		insertErr := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, now.AddDate(0, 0, 7), items, deviceNumberMap)
-		if insertErr != nil {
+		insertErr, _ := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, now.AddDate(0, 0, 7), items, deviceNumberMap)
+		if insertErr != "" {
 			utils.ErrorLog("使用第一周模板插入下第一周排班失败：%v", insertErr)
 			tx.Rollback()
 			return
 		}
-		insertErr = _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, now.AddDate(0, 0, 14), items, deviceNumberMap)
-		if insertErr != nil {
+		insertErr, _ = _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, now.AddDate(0, 0, 14), items, deviceNumberMap)
+		if insertErr != "" {
 			utils.ErrorLog("使用第一周模板插入下第二周排班失败：%v", insertErr)
 			tx.Rollback()
 			return
@@ -244,28 +971,28 @@ func FakeAutoCreateNextTwoWeekSchedules(orgID int64) {
 		}
 
 		if mode.ExecuteTimes%2 == 0 {
-			insertErr := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, now.AddDate(0, 0, 7), firstItems, deviceNumberMap)
-			if insertErr != nil {
+			insertErr, _ := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, now.AddDate(0, 0, 7), firstItems, deviceNumberMap)
+			if insertErr != "" {
 				utils.ErrorLog("使用第一周模板插入下第一周排班失败：%v", insertErr)
 				tx.Rollback()
 				return
 			}
-			insertErr = _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, now.AddDate(0, 0, 14), secItems, deviceNumberMap)
-			if insertErr != nil {
+			insertErr, _ = _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, now.AddDate(0, 0, 14), secItems, deviceNumberMap)
+			if insertErr != "" {
 				utils.ErrorLog("使用第二周模板插入下第二周排班失败：%v", insertErr)
 				tx.Rollback()
 				return
 			}
 
 		} else { // mode.ExecuteTimes%2 == 1
-			insertErr := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, now.AddDate(0, 0, 7), secItems, deviceNumberMap)
-			if insertErr != nil {
+			insertErr, _ := _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, now.AddDate(0, 0, 7), secItems, deviceNumberMap)
+			if insertErr != "" {
 				utils.ErrorLog("使用第二周模板插入下第一周排班失败：%v", mode.OrgID, insertErr)
 				tx.Rollback()
 				return
 			}
-			insertErr = _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, now.AddDate(0, 0, 14), firstItems, deviceNumberMap)
-			if insertErr != nil {
+			insertErr, _ = _refreshWeekSchedulesWithTemplateItems(tx, mode.OrgID, now.AddDate(0, 0, 14), firstItems, deviceNumberMap)
+			if insertErr != "" {
 				utils.ErrorLog("使用第一周模板插入下第二周排班失败：%v", mode.OrgID, insertErr)
 				tx.Rollback()
 				return
@@ -285,3 +1012,44 @@ func FakeAutoCreateNextTwoWeekSchedules(orgID int64) {
 	tx.Commit()
 	utils.SuccessLog("模拟自动更新下两周排班成功")
 }
+
+func GetWeeks(oneTimeStr string) int {
+	fmt.Println(oneTimeStr)
+
+	//某个时间
+	//oneTimeStr := "2018-01-08 00:00:00"
+	//oneTimeStr := "2021-04-05 00:00:00"
+	//时间转换成time.Time格式
+	t, err := time.ParseInLocation("2006-01-02 15:04:05", oneTimeStr, time.Local)
+	if err != nil {
+		fmt.Println(err)
+	}
+	//获取这个时间的基于这一年有多少天了
+	yearDay := t.YearDay()
+	//获取上一年的最后一天
+	yesterdayYearEndDay := t.AddDate(0, 0, -yearDay)
+	//获取上一年最后一天是星期几
+	dayInWeek := int(yesterdayYearEndDay.Weekday())
+	//第一周的总天数,默认是7天
+	firstWeekDays := 7
+	//如果上一年最后一天不是星期天，则第一周总天数是7-dayInWeek
+	if dayInWeek != 0 {
+		firstWeekDays = 7 - dayInWeek
+	}
+	week := 0
+	//如果这一年的总天数小于第一周总天数，则是第一周，否则按照这一年多少天减去第一周的天数除以7+1 但是要考虑这一天减去第一周天数除以7会取整型，
+	//所以需要处理两个数取余之后是否大于0，如果大于0 则多加一天，这样自然周就算出来了。
+	if yearDay <= firstWeekDays {
+		week = 1
+	} else {
+		plusDay := 0
+		if (yearDay-firstWeekDays)%7 > 0 {
+			plusDay = 1
+		}
+		week = (yearDay-firstWeekDays)/7 + 1 + plusDay
+	}
+	fmt.Println(week)
+
+	return week - 1
+
+}

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/his_config_service.go

@@ -864,7 +864,7 @@ func GetDataConfig(orgid int64) (dataconfig []*models.DictDataconfig, err error)
 //翻译项目中的组
 func TranslateZu(sc, orgid int64, types string) (s string, err error) {
 	var dataconfig []*models.DictDataconfig
-	tmp := "select * from xt_drug_data_config where parent_id in (select id from xt_drug_data_config where name = \"" + types + "\" and parent_id = 0) and value = " + config.ToString(sc) + " and status = 1 and (org_id = " + config.ToString(orgid) + " or org_id = 0)"
+	tmp := "select * from xt_drug_data_config where parent_id in (select id from xt_d·rug_data_config where name = \"" + types + "\" and parent_id = 0) and value = " + config.ToString(sc) + " and status = 1 and (org_id = " + config.ToString(orgid) + " or org_id = 0)"
 
 	err = XTReadDB().Raw(tmp).Scan(&dataconfig).Error
 	if err != nil {

service/his_service.go

@@ -44,11 +44,13 @@ func (HisPatient) TableName() string {
 }
 
 type Schedule 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"`
-	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Status       int64 `gorm:"column:status" json:"status" form:"status"`
-	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
+	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"`
+	Status              int64  `gorm:"column:status" json:"status" form:"status"`
+	ScheduleDate        int64  `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ModeId              int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	DialysisMachineName string `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
 }
 
 func (Schedule) TableName() string {
@@ -2584,6 +2586,54 @@ func UpDateOrderTwo(order *models.HisOrder) (err error) {
 	return
 }
 
+type HisOrderInfoTwo struct {
+	ID                     int64                      `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber            string                     `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	UploadDate             int64                      `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+	AdviceId               int64                      `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	DetItemFeeSumamt       float64                    `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt                    float64                    `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric                   float64                    `gorm:"column:pric" json:"pric" form:"pric"`
+	PatientId              int64                      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	MedChrgitmType         string                     `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	Status                 int64                      `gorm:"column:status" json:"status" form:"status"`
+	FeedetlSn              string                     `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	ChldMedcFlag           string                     `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	ChrgitmLv              string                     `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
+	UserOrgId              int64                      `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ProjectId              int64                      `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId                 int64                      `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	FulamtOwnpayAmt        float64                    `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	HisPrescriptionProject HisPrescriptionProject     `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
+	HisDoctorAdviceInfo    models.HisDoctorAdviceInfo `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"advice"`
+}
+
+func (HisOrderInfoTwo) TableName() string {
+	return "his_order_info"
+}
+func GetHisOrderDetailByNumberTwo(order_number string, org_id int64) (order []*HisOrderInfoTwo, err error) {
+	err = readDb.Model(&HisOrderInfoTwo{}).Where("order_number = ? AND status = 1", order_number).Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("VMHisProject", "status = 1 AND user_org_id = ?", org_id).Preload("VMGoodInfo", "status = 1 AND org_id = ?", org_id)
+	}).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status = 1 AND org_id = ?", org_id)
+	}).Find(&order).Error
+	return
+}
+
+func GetHisOrderDetailByNumberThree(order_number string, org_id int64) (order []*HisOrderInfoTwo, err error) {
+	err = readDb.Model(&HisOrderInfoTwo{}).Where("order_number = ?", order_number).Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("VMHisProject", "status = 1 AND user_org_id = ?", org_id).Preload("VMGoodInfo", "status = 1 AND org_id = ?", org_id)
+	}).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status = 1 AND org_id = ?", org_id)
+	}).Find(&order).Error
+	return
+}
+
+func GetHisOrderByIDThree(order_id int64) (order models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("id = ?", order_id).First(&order).Error
+	return
+}
+
 func GetHisPrescriptonProjectById(id int64) (models.HisPrescriptionProject, error) {
 
 	project := models.HisPrescriptionProject{}

service/mobile_dialysis_service.go

@@ -2809,14 +2809,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

@@ -27,7 +27,7 @@ func GetOrgPatientScheduleTemplateMode(orgID int64) (*models.PatientScheduleTemp
 // 获取至多两个模板ID
 func GetOrgPatientScheduleTemplateIDs(orgID int64) ([]*models.PatientScheduleTemplateId, error) {
 	var ids []*models.PatientScheduleTemplateId
-	err := readDb.Model(&models.PatientScheduleTemplateId{}).Where("org_id = ? AND status = 1", orgID).Limit(2).Find(&ids).Error
+	err := readDb.Model(&models.PatientScheduleTemplateId{}).Where("org_id = ? AND status = 1", orgID).Limit(4).Find(&ids).Error
 	if err != nil {
 		return nil, err
 	}
@@ -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,8 +84,9 @@ 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(2).
+		Limit(4).
 		Find(&vms).
 		Error
 	if err != nil {
@@ -83,12 +96,12 @@ func GetOrgPatientScheduleTemplateItems(orgID int64) ([]*PatientScheduleTemplate
 }
 
 // 获取指定模板ID的模板排班列表
-func GetOrgPatientScheduleTemplateItemsByTemplateID(orgID int64, templateID int64) ([]*PatientScheduleTemplateItemViewModel, error) {
+func GetOrgPatientScheduleTemplateItemsByTemplateID(orgID int64) ([]*PatientScheduleTemplateItemViewModel, error) {
 	var vms []*PatientScheduleTemplateItemViewModel
 	err := readDb.
 		Model(&PatientScheduleTemplateItemViewModel{}).
 		Preload("Patient", "user_org_id = ? AND status = 1", orgID).
-		Where("org_id = ? AND template_id = ? AND status = 1", orgID, templateID).
+		Where("org_id = ? AND template_id = ? AND status = 1", orgID, 0).
 		Find(&vms).
 		Error
 	if err != nil {
@@ -117,38 +130,63 @@ 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, error) {
-	now := time.Now().Unix()
+func CreateTwoPatientScheduleTemplates(orgID int64) (*PatientScheduleTemplateViewModel, *PatientScheduleTemplateViewModel, *PatientScheduleTemplateViewModel, *PatientScheduleTemplateViewModel, error) {
 	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
+
+	fourTemp := models.PatientScheduleTemplateId{}
+	fourTemp.OrgID = orgID
+	fourTemp.Status = 1
 
 	tx := writeDb.Begin()
 	if err := tx.Model(&models.PatientScheduleTemplateId{}).Create(&firstTemp).Error; err != nil {
 		tx.Rollback()
-		return nil, nil, err
+		return nil, nil, nil, nil, err
 	}
 	if err := tx.Model(&models.PatientScheduleTemplateId{}).Create(&secondTemp).Error; err != nil {
 		tx.Rollback()
-		return nil, nil, err
+		return nil, nil, nil, nil, err
+	}
+
+	if err := tx.Model(&models.PatientScheduleTemplateId{}).Create(&thirdTemp).Error; err != nil {
+		tx.Rollback()
+		return nil, nil, nil, nil, err
+	}
+
+	if err := tx.Model(&models.PatientScheduleTemplateId{}).Create(&fourTemp).Error; err != nil {
+		tx.Rollback()
+		return nil, nil, nil, nil, err
 	}
 
 	vm1 := PatientScheduleTemplateViewModel{}
@@ -158,32 +196,116 @@ func CreateTwoPatientScheduleTemplates(orgID int64) (*PatientScheduleTemplateVie
 	vm2 := PatientScheduleTemplateViewModel{}
 	vm2.ID = secondTemp.ID
 	vm2.Items = make([]*PatientScheduleTemplateItemViewModel, 0, 0)
+
+	vm3 := PatientScheduleTemplateViewModel{}
+	vm3.ID = thirdTemp.ID
+	vm3.Items = make([]*PatientScheduleTemplateItemViewModel, 0, 0)
+
+	vm4 := PatientScheduleTemplateViewModel{}
+	vm4.ID = fourTemp.ID
+	vm4.Items = make([]*PatientScheduleTemplateItemViewModel, 0, 0)
+
 	tx.Commit()
-	return &vm1, &vm2, nil
+	return &vm1, &vm2, &vm3, &vm4, nil
 }
 
-func CreatePatientScheduleTemplate(orgID int64) (*PatientScheduleTemplateViewModel, error) {
-	now := time.Now().Unix()
+func CreatePatientScheduleTemplate(orgID int64) (*PatientScheduleTemplateViewModel, *PatientScheduleTemplateViewModel, *PatientScheduleTemplateViewModel, error) {
 	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()
-		return nil, err
+		return nil, nil, nil, err
 	}
+
+	thirdTemp := models.PatientScheduleTemplateId{}
+	thirdTemp.OrgID = orgID
+	thirdTemp.Status = 1
+
+	if err := tx.Model(&models.PatientScheduleTemplateId{}).Create(&thirdTemp).Error; err != nil {
+		tx.Rollback()
+		return nil, nil, nil, err
+	}
+
+	fourTemp := models.PatientScheduleTemplateId{}
+	fourTemp.OrgID = orgID
+	fourTemp.Status = 1
+
+	if err := tx.Model(&models.PatientScheduleTemplateId{}).Create(&fourTemp).Error; err != nil {
+		tx.Rollback()
+		return nil, nil, nil, err
+	}
+
 	vm := PatientScheduleTemplateViewModel{}
 	vm.ID = temp.ID
 	vm.Items = make([]*PatientScheduleTemplateItemViewModel, 0, 0)
+
+	vm3 := PatientScheduleTemplateViewModel{}
+	vm3.ID = thirdTemp.ID
+	vm3.Items = make([]*PatientScheduleTemplateItemViewModel, 0, 0)
+
+	vm4 := PatientScheduleTemplateViewModel{}
+	vm4.ID = fourTemp.ID
+	vm4.Items = make([]*PatientScheduleTemplateItemViewModel, 0, 0)
+
 	tx.Commit()
-	return &vm, nil
+	return &vm, &vm3, &vm4, nil
+}
+func CreatePatientScheduleTemplateTwo(orgID int64) (*PatientScheduleTemplateViewModel, *PatientScheduleTemplateViewModel, error) {
+
+	tx := writeDb.Begin()
+
+	thirdTemp := models.PatientScheduleTemplateId{}
+	thirdTemp.OrgID = orgID
+	thirdTemp.Status = 1
+
+	if err := tx.Model(&models.PatientScheduleTemplateId{}).Create(&thirdTemp).Error; err != nil {
+		tx.Rollback()
+		return nil, nil, err
+	}
+
+	fourTemp := models.PatientScheduleTemplateId{}
+	fourTemp.OrgID = orgID
+	fourTemp.Status = 1
+
+	if err := tx.Model(&models.PatientScheduleTemplateId{}).Create(&fourTemp).Error; err != nil {
+		tx.Rollback()
+		return nil, nil, err
+	}
+
+	vm3 := PatientScheduleTemplateViewModel{}
+	vm3.ID = thirdTemp.ID
+	vm3.Items = make([]*PatientScheduleTemplateItemViewModel, 0, 0)
+
+	vm4 := PatientScheduleTemplateViewModel{}
+	vm4.ID = fourTemp.ID
+	vm4.Items = make([]*PatientScheduleTemplateItemViewModel, 0, 0)
+
+	tx.Commit()
+	return &vm3, &vm4, nil
+}
+func CreatePatientScheduleTemplateThree(orgID int64) (*PatientScheduleTemplateViewModel, error) {
+	tx := writeDb.Begin()
+	fourTemp := models.PatientScheduleTemplateId{}
+	fourTemp.OrgID = orgID
+	fourTemp.Status = 1
+	if err := tx.Model(&models.PatientScheduleTemplateId{}).Create(&fourTemp).Error; err != nil {
+		tx.Rollback()
+		return nil, err
+	}
+	vm4 := PatientScheduleTemplateViewModel{}
+	vm4.ID = fourTemp.ID
+	vm4.Items = make([]*PatientScheduleTemplateItemViewModel, 0, 0)
+
+	tx.Commit()
+	return &vm4, nil
 }
 
 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"`
 }
@@ -193,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 {
@@ -216,7 +339,7 @@ func PatientScheduleTemplateGetAllValidPatient(orgID int64) ([]*PatientScheduleT
 	return vms, nil
 }
 
-func UpdateScheduleTemplate(orgID int64, templateID int64,
+func UpdateScheduleTemplate(orgID int64, template_id int64,
 	addTemplateItems []*models.PatientScheduleTemplateItem,
 	delTemplateItems []*models.PatientScheduleTemplateItem,
 	changeTemplateItems []*models.PatientScheduleTemplateItem,
@@ -226,15 +349,24 @@ func UpdateScheduleTemplate(orgID int64, templateID 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, templateID)
+			values = append(values, template_id)
 			values = append(values, item.DeviceNumberID)
 			values = append(values, item.PatientID)
 			values = append(values, item.TreatMode)
@@ -257,7 +389,7 @@ func UpdateScheduleTemplate(orgID int64, templateID int64,
 		// utils.TraceLog("delTemplateItems len: %v", len(delTemplateItems))
 		ins := make([]string, 0, len(delTemplateItems))
 		for _, item := range delTemplateItems {
-			ins = append(ins, fmt.Sprintf("(%v, %v, %v, %v, %v)", orgID, templateID, item.DeviceNumberID, item.Weekday, item.TimeType))
+			ins = append(ins, fmt.Sprintf("(%v, %v, %v, %v, %v)", orgID, template_id, item.DeviceNumberID, item.Weekday, item.TimeType))
 		}
 
 		sql := fmt.Sprintf("UPDATE xt_patient_schedule_template_item SET status = 0, mtime = %v WHERE status = 1 AND (org_id, template_id, device_number_id, weekday, time_type) IN (%v);", now.Unix(), strings.Join(ins, ","))
@@ -271,14 +403,14 @@ func UpdateScheduleTemplate(orgID int64, templateID int64,
 	if len(changeTemplateItems) > 0 {
 		// utils.TraceLog("changeTemplateItems len: %v", len(changeTemplateItems))
 		for _, item := range changeTemplateItems {
-			if updateErr := tx.Exec("UPDATE xt_patient_schedule_template_item SET patient_id = ?, treat_mode = ?, mtime = ? WHERE status = 1 AND org_id = ? AND template_id = ? AND device_number_id = ? AND weekday = ? AND time_type = ?;", item.PatientID, item.TreatMode, now.Unix(), orgID, templateID, item.DeviceNumberID, item.Weekday, item.TimeType).Error; updateErr != nil {
+			if updateErr := tx.Exec("UPDATE xt_patient_schedule_template_item SET patient_id = ?, treat_mode = ?, mtime = ? WHERE status = 1 AND org_id = ? AND template_id = ? AND device_number_id = ? AND weekday = ? AND time_type = ?;", item.PatientID, item.TreatMode, now.Unix(), orgID, template_id, item.DeviceNumberID, item.Weekday, item.TimeType).Error; updateErr != nil {
 				tx.Rollback()
 				return updateErr
 			}
 		}
 	}
 
-	// 更改下两周的排班
+	// 更改下四周的排班
 	deviceNumbers, getDeviceNumbersErr := GetAllValidDeviceNumbers(orgID)
 	if getDeviceNumbersErr != nil {
 		tx.Rollback()
@@ -288,6 +420,36 @@ func UpdateScheduleTemplate(orgID int64, templateID int64,
 	for _, deviceNumber := range deviceNumbers {
 		devicesMap[deviceNumber.ID] = deviceNumber
 	}
+	//if shouldUpdateNextWeekSchedules {
+	//	nextWeek := now.AddDate(0, 0, 7)
+	//	if updateErr := _updateWeekSchedules(tx, orgID, nextWeek, addTemplateItems, delTemplateItems, changeTemplateItems, devicesMap); updateErr != nil {
+	//		tx.Rollback()
+	//		return updateErr
+	//	}
+	//}
+	//if shouldUpdateNextSecondWeekSchedules {
+	//	nextWeek := now.AddDate(0, 0, 14)
+	//	if updateErr := _updateWeekSchedules(tx, orgID, nextWeek, addTemplateItems, delTemplateItems, changeTemplateItems, devicesMap); updateErr != nil {
+	//		tx.Rollback()
+	//		return updateErr
+	//	}
+	//}
+	//
+	//if shouldUpdateNextThirdWeekSchedules {
+	//	nextWeek := now.AddDate(0, 0, 21)
+	//	if updateErr := _updateWeekSchedules(tx, orgID, nextWeek, addTemplateItems, delTemplateItems, changeTemplateItems, devicesMap); updateErr != nil {
+	//		tx.Rollback()
+	//		return updateErr
+	//	}
+	//}
+	//
+	//if shouldUpdateNextFourWeekSchedules {
+	//	nextWeek := now.AddDate(0, 0, 28)
+	//	if updateErr := _updateWeekSchedules(tx, orgID, nextWeek, addTemplateItems, delTemplateItems, changeTemplateItems, devicesMap); updateErr != nil {
+	//		tx.Rollback()
+	//		return updateErr
+	//	}
+	//}
 
 	if orgID != 9671 && orgID != 10340 {
 		if shouldUpdateNextWeekSchedules {
@@ -423,7 +585,7 @@ func SavePatientScheduleTemplateModeAndClearNextTwoWeekSchedules(templateMode *m
 	now := time.Now()
 	nextWeek := now.AddDate(0, 0, 7)
 	nextMonday, _ := utils.GetMondayAndSundayOfWeekDate(&nextWeek)
-	nextSecWeek := now.AddDate(0, 0, 14)
+	nextSecWeek := now.AddDate(0, 0, 21)
 	_, nextSecSunday := utils.GetMondayAndSundayOfWeekDate(&nextSecWeek)
 	disableErr := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", templateMode.OrgID, nextMonday.Unix(), nextSecSunday.Unix()).Updates(map[string]interface{}{"status": 0, "updated_time": now.Unix()}).Error
 	if disableErr != nil {
@@ -435,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 {
@@ -447,7 +634,10 @@ func SavePatientScheduleTemplateModeAndClearNextSecondWeekSchedules(templateMode
 	now := time.Now()
 	nextSecWeek := now.AddDate(0, 0, 14)
 	nextSecMonday, nextSecSunday := utils.GetMondayAndSundayOfWeekDate(&nextSecWeek)
-	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, "mtime": now.Unix()}).Error
+
+	//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
@@ -457,6 +647,11 @@ func SavePatientScheduleTemplateModeAndClearNextSecondWeekSchedules(templateMode
 	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
+}
+
 // 2 -> 1 清除第二周模板item，清除第二周排班，将第一周的排班重复到第二周
 func SavePatientScheduleTemplateMode2To1(templateMode *models.PatientScheduleTemplateMode, secondWeekTemplateID int64, firstWeekTemplateItems []*models.PatientScheduleTemplateItem) error {
 	tx := writeDb.Begin()
@@ -476,7 +671,7 @@ func SavePatientScheduleTemplateMode2To1(templateMode *models.PatientScheduleTem
 
 	nextSecWeek := now.AddDate(0, 0, 14)
 	nextSecMonday, nextSecSunday := utils.GetMondayAndSundayOfWeekDate(&nextSecWeek)
-	disableSchsErr := 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, "mtime": now.Unix()}).Error
+	disableSchsErr := 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 disableSchsErr != nil {
 		tx.Rollback()
 		return disableSchsErr
@@ -524,3 +719,209 @@ func SavePatientScheduleTemplateMode2To1(templateMode *models.PatientScheduleTem
 	tx.Commit()
 	return nil
 }
+
+// 3 -> 1 清除第三，二周模板item，清除第三，二周排班
+func SavePatientScheduleTemplateMode3To1(templateMode *models.PatientScheduleTemplateMode, secondWeekTemplateID int64, thirdWeekTemplateID int64) error {
+	tx := writeDb.Begin()
+	saveErr := tx.Save(templateMode).Error
+	if saveErr != nil {
+		tx.Rollback()
+		return saveErr
+	}
+
+	now := time.Now()
+
+	disableItemsErr := tx.Model(&models.PatientScheduleTemplateItem{}).Where("(template_id = ? AND status = 1) OR (template_id = ? AND status = 1) ", secondWeekTemplateID, thirdWeekTemplateID).Updates(map[string]interface{}{"status": 0, "mtime": now.Unix()}).Error
+	if disableItemsErr != nil {
+		tx.Rollback()
+		return disableItemsErr
+	}
+
+	nextSecWeek := now.AddDate(0, 0, 14)
+	nextSecMonday, nextSecSunday := utils.GetMondayAndSundayOfWeekDate(&nextSecWeek)
+	disableSchsErr := 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 disableSchsErr != nil {
+		tx.Rollback()
+		return disableSchsErr
+	}
+
+	nextThirdWeek := now.AddDate(0, 0, 21)
+	nextThirdMonday, nextThirdSunday := utils.GetMondayAndSundayOfWeekDate(&nextThirdWeek)
+	disableSchsErr2 := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", templateMode.OrgID, nextThirdMonday.Unix(), nextThirdSunday.Unix()).Updates(map[string]interface{}{"status": 0, "updated_time": now.Unix()}).Error
+	if disableSchsErr2 != nil {
+		tx.Rollback()
+		return disableSchsErr2
+	}
+
+	tx.Commit()
+	return nil
+}
+
+// 3 -> 2 清除第三周模板item，清除第三周排班
+func SavePatientScheduleTemplateMode3To2(templateMode *models.PatientScheduleTemplateMode, thirdWeekTemplateID int64) error {
+	tx := writeDb.Begin()
+	saveErr := tx.Save(templateMode).Error
+	if saveErr != nil {
+		tx.Rollback()
+		return saveErr
+	}
+
+	now := time.Now()
+
+	disableItemsErr := tx.Model(&models.PatientScheduleTemplateItem{}).Where("template_id = ? AND status = 1", thirdWeekTemplateID).Updates(map[string]interface{}{"status": 0, "mtime": now.Unix()}).Error
+	if disableItemsErr != nil {
+		tx.Rollback()
+		return disableItemsErr
+	}
+	nextThirdWeek := now.AddDate(0, 0, 21)
+	nextThirdMonday, nextThirdSunday := utils.GetMondayAndSundayOfWeekDate(&nextThirdWeek)
+	disableSchsErr2 := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", templateMode.OrgID, nextThirdMonday.Unix(), nextThirdSunday.Unix()).Updates(map[string]interface{}{"status": 0, "updated_time": now.Unix()}).Error
+	if disableSchsErr2 != nil {
+		tx.Rollback()
+		return disableSchsErr2
+	}
+
+	tx.Commit()
+	return nil
+}
+
+// 4 -> 1 清除第四，三，二周模板item，清除第四，三，二周排班
+func SavePatientScheduleTemplateMode4To1(templateMode *models.PatientScheduleTemplateMode, secondWeekTemplateID int64, thirdWeekTemplateID int64, fourWeekTemplateID int64) error {
+	tx := writeDb.Begin()
+	saveErr := tx.Save(templateMode).Error
+	if saveErr != nil {
+		tx.Rollback()
+		return saveErr
+	}
+
+	now := time.Now()
+
+	disableItemsErr := tx.Model(&models.PatientScheduleTemplateItem{}).Where("(template_id = ? AND status = 1)OR(template_id = ? AND status = 1)OR(template_id = ? AND status = 1)", secondWeekTemplateID, thirdWeekTemplateID, fourWeekTemplateID).Updates(map[string]interface{}{"status": 0, "mtime": now.Unix()}).Error
+	if disableItemsErr != nil {
+		tx.Rollback()
+		return disableItemsErr
+	}
+
+	nextSecWeek := now.AddDate(0, 0, 14)
+	nextSecMonday, nextSecSunday := utils.GetMondayAndSundayOfWeekDate(&nextSecWeek)
+	disableSchsErr := 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 disableSchsErr != nil {
+		tx.Rollback()
+		return disableSchsErr
+	}
+
+	nextThirdWeek := now.AddDate(0, 0, 21)
+	nextThirdMonday, nextThirdSunday := utils.GetMondayAndSundayOfWeekDate(&nextThirdWeek)
+	disableSchsErr2 := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", templateMode.OrgID, nextThirdMonday.Unix(), nextThirdSunday.Unix()).Updates(map[string]interface{}{"status": 0, "updated_time": now.Unix()}).Error
+	if disableSchsErr2 != nil {
+		tx.Rollback()
+		return disableSchsErr2
+	}
+
+	nextFourWeek := now.AddDate(0, 0, 28)
+	nextFourMonday, nextFourSunday := utils.GetMondayAndSundayOfWeekDate(&nextFourWeek)
+	disableSchsErr3 := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", templateMode.OrgID, nextFourMonday.Unix(), nextFourSunday.Unix()).Updates(map[string]interface{}{"status": 0, "updated_time": now.Unix()}).Error
+	if disableSchsErr3 != nil {
+		tx.Rollback()
+		return disableSchsErr3
+	}
+
+	tx.Commit()
+	return nil
+}
+
+// 4 -> 2 清除第四，三模板item，清除第四，三排班
+func SavePatientScheduleTemplateMode4To2(templateMode *models.PatientScheduleTemplateMode, thirdWeekTemplateID int64, fourWeekTemplateID int64) error {
+	tx := writeDb.Begin()
+	saveErr := tx.Save(templateMode).Error
+	if saveErr != nil {
+		tx.Rollback()
+		return saveErr
+	}
+
+	now := time.Now()
+
+	disableItemsErr := tx.Model(&models.PatientScheduleTemplateItem{}).Where("(template_id = ? AND status = 1)OR(template_id = ? AND status = 1)", thirdWeekTemplateID, fourWeekTemplateID).Updates(map[string]interface{}{"status": 0, "mtime": now.Unix()}).Error
+	if disableItemsErr != nil {
+		tx.Rollback()
+		return disableItemsErr
+	}
+
+	nextThirdWeek := now.AddDate(0, 0, 21)
+	nextThirdMonday, nextThirdSunday := utils.GetMondayAndSundayOfWeekDate(&nextThirdWeek)
+	disableSchsErr2 := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", templateMode.OrgID, nextThirdMonday.Unix(), nextThirdSunday.Unix()).Updates(map[string]interface{}{"status": 0, "updated_time": now.Unix()}).Error
+	if disableSchsErr2 != nil {
+		tx.Rollback()
+		return disableSchsErr2
+	}
+
+	nextFourWeek := now.AddDate(0, 0, 28)
+	nextFourMonday, nextFourSunday := utils.GetMondayAndSundayOfWeekDate(&nextFourWeek)
+	disableSchsErr3 := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", templateMode.OrgID, nextFourMonday.Unix(), nextFourSunday.Unix()).Updates(map[string]interface{}{"status": 0, "updated_time": now.Unix()}).Error
+	if disableSchsErr3 != nil {
+		tx.Rollback()
+		return disableSchsErr3
+	}
+
+	tx.Commit()
+	return nil
+}
+
+// 4 -> 3 清除第四模板item，清除第四周排班
+func SavePatientScheduleTemplateMode4To3(templateMode *models.PatientScheduleTemplateMode, fourWeekTemplateID int64) error {
+	tx := writeDb.Begin()
+	saveErr := tx.Save(templateMode).Error
+	if saveErr != nil {
+		tx.Rollback()
+		return saveErr
+	}
+
+	now := time.Now()
+
+	disableItemsErr := tx.Model(&models.PatientScheduleTemplateItem{}).Where("(template_id = ? AND status = 1)", fourWeekTemplateID).Updates(map[string]interface{}{"status": 0, "mtime": now.Unix()}).Error
+	if disableItemsErr != nil {
+		tx.Rollback()
+		return disableItemsErr
+	}
+
+	nextFourWeek := now.AddDate(0, 0, 28)
+	nextFourMonday, nextFourSunday := utils.GetMondayAndSundayOfWeekDate(&nextFourWeek)
+	disableSchsErr3 := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", templateMode.OrgID, nextFourMonday.Unix(), nextFourSunday.Unix()).Updates(map[string]interface{}{"status": 0, "updated_time": now.Unix()}).Error
+	if disableSchsErr3 != nil {
+		tx.Rollback()
+		return disableSchsErr3
+	}
+
+	tx.Commit()
+	return nil
+}
+
+type SchTemplatePatient 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"`
+	Lapseto    int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	Status     int64  `gorm:"column:status" json:"status" form:"status"`
+	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+}
+
+func (SchTemplatePatient) TableName() string {
+	return "xt_patients"
+}
+
+func GetSchTemplatePatientList(orgID int64) ([]*SchTemplatePatient, error) {
+	var patients []*SchTemplatePatient
+	err := readDb.Model(&SchTemplatePatient{}).Where("user_org_id = ? AND status = 1 AND lapseto = 1", orgID).Find(&patients).Error
+	return patients, err
+}
+
+func UpdateTemplateItemWeek(orgID int64, id int64, week_time int8) {
+	readDb.Model(&models.PatientScheduleTemplateId{}).Where("org_id = ? AND status = 1 AND id = ? ", orgID, id).Updates(map[string]interface{}{"week": week_time})
+	return
+}
+
+func GetOrgPatientScheduleTemplateModeTwo(orgID int64) (models.PatientScheduleTemplateMode, error) {
+	var mode models.PatientScheduleTemplateMode
+	err := readDb.Model(&models.PatientScheduleTemplateMode{}).Where("org_id = ? AND status = 1", orgID).First(&mode).Error
+	return mode, err
+}

service/patient_service.go

@@ -1924,7 +1924,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
 }
 
@@ -2722,3 +2722,19 @@ func UpdateDialysisBefor(dislysis models.XtAssessmentBeforeDislysis, id int64) e
 	err := XTWriteDB().Model(&models.XtAssessmentBeforeDislysis{}).Where("id = ? and status= 1", id).Update(map[string]interface{}{"systolic_blood_pressure": dislysis.SystolicBloodPressure, "diastolic_blood_pressure": dislysis.DiastolicBloodPressure}).Error
 	return 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
 }
@@ -85,7 +85,7 @@ func GetWeekSchedule(orgID int64, start, end int64) (schedules []*models.Schedul
 	err = readDb.Table("xt_schedule as s").Preload("PatientInfectiousDiseases", "status = 1 ").
 		Joins("JOIN xt_patients as p ON p.id = s.patient_id").
 		Where("s.user_org_id=? and s.schedule_date>=? and s.schedule_date<=? and s.status=1", orgID, start, end).
-		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time, p.name as patient").
+		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time,s.dialysis_machine_name, p.name as patient").
 		Order("updated_time asc").
 		Find(&schedules).Error
 	return
@@ -103,7 +103,7 @@ func GetWeekScheduleOne(orgID int64, start, end int64, partionid int64, schedule
 	err = db.Preload("PatientInfectiousDiseases", "status = 1 ").
 		Joins("JOIN xt_patients as p ON p.id = s.patient_id").
 		Where("s.user_org_id=? and s.schedule_date>=? and s.schedule_date<=? and s.status=1", orgID, start, end).
-		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time, p.name as patient").
+		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time,s.dialysis_machine_name, s.updated_time, p.name as patient").
 		Order("updated_time asc").
 		Find(&schedules).Error
 	return
@@ -122,7 +122,7 @@ func GetWeekScheduleTwo(orgID int64, start, end int64, schIds []string, schedule
 	err = db.Preload("PatientInfectiousDiseases", "status = 1 ").
 		Joins("JOIN xt_patients as p ON p.id = s.patient_id").
 		Where("s.user_org_id=? and s.schedule_date>=? and s.schedule_date<=? and s.status=1", orgID, start, end).
-		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time, p.name as patient").
+		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time,s.dialysis_machine_name, p.name as patient").
 		Order("updated_time asc").
 		Find(&schedules).Error
 	return
@@ -142,7 +142,11 @@ func GetDayScheduleByBedid(orgID, start, bed_id int64, schedule_type int64) (sch
 	err = readDb.Model(&models.Schedule{}).Where("user_org_id=?  and schedule_date=? and bed_id=? and status=1 AND schedule_type = ?", orgID, start, bed_id, schedule_type).Preload("DialysisOrder", "status = 1").First(&schedule).Error
 	return
 }
+func GetSourceSch(orgId int64, patient_id int64, record_date int64) (schedule models.Schedule, err error) {
+	err = readDb.Model(&models.Schedule{}).Where("user_org_id=?  and schedule_date=? and patient_id =? and status=1", orgId, record_date, patient_id).First(&schedule).Error
+	return
 
+}
 func GetPatientScheduleFormDay(orgID, start, end, patientID int64) (schedules []*models.PatientSchedule, err error) {
 
 	err = readDb.Table("xt_schedule as s").
@@ -293,6 +297,20 @@ func UpdateScheduleOne(id int64, schedule models.Schedule) error {
 	return err
 }
 
+//参数一：当前操作的患者的排班     参数二被替换床位对应的排班
+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
+	utx.Save(&schone)
+	utx.Save(&schtwo)
+
+}
+
 func GetPatientScheduleFormToday(orgId, id, start int64) (schedules []*models.PatientSchedule, err error) {
 
 	err = readDb.Table("xt_schedule as s").
@@ -1200,6 +1218,25 @@ func GetLastWeightAfter(patient_id int64, scheduleDate int64, orgid int64) (mode
 	return dislysis, err
 }
 
+func GetScheduleTwo(orgID, id int64) (models.Schedule, error) {
+	var schedule models.Schedule
+	var err error
+	err = readDb.Model(&models.Schedule{}).Where("id = ? and user_org_id=? and status=1", id, orgID).First(&schedule).Error
+	return schedule, err
+}
+
+func UpdateSchDName(sch models.Schedule) (err error) {
+	err = writeDb.Model(&models.Schedule{}).Where("status=1 AND id = ?", sch.ID).Updates(map[string]interface{}{"dialysis_machine_name": sch.DialysisMachineName}).Error
+	return
+}
+
+func GetDialysisOrderByBedIdTwo(orgID, start, bed_id int64, schedule_type int64) (models.DialysisOrder, error) {
+	order := models.DialysisOrder{}
+	err = readDb.Model(&order).Where("user_org_id=?  and dialysis_date=? and bed_id=? and status=1 AND schedual_type = ?", orgID, start, bed_id, schedule_type).Find(&order).Error
+	return order, nil
+
+}
+
 func ChangeScheduleClass(schedule models.Schedule) error {
 
 	err := XTWriteDB().Model(&schedule).Where("patient_id = ? and schedule_date = ? and user_org_id = ? and status = 1", schedule.PatientId, schedule.ScheduleDate, schedule.UserOrgId).Update(map[string]interface{}{"schedule_type": schedule.ScheduleType}).Error

service/smart_sch.go

@@ -0,0 +1,120 @@
+package service
+
+import (
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
+	"time"
+)
+
+func GetSmartSchPatientByKeyWord(orgID int64, keywords string) (patient []*models.SmartSchPatient, err error) {
+	db := readDb.Model(&models.SmartSchPatient{}).Where("user_org_id=? and status=1", orgID)
+	if len(keywords) > 0 {
+		likekey := "%" + keywords + "%"
+		err = db.Where("name LIKE ? OR dialysis_no LIKE ? ", likekey, likekey).Find(&patient).Error
+	} else {
+		err = db.Find(&patient).Error
+	}
+
+	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
+	}
+
+	return
+}
+
+func GetSmartSchTemplatePatientByKeyWord(orgID int64, keywords string) (patient []*models.SmartSchTemplatePatient, err error) {
+	db := readDb.Model(&models.SmartSchTemplatePatient{}).Where("user_org_id=? and status=1", orgID)
+	if len(keywords) > 0 {
+		likekey := "%" + keywords + "%"
+		err = db.Where("name LIKE ? OR dialysis_no LIKE ? ", likekey, likekey).Find(&patient).Error
+	} else {
+		err = db.Find(&patient).Error
+	}
+
+	for _, item := range patient {
+		mode, _ := GetOrgPatientScheduleTemplateModeTwo(item.UserOrgId)
+		if mode.ID > 0 {
+			if mode.Mode == 1 {
+				schs, _ := GetSmartSchTemplatePatientByID(item.UserOrgId, item.ID, 1)
+				item.XtPatientScheduleTemplateId = schs
+
+			} else if mode.Mode == 2 {
+				schs, _ := GetSmartSchTemplatePatientByID(item.UserOrgId, item.ID, 2)
+
+				item.XtPatientScheduleTemplateId = schs
+
+			} else if mode.Mode == 3 {
+				schs, _ := GetSmartSchTemplatePatientByID(item.UserOrgId, item.ID, 3)
+				item.XtPatientScheduleTemplateId = schs
+
+			} else if mode.Mode == 4 {
+
+				schs, _ := GetSmartSchTemplatePatientByID(item.UserOrgId, item.ID, 4)
+				item.XtPatientScheduleTemplateId = schs
+
+			}
+		}
+
+	}
+	return
+}
+
+func GetSmartSchPatientByID(orgID int64, patient_id int64) (schs []*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)
+	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", 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)
+			subItems.ZoneId = number.ZoneID
+		}
+	}
+	return
+}
+
+func GetAllAvaildDeviceNumbersByZone(orgID int64, record_date int64, schedule_type int, zone_id int64, patient_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_schedule as s Where s.`schedule_date` = ? AND s.patient_id <> ?  AND  s.user_org_id = n.org_id AND s.`bed_id` = n.id  AND s.`schedule_type` = ? AND s.status = 1 )", zone_id, orgID, record_date, patient_id, schedule_type).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
+}
+
+func GetScheduleByZoneAndBed(org_id int64, partitionId int64, bed_id int64, schedule_date int64, sch_type int64) (sch models.SmartSchedule, err error) {
+	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
+}

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
 }