111

controllers/schedule_api_controller.go

@@ -36,9 +36,7 @@ func ScheduleApiRegistRouters() {
 	beego.Router("/api/schedule/week", &ScheduleApiController{}, "get:GetWeekDaySchedule")
 	beego.Router("/api/schedule/export", &ScheduleApiController{}, "post:ExportSchedule")
 	beego.Router("/api/schedule_template/export", &ScheduleApiController{}, "post:ExportScheduleTemplate")
-
 	beego.Router("/api/schedule_template/search", &ScheduleApiController{}, "get:SearchTemplateSchedulePatients")
-
 	beego.Router("/api/schedule_template/cancel", &ScheduleApiController{}, "post:CancelScheduleTemplate")
 	beego.Router("/api/schedule/getnextscheduleweekday", &ScheduleApiController{}, "Get:GetNextWeekDaySchedule")
 	beego.Router("/api/schedule/getnextscheduleweekdayone", &ScheduleApiController{}, "Get:GetNextWeekDayScheduleOne")
@@ -730,7 +728,7 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 						}
 					}
 					schedule.DialysisMachineName = DialysisMachineName
-
+					schedule.IsExport = 3000
 					service.SaveSch(schedule)
 				} else { //新的排班信息
 
@@ -865,6 +863,7 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 						existSchedule.PartitionId = schedule.PartitionId
 						existSchedule.ScheduleType = schedule.ScheduleType
 						existSchedule.DialysisMachineName = schedule.DialysisMachineName
+						existSchedule.IsExport = 3001
 						service.SaveSmartSch(existSchedule)
 
 					} else {
@@ -911,8 +910,11 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 							daySchedule.PartitionId = schedule.PartitionId
 							daySchedule.BedId = schedule.BedId
 							daySchedule.DialysisMachineName = schedule.DialysisMachineName
+							existSchedule.IsExport = 3002
+
 							service.SaveSch(daySchedule)
 						} else {
+							existSchedule.IsExport = 3003
 							service.CreateSchedule(&schedule)
 						}
 					}
@@ -1438,7 +1440,7 @@ func (c *ScheduleApiController) CreateSchedule() {
 	}
 
 	redis := service.RedisClient()
-
+	schedule.IsExport = 1000
 	err = service.CreateSchedule(&schedule)
 
 	key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
@@ -3050,7 +3052,11 @@ func (this *ScheduleApiController) ExportScheduleTemplate() {
 			err := service.UpdateScheduleTemplateStatus(this.GetAdminUserInfo().CurrentOrgId)
 			if err == nil {
 				for _, item := range schedules {
-					service.CreateScheduleTemplate(item)
+					//判斷某個模板下，當天是否有排版，沒有的話就新增
+					total := service.ExportScheduleTemplate(item)
+					if total == 0 {
+						service.CreateScheduleTemplate(item)
+					}
 				}
 				////查询已经转出或者死亡的患者
 				//patientList, _ := service.GetDeathPatient(this.GetAdminUserInfo().CurrentOrgId)
@@ -3481,7 +3487,7 @@ func (this *ScheduleApiController) GetCopyPatientSchedules() {
 			}
 		}
 		schedule.DialysisMachineName = DialysisMachineName
-
+		schedule.IsExport = 4000
 		err = service.AddPatientSchedule(&schedule)
 
 	}
@@ -4166,6 +4172,7 @@ func (c *ScheduleApiController) SynchroSchedule() {
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	//根据模板ID获取模板数据
 	list, _ := service.GetTemplateListByTemplateId(template_id, orgId)
+	fmt.Println(len(list))
 
 	//数据去重操作
 	list = RemoveRepeatedScheduleTemplate(list)
@@ -4180,7 +4187,7 @@ func (c *ScheduleApiController) SynchroSchedule() {
 	var thursday int64
 	var friday int64
 	var saturday int64
-
+	//
 	//如果选择的开始日期大于当前日期
 	if copy_startime > nowtime {
 		//清空该时间段的所有排班数据
@@ -4230,6 +4237,7 @@ func (c *ScheduleApiController) SynchroSchedule() {
 				Status:       1,
 				CreatedTime:  time.Now().Unix(),
 				UpdatedTime:  0,
+				IsExport:     2000,
 			}
 
 			var DialysisMachineName string
@@ -4388,7 +4396,7 @@ func RemoveRepeatedScheduleTemplate(arr []*models.VmPatientScheduleTemplateItem)
 	for i := 0; i < len(arr); i++ {
 		repeat := false
 		for j := i + 1; j < len(arr); j++ {
-			if arr[i].TemplateID == arr[j].TemplateID && arr[i].PatientID == arr[j].PatientID && arr[i].Weekday == arr[j].Weekday && arr[i].DeviceNumberID == arr[j].DeviceNumberID && arr[i].TimeType == arr[j].TimeType {
+			if arr[i].TemplateID == arr[j].TemplateID && arr[i].PatientID == arr[j].PatientID && arr[i].Weekday == arr[j].Weekday {
 				repeat = true
 				break
 			}

controllers/schedule_template_api_controller.go

@@ -722,8 +722,8 @@ func (this *PatientScheduleTemplateAPIController) UpdateSchedulesTemplate() {
 			src_template.DeviceNumberID = item.DeviceNumberID
 			src_template.TimeType = int8(item.TimeType)
 			src_template.TreatMode = item.Mode
-			//service.SaveSchTemplateItem(src_template)
-			fmt.Println("11111")
+			service.SaveSchTemplateItem(src_template)
+
 		} else {
 			schItemTwo, _ := service.GetScheduleTemplateTwo(this.GetAdminUserInfo().CurrentOrgId, item.TemplateID, item.Weekday, item.PatientID)
 			fmt.Println("222222")

service/schedule_service.go

@@ -876,6 +876,11 @@ func CreateScheduleTemplate(m *models.PatientScheduleTemplateItem) error {
 	return writeDb.Model(&models.PatientScheduleTemplateItem{}).Create(&m).Error
 }
 
+func ExportScheduleTemplate(m *models.PatientScheduleTemplateItem) (total int64) {
+	readDb.Model(&models.PatientScheduleTemplateItem{}).Where("template_id = ? AND patient_id = ? AND week_day = ? AND org_id = ?", m.TemplateID, m.PatientID, m.Weekday, m.OrgID).Count(&total)
+	return
+}
+
 func FindSchedualTemplateExportLog(org_id int64, export_time int64) (errLogs []*models.ExportErrLog, err error) {
 	err = readDb.Model(&models.ExportErrLog{}).Where("user_org_id = ? AND export_time = ? AND log_type = 3", org_id, export_time).Find(&errLogs).Error
 	return