111

controllers/schedule_api_controller.go

@@ -1606,23 +1606,30 @@ func (c *ScheduleApiController) ChangeSchedule() {
 		var DialysisMachineName string
 		if filedRecordOne.IsShow == 1 {
 			DialysisMachineName = so.DialysisDialyszers
+			fmt.Println("1111")
+			fmt.Println(DialysisMachineName)
+
 		}
 		if filedRecordThree.IsShow == 1 {
 			if len(schedule.DialysisMachineName) > 0 {
-				DialysisMachineName = schedule.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
-
+				DialysisMachineName = DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+				fmt.Println("22222")
+				fmt.Println(DialysisMachineName)
 			} else {
 				DialysisMachineName = so.DialyzerPerfusionApparatus
-
+				fmt.Println("333333")
+				fmt.Println(DialysisMachineName)
 			}
 		}
 		if filedRecordTwo.IsShow == 1 {
 			if len(DialysisMachineName) > 0 {
-				DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
-
+				DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
+				fmt.Println("55555555")
+				fmt.Println(DialysisMachineName)
 			} else {
 				DialysisMachineName = so.DialysisIrrigation
-
+				fmt.Println("66666666")
+				fmt.Println(DialysisMachineName)
 			}
 		}
 		schedule.DialysisMachineName = DialysisMachineName
@@ -2549,7 +2556,7 @@ func (this *ScheduleApiController) ExportSchedule() {
 			}
 			if filedRecordTwo.IsShow == 1 {
 				if len(DialysisMachineName) > 0 {
-					DialysisMachineName = sch.DialysisMachineName + "," + so.DialysisIrrigation
+					DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
 
 				} else {
 					DialysisMachineName = so.DialysisIrrigation
@@ -4094,6 +4101,9 @@ func (c *ScheduleApiController) SynchroSchedule() {
 	//根据模板ID获取模板数据
 	list, _ := service.GetTemplateListByTemplateId(template_id, orgId)
 
+	//数据去重操作
+	list = RemoveRepeatedScheduleTemplate(list)
+
 	recordDateStr := time.Now().Format("2006-01-02")
 	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
 	nowtime := recordDate.Unix()
@@ -4306,3 +4316,20 @@ func (c *ScheduleApiController) GetSolutionSchedule() {
 	})
 	return
 }
+
+func RemoveRepeatedScheduleTemplate(arr []*models.VmPatientScheduleTemplateItem) (newArr []*models.VmPatientScheduleTemplateItem) {
+	newArr = make([]*models.VmPatientScheduleTemplateItem, 0)
+	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 {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newArr = append(newArr, arr[i])
+		}
+	}
+	return
+}

controllers/schedule_template_api_controller.go

@@ -737,10 +737,8 @@ func (this *PatientScheduleTemplateAPIController) UpdateSchedulesTemplate() {
 				service.SaveSchTemplateItem(src_template)
 
 			} else {
-				schItem, _ := service.GetScheduleTemplateOne(this.GetAdminUserInfo().CurrentOrgId, item.DeviceNumberID, item.TemplateID, item.Weekday)
-
+				schItem, _ := service.GetScheduleTemplateOne(this.GetAdminUserInfo().CurrentOrgId, item.DeviceNumberID, item.TemplateID, item.Weekday, item.TimeType)
 				if schItem.ID == 0 { //床位未被占用
-
 					var template models.PatientScheduleTemplateItem
 					template.TreatMode = item.Mode
 					template.TemplateID = int64(item.TemplateID)
@@ -753,12 +751,8 @@ func (this *PatientScheduleTemplateAPIController) UpdateSchedulesTemplate() {
 					template.Weekday = int8(item.Weekday)
 					template.Status = 1
 					service.SaveSchTemplateItem(template)
-
 				} else { //床位被占用 1.被自己占用，2。被别人占用
-					//fmt.Println("555555555")
-
 					if schItem.PatientID != 0 && schItem.PatientID == item.PatientID { //当天该患者已经存在排班则设为修改操作
-						//fmt.Println("66666")
 						src_template, _ := service.GetScheduleTemplateItem(schItem.ID)
 						src_template.DeviceNumberID = item.DeviceNumberID
 						src_template.TimeType = int8(item.TimeType)