Merge branches '20220812' and '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/gobal_config_api_controller.go

@@ -121,10 +121,48 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/changesettleopenconfig", &GobalConfigApiController{}, "Get:ChangeSettleOpenConfig")
 
 	beego.Router("/api/changegoodoutopen", &GobalConfigApiController{}, "Get:ChangeGoodOutOpen")
+
+	beego.Router("/api/schedule/config/commit", &GobalConfigApiController{}, "post:PostScheduleConfig")
+	beego.Router("/api/schedule/config/get", &GobalConfigApiController{}, "get:GetScheduleConfig")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
 
+func (c *GobalConfigApiController) PostScheduleConfig() {
+	is_show_mode, _ := c.GetInt64("is_show_mode", 0)
+	is_show_machine, _ := c.GetInt64("is_show_machine", 0)
+	id, _ := c.GetInt64("id", 0)
+
+	config, _ := service.GetScheduleConfigById(id)
+	var err error
+	if config.ID == 0 {
+		config.IsShowMode = is_show_mode
+		config.IsShowMachine = is_show_machine
+		config.UserOrgId = c.GetAdminUserInfo().CurrentOrgId
+		config.Ctime = time.Now().Unix()
+		config.Mtime = time.Now().Unix()
+		config.Status = 1
+		err = service.CreateScheduleConfig(config)
+	} else {
+		config.IsShowMachine = is_show_machine
+		config.IsShowMode = is_show_mode
+		config.Mtime = time.Now().Unix()
+		err = service.SaveScheduleConfig(config)
+	}
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"config": config,
+		})
+	}
+}
+
+func (c *GobalConfigApiController) GetScheduleConfig() {
+	config, _ := service.GetScheduleConfigByOrgId(c.GetAdminUserInfo().CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"config": config,
+	})
+}
+
 func (c *GobalConfigApiController) PostStockConfig() {
 	is_open, _ := c.GetInt64("is_open", 0)
 	adminUserInfo := c.GetAdminUserInfo()

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2449,7 +2449,6 @@ func (c *DialysisAPIController) GetSchedualPatientsList() {
 // @param nurse:int 上机护士
 // @param bed:int 床位号
 func (this *DialysisAPIController) StartDialysis() {
-
 	patientID, _ := this.GetInt64("patient_id")
 	recordDateStr := this.GetString("record_date")
 	nurseID, _ := this.GetInt64("nurse")
@@ -2599,19 +2598,11 @@ func (this *DialysisAPIController) StartDialysis() {
 			} else { //2022-11-04 更变需求，如果改床位有排班，但是没上机，则进行互换床位操作
 				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)
-					service.UpdateScheduleTwo(daySchedule, schedule)
+					err := service.UpdateScheduleTwo(daySchedule, schedule)
+					if err != nil {
+						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
 
 				}
 			}

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -514,7 +514,7 @@ func (this *DialysisAPIController) AddUrgentSchedule() {
 				UpdatedTime:  time.Now().Unix(),
 				IsExport:     5,
 			}
-			createErr := service.CreateSchedule(newSchedule)
+			createErr := service.CreateScheduleTwo(newSchedule)
 			redis := service.RedisClient()
 			timeStr := time.Now().Format("2006-01-02")
 			key := "scheduals_" + timeStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -377,43 +377,45 @@ func (this *StaffScheduleApiController) GetPatientScheduleList() {
 
 func (this *StaffScheduleApiController) DeleteSchedule() {
 	id, _ := this.GetInt64("id")
-	fmt.Println("id", id)
-
 	org_id := this.GetMobileAdminUserInfo().Org.Id
 	err := service.DeleteSchedule(id)
-	schedule, _ := service.GetScheduleNight(org_id, id)
-
-	redis := service.RedisClient()
+	if err == nil {
+		schedule, _ := service.GetScheduleNight(org_id, id)
+		redis := service.RedisClient()
+		//处方
+		keyOne := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":prescriptions_list_all"
+		redis.Set(keyOne, "", time.Second)
 
-	//处方
-	keyOne := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":prescriptions_list_all"
-	redis.Set(keyOne, "", time.Second)
+		//医嘱
+		keyTwo := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":advice_list_all"
+		redis.Set(keyTwo, "", time.Second)
 
-	//医嘱
-	keyTwo := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":advice_list_all"
-	redis.Set(keyTwo, "", time.Second)
+		keySix := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_befores_list_all"
+		redis.Set(keySix, "", time.Second)
+		keyThree := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_after_dislysis_list_all"
+		redis.Set(keyThree, "", time.Second)
 
-	keySix := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_befores_list_all"
-	redis.Set(keySix, "", time.Second)
-	keyThree := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_after_dislysis_list_all"
-	redis.Set(keyThree, "", time.Second)
+		keyFour := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":monitor_record_list_all"
+		redis.Set(keyFour, "", time.Second)
 
-	keyFour := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":monitor_record_list_all"
-	redis.Set(keyFour, "", time.Second)
+		keyFive := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":treatment_summarys_list_all"
+		redis.Set(keyFive, "", time.Second)
 
-	keyFive := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":treatment_summarys_list_all"
-	redis.Set(keyFive, "", time.Second)
+		keySeven := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_orders_list_all"
+		redis.Set(keySeven, "", time.Second)
 
-	keySeven := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_orders_list_all"
-	redis.Set(keySeven, "", time.Second)
+		defer redis.Close()
+		fmt.Println(err)
 
-	defer redis.Close()
-	fmt.Println(err)
+		returnData := make(map[string]interface{}, 0)
+		returnData["msg"] = "ok"
+		this.ServeSuccessJSON(returnData)
+		return
 
-	returnData := make(map[string]interface{}, 0)
-	returnData["msg"] = "ok"
-	this.ServeSuccessJSON(returnData)
-	return
+	} else {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除失败")
+		return
+	}
 }
 
 func (this *StaffScheduleApiController) SearchPatient() {
@@ -758,7 +760,7 @@ func (c *StaffScheduleApiController) CreateMobileSchedulePatient() {
 	}
 
 	redis := service.RedisClient()
-	err = service.CreateSchedule(&schedule)
+	err = service.CreateScheduleTwo(&schedule)
 	key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
 	redis.Set(key, "", time.Second)
 	defer redis.Close()
@@ -842,7 +844,6 @@ func (c *StaffScheduleApiController) ChangeScheduleType() {
 			PatientId: schedule.PatientId,
 			ModeId:    schedule.ModeId,
 		}
-
 		var DialysisMachineName string
 		so, _ := service.GetDialysisSolutionTwo(org_id, sch.PatientId, sch.ModeId)
 		filedRecordOne, _ := service.FindFiledBy(org_id, "透析器")
@@ -871,8 +872,6 @@ func (c *StaffScheduleApiController) ChangeScheduleType() {
 			}
 		}
 		sch.DialysisMachineName = DialysisMachineName
-		service.UpdateScheduleById(id, sch)
-
 		schedu := models.Schedule{
 			PatientId: patient_id,
 			ModeId:    mode_id,
@@ -900,7 +899,15 @@ func (c *StaffScheduleApiController) ChangeScheduleType() {
 			}
 		}
 		schedu.DialysisMachineName = DialysisMachineName1
-		service.UpdateScheduleById(schedule.ID, schedu)
+		err := service.UpdateScheduleById(schedule.ID, schedu, id, sch)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "ok",
+			})
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
 	} else {
 		xtSchedule := models.Schedule{
 			ScheduleDate: schedule_date,
@@ -909,11 +916,17 @@ func (c *StaffScheduleApiController) ChangeScheduleType() {
 			UserOrgId:    org_id,
 		}
 
-		service.ChangeScheduleClass(xtSchedule)
+		err := service.ChangeScheduleClass(xtSchedule)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "ok",
+			})
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
 	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "ok",
-	})
+
 }
 func (c *StaffScheduleApiController) ChangeScheduleBed() {
 	schedule_type, _ := c.GetInt64("schedule_type")
@@ -972,7 +985,7 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 			}
 		}
 		sch.DialysisMachineName = DialysisMachineName
-		service.UpdateScheduleById(id, sch)
+
 		schedu := models.Schedule{
 			PatientId:           patient_id,
 			ModeId:              mode_id,
@@ -1002,7 +1015,18 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 			}
 		}
 		schedu.DialysisMachineName = DialysisMachineName1
-		service.UpdateScheduleById(schedule.ID, schedu)
+		err := service.UpdateScheduleById(schedule.ID, schedu, id, sch)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "ok",
+			})
+
+		} else {
+
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+
 	} else {
 		var str string
 		//查找该机构用的是什么透析器
@@ -1029,10 +1053,16 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 			IsExport:            20000,
 			DialysisMachineName: str,
 		}
-		service.DeleteSchedule(id)
-		service.CreateSchedule(&xtSchedule)
+		var err error
+		err = service.CreateSchedule(&xtSchedule, id)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "ok",
+			})
+			return
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
 	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "ok",
-	})
 }

controllers/schedule_api_controller.go

@@ -79,11 +79,8 @@ func ScheduleApiRegistRouters() {
 	beego.Router("/api/patient/smartpatientschtemplate", &ScheduleApiController{}, "Get:GetPatientSmartSchTemplate")
 
 	beego.Router("/api/device/get", &ScheduleApiController{}, "Get:GetDevicesNumbers")
-
 	beego.Router("/api/smartsch/batch", &ScheduleApiController{}, "Post:BatchPostSmartSch")
-
 	beego.Router("/api/smartsch/get", &ScheduleApiController{}, "Get:GetSmartSch")
-
 	beego.Router("/api/sch/exchange", &ScheduleApiController{}, "Get:ExchangeSch")
 	beego.Router("/api/sch/coversch", &ScheduleApiController{}, "Get:CoverSch")
 	beego.Router("/api/schedule/delete_two", &ScheduleApiController{}, "Delete:DeleteScheduleTwo")
@@ -122,13 +119,22 @@ func (c *ScheduleApiController) CoverSch() {
 	new_sch.ScheduleType = sch_two.ScheduleType
 	new_sch.ID = 0
 	//删除原来的排班
-	service.SaveSchTwo(sch, sch_two)
+	err := service.SaveSchTwo(sch, sch_two)
 	//生成新的排班
-	service.SaveSch(new_sch)
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "覆盖成功",
-	})
-
+	if err == nil {
+		err2 := service.SaveSch(new_sch)
+		if err2 == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "覆盖成功",
+			})
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
 }
 func (c *ScheduleApiController) ExchangeSch() {
 	id_one, _ := c.GetInt64("id_one")
@@ -161,10 +167,18 @@ func (c *ScheduleApiController) ExchangeSch() {
 		}
 	}
 
-	service.UpdateScheduleThree(sch, sch_two)
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "交换成功",
-	})
+	err := service.UpdateScheduleThree(sch, sch_two)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "交换成功",
+		})
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+
+	}
+
 }
 func (c *ScheduleApiController) BatchPostSmartSch() {
 	patient_id, _ := c.GetInt64("patient_id")
@@ -186,7 +200,6 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 
 	//数据校验
 	if dataBody["smart_schs"] != nil && reflect.TypeOf(dataBody["smart_schs"]).String() == "[]interface {}" {
-
 		schs, _ := dataBody["smart_schs"].([]interface{})
 		if len(schs) > 0 {
 			for _, item := range schs {
@@ -1000,7 +1013,7 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 							service.SaveSch(daySchedule)
 						} else {
 							existSchedule.IsExport = 3003
-							service.CreateSchedule(&schedule)
+							service.CreateScheduleTwo(&schedule)
 						}
 					}
 				}
@@ -1527,7 +1540,7 @@ func (c *ScheduleApiController) CreateSchedule() {
 
 	redis := service.RedisClient()
 	schedule.IsExport = 1000
-	err = service.CreateSchedule(&schedule)
+	err = service.CreateScheduleTwo(&schedule)
 
 	key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
 
@@ -2670,26 +2683,18 @@ func (this *ScheduleApiController) ExportSchedule() {
 				for _, item := range schedules {
 					if item.ScheduleDate > clear_schedule_date {
 						//查询该患者是否转出获取死亡
-						fmt.Println("11111323242423")
-
 						//查找当天日期是否存在
 						_, errcode := service.GetTodayScheduleIsExistOne(item.PatientId, item.ScheduleDate, item.UserOrgId)
 						if errcode == gorm.ErrRecordNotFound {
 							//查询该床位是否有患者
-							fmt.Println("errcodes")
 							sch, errcodes := service.GetPatientByBed(item.ScheduleDate, item.BedId, item.ScheduleType, item.UserOrgId)
-							fmt.Println("errcodes")
-							fmt.Println(errcodes)
-							fmt.Println(sch)
 
 							if errcodes == gorm.ErrRecordNotFound {
-								fmt.Println("1111111")
-								service.CreateSchedule(item)
+								service.CreateScheduleTwo(item)
 							} else if errcodes == nil {
-								fmt.Println("1111222222222")
 								//清除当天该床位已有的患者
 								service.ModeFyScheduleById(sch.ScheduleDate, sch.BedId, sch.ScheduleType, sch.UserOrgId)
-								service.CreateSchedule(item)
+								service.CreateScheduleTwo(item)
 							}
 
 						} else if errcode == nil {
@@ -2704,8 +2709,6 @@ func (this *ScheduleApiController) ExportSchedule() {
 								Status:              1,
 								DialysisMachineName: item.DialysisMachineName,
 							}
-							fmt.Println("1111222222223333333333333333332")
-
 							service.UpdateScheduleByOrgIdOne(item.PatientId, item.ScheduleDate, item.UserOrgId, &schedule)
 						}
 					}
@@ -4556,38 +4559,45 @@ func (c *ScheduleApiController) DeleteScheduleTwo() {
 	schedule.Status = 0
 	schedule.UpdatedTime = time.Now().Unix()
 	err = service.UpdateSchedule(schedule)
-	redis := service.RedisClient()
 
-	//处方
-	keyOne := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":prescriptions_list_all"
-	redis.Set(keyOne, "", time.Second)
+	if err == nil {
+		redis := service.RedisClient()
+		//处方
+		keyOne := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":prescriptions_list_all"
+		redis.Set(keyOne, "", time.Second)
 
-	//医嘱
-	keyTwo := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":advice_list_all"
-	redis.Set(keyTwo, "", time.Second)
+		//医嘱
+		keyTwo := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":advice_list_all"
+		redis.Set(keyTwo, "", time.Second)
 
-	keySix := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_befores_list_all"
-	redis.Set(keySix, "", time.Second)
-	keyThree := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_after_dislysis_list_all"
-	redis.Set(keyThree, "", time.Second)
+		keySix := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_befores_list_all"
+		redis.Set(keySix, "", time.Second)
+		keyThree := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_after_dislysis_list_all"
+		redis.Set(keyThree, "", time.Second)
 
-	keyFour := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":monitor_record_list_all"
-	redis.Set(keyFour, "", time.Second)
+		keyFour := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":monitor_record_list_all"
+		redis.Set(keyFour, "", time.Second)
 
-	keyFive := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":treatment_summarys_list_all"
-	redis.Set(keyFive, "", time.Second)
+		keyFive := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":treatment_summarys_list_all"
+		redis.Set(keyFive, "", time.Second)
 
-	keySeven := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_orders_list_all"
-	redis.Set(keySeven, "", time.Second)
-	fmt.Println(err)
-	defer redis.Close()
-	if err != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteScheduleFail)
+		keySeven := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_orders_list_all"
+		redis.Set(keySeven, "", time.Second)
+		defer redis.Close()
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteScheduleFail)
+			return
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg":      "ok",
+			"schedule": &schedule,
+		})
+
+	} else {
+
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
+
 	}
 
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg":      "ok",
-		"schedule": &schedule,
-	})
 }

service/device_service.go

@@ -831,9 +831,18 @@ func GetPartionId(bed_id int64, org_id int64) (models.XtDeviceNumber, error) {
 	return number, err
 }
 
-func UpdateScheduleById(id int64, schedule models.Schedule) error {
+func UpdateScheduleById(id int64, schedule models.Schedule, id_two int64, schedule_two models.Schedule) error {
+	utx := XTWriteDB().Begin()
 
-	err := XTWriteDB().Model(&models.Schedule{}).Where("id = ? and status =1", id).Update(map[string]interface{}{"patient_id": schedule.PatientId, "mode_id": schedule.ModeId, "is_export": 10000, "dialysis_machine_name": schedule.DialysisMachineName}).Error
+	if err = utx.Model(&models.Schedule{}).Where("id = ? and status =1", id).Update(map[string]interface{}{"patient_id": schedule.PatientId, "mode_id": schedule.ModeId, "is_export": 50000, "dialysis_machine_name": schedule.DialysisMachineName}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	if err = utx.Model(&models.Schedule{}).Where("id = ? and status =1", id_two).Update(map[string]interface{}{"patient_id": schedule_two.PatientId, "mode_id": schedule_two.ModeId, "is_export": 50000, "dialysis_machine_name": schedule_two.DialysisMachineName}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	utx.Commit()
 	return err
 }
 

service/his_print_service.go

@@ -23,7 +23,7 @@ func GetBatchProjectHisPrescription(ids []string, record_time int64, user_org_id
 		Preload("HisPrintPrescription", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND type <> 1 AND p_type = 2", user_org_id, record_time).
 				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-					return db.Where("his_prescription_project.status = 1 AND his_prescription_project.user_org_id = ?", user_org_id).Where("his_prescription_project.status = 1 ").Preload("HisProject", "status = 1").Preload("GoodInfo", "status=1")
+					return db.Joins("Join xt_his_project p On p.id = his_prescription_project.project_id  AND p.cost_classify != 3").Where("his_prescription_project.status = 1 AND his_prescription_project.user_org_id = ?", user_org_id).Where("his_prescription_project.status = 1 ").Preload("HisProject", "status = 1").Preload("GoodInfo", "status=1")
 				})
 		}).
 		Preload("HisPrescriptionInfoTwo", "status = 1 AND record_date = ?", record_time).

service/patient_schedule_template_service.go

@@ -34,17 +34,10 @@ func GetOrgPatientScheduleTemplateIDs(orgID int64) ([]*models.PatientScheduleTem
 	return ids, nil
 }
 
-func GetOrgPatientScheduleTemplateIDByTemplateID(orgID int64, templateID int64) (*models.PatientScheduleTemplateId, error) {
-	var id models.PatientScheduleTemplateId
-	err := readDb.Model(&models.PatientScheduleTemplateId{}).Where("org_id = ? AND id = ? AND status = 1", orgID, templateID).First(&id).Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return nil, nil
-		} else {
-			return nil, err
-		}
-	}
-	return &id, nil
+func GetOrgPatientScheduleTemplateIDByTemplateID(orgID int64, templateID int64) (id models.PatientScheduleTemplateId, err error) {
+	err = readDb.Model(&models.PatientScheduleTemplateId{}).Where("org_id = ? AND id = ? AND status = 1", orgID, templateID).First(&id).Error
+
+	return id, nil
 }
 
 type PatientsTwo struct {
@@ -954,3 +947,48 @@ func UpdateTemplateItemModeWeek(orgID int64, id int64, week_time int64) {
 	readDb.Model(&models.PatientScheduleTemplateMode{}).Where("org_id = ? AND status = 1 AND id = ? ", orgID, id).Updates(map[string]interface{}{"original_week": week_time, "week": week_time})
 	return
 }
+
+func ClearAndCreateSyncSch(user_org_id int64, start_time int64, schs []models.Schedule) (err error) {
+	utx := writeDb.Begin()
+	err = utx.Table("xt_schedule as s").
+		Where("s.schedule_date > ? AND s.status = 1 AND "+
+			"s.user_org_id = ?", start_time, user_org_id).
+		Updates(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
+	if err != nil {
+		utx.Rollback()
+		return
+	}
+	if len(schs) > 0 {
+		if len(schs) > 0 {
+			thisSQL := "INSERT INTO xt_schedule (user_org_id, partition_id, bed_id, patient_id, schedule_date,schedule_type,schedule_week,mode_id,status,created_time,updated_time,is_export,dialysis_machine_name,remark) VALUES "
+			insertParams := make([]string, 0)
+			insertData := make([]interface{}, 0)
+			for _, info := range schs {
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, info.UserOrgId)
+				insertData = append(insertData, info.PartitionId)
+				insertData = append(insertData, info.BedId)
+				insertData = append(insertData, info.PatientId)
+				insertData = append(insertData, info.ScheduleDate)
+				insertData = append(insertData, info.ScheduleType)
+				insertData = append(insertData, info.ScheduleWeek)
+				insertData = append(insertData, info.ModeId)
+				insertData = append(insertData, info.Status)
+				insertData = append(insertData, info.CreatedTime)
+				insertData = append(insertData, info.UpdatedTime)
+				insertData = append(insertData, info.IsExport)
+				insertData = append(insertData, info.DialysisMachineName)
+				insertData = append(insertData, "")
+			}
+			thisSQL += strings.Join(insertParams, ", ")
+			err = utx.Exec(thisSQL, insertData...).Error
+			if err != nil {
+				utx.Rollback()
+				return
+			}
+		}
+		utx.Commit()
+	}
+	return
+
+}

service/schedule_service.go

@@ -226,9 +226,19 @@ func GetPointSchedule(orgID, scheduleDate, scheduleWeek, scheduleType, bedId int
 	return
 }
 
-func CreateSchedule(m *models.Schedule) error {
+func CreateSchedule(m *models.Schedule, id int64) (err error) {
 	utx := XTWriteDB().Begin()
-	err := utx.Create(&m).Error
+	schedule := models.XtSchedule{}
+	err = utx.Model(&schedule).Where("id=? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	if err != nil {
+		utx.Rollback()
+		return err
+	}
+	err = utx.Create(&m).Error
+	if err != nil {
+		utx.Rollback()
+		return err
+	}
 	utx.Commit()
 	return err
 }
@@ -346,8 +356,8 @@ func UpdateScheduleOne(id int64, schedule models.Schedule) error {
 }
 
 // 参数一：当前操作的患者的排班     参数二被替换床位对应的排班
-func UpdateScheduleTwo(schone models.Schedule, schtwo models.Schedule) {
-	utx := XTWriteDB()
+func UpdateScheduleTwo(schone models.Schedule, schtwo models.Schedule) error {
+	utx := XTWriteDB().Begin()
 	//床位
 	var tempBedID int64
 	var tempBedIDTwo int64
@@ -377,16 +387,22 @@ func UpdateScheduleTwo(schone models.Schedule, schtwo models.Schedule) {
 
 	schone.ScheduleType = tempTypeTwo
 	schtwo.ScheduleType = tempTypeID
-	schone.IsExport = 9000
-	schtwo.IsExport = 9000
 
-	utx.Model(&models.Schedule{}).Where("id = ?", schone.ID).Updates(map[string]interface{}{"partition_id": schone.PartitionId, "bed_id": schone.BedId, "schedule_type": schone.ScheduleType, "is_export": 9000})
-	utx.Model(&models.Schedule{}).Where("id = ?", schtwo.ID).Updates(map[string]interface{}{"partition_id": schtwo.PartitionId, "bed_id": schtwo.BedId, "schedule_type": schtwo.ScheduleType, "is_export": 9000})
+	if err := utx.Model(&models.Schedule{}).Where("id = ?", schone.ID).Updates(map[string]interface{}{"partition_id": schone.PartitionId, "bed_id": schone.BedId, "schedule_type": schone.ScheduleType, "is_export": 90000}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
 
+	if err := utx.Model(&models.Schedule{}).Where("id = ?", schtwo.ID).Updates(map[string]interface{}{"partition_id": schtwo.PartitionId, "bed_id": schtwo.BedId, "schedule_type": schtwo.ScheduleType, "is_export": 90000}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	utx.Commit()
+	return err
 }
 
-func UpdateScheduleThree(schone *models.Schedule, schtwo *models.Schedule) {
-	utx := XTWriteDB()
+func UpdateScheduleThree(schone *models.Schedule, schtwo *models.Schedule) error {
+	utx := XTWriteDB().Begin()
 	//床位
 	var tempBedID int64
 	var tempBedIDTwo int64
@@ -407,6 +423,7 @@ func UpdateScheduleThree(schone *models.Schedule, schtwo *models.Schedule) {
 	var sch_week_one int64
 	var sch_week_two int64
 
+	//原数据
 	tempBedID = schone.BedId
 	tempBedIDTwo = schtwo.BedId
 
@@ -422,6 +439,7 @@ func UpdateScheduleThree(schone *models.Schedule, schtwo *models.Schedule) {
 	sch_week_one = schone.ScheduleWeek
 	sch_week_two = schtwo.ScheduleWeek
 
+	//交换数据
 	schone.BedId = tempBedIDTwo
 	schtwo.BedId = tempBedID
 
@@ -437,12 +455,18 @@ func UpdateScheduleThree(schone *models.Schedule, schtwo *models.Schedule) {
 	schone.ScheduleWeek = sch_week_two
 	schtwo.ScheduleWeek = sch_week_one
 
-	schone.IsExport = 9000
-	schtwo.IsExport = 9000
+	if err = utx.Model(&models.Schedule{}).Where("id = ?", schone.ID).Updates(map[string]interface{}{"partition_id": schone.PartitionId, "bed_id": schone.BedId, "schedule_type": schone.ScheduleType, "schedule_date": schone.ScheduleDate, "schedule_week": schone.ScheduleWeek, "is_export": 80000}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
 
-	utx.Model(&models.Schedule{}).Where("id = ?", schone.ID).Updates(map[string]interface{}{"partition_id": schone.PartitionId, "bed_id": schone.BedId, "schedule_type": schone.ScheduleType, "schedule_date": schone.ScheduleDate, "schedule_week": schone.ScheduleWeek, "is_export": 9000})
-	utx.Model(&models.Schedule{}).Where("id = ?", schtwo.ID).Updates(map[string]interface{}{"partition_id": schtwo.PartitionId, "bed_id": schtwo.BedId, "schedule_type": schtwo.ScheduleType, "schedule_date": schtwo.ScheduleDate, "schedule_week": schtwo.ScheduleWeek, "is_export": 9000})
+	if err = utx.Model(&models.Schedule{}).Where("id = ?", schtwo.ID).Updates(map[string]interface{}{"partition_id": schtwo.PartitionId, "bed_id": schtwo.BedId, "schedule_type": schtwo.ScheduleType, "schedule_date": schtwo.ScheduleDate, "schedule_week": schtwo.ScheduleWeek, "is_export": 80000}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	utx.Commit()
 
+	return err
 }
 
 func GetPatientScheduleFormToday(orgId, id, start int64) (schedules []*models.PatientSchedule, err error) {
@@ -1500,21 +1524,43 @@ func GetScheduleTemplateCountByDate(org_id int64, week_day int8, patient_id int6
 	return
 }
 
-func SaveSchTemplateTwo(sch models.PatientScheduleTemplateItem, sch_two models.PatientScheduleTemplateItem) (err error) {
-	//err = writeDb.Save(&sch).Error
-	err = writeDb.Model(&models.PatientScheduleTemplateItem{}).Where("status=1 AND id = ?", sch.ID).Updates(map[string]interface{}{"status": 0}).Error
-	err = writeDb.Model(&models.PatientScheduleTemplateItem{}).Where("status=1 AND id = ?", sch_two.ID).Updates(map[string]interface{}{"status": 0}).Error
+func SaveSchTemplateTwo(sch models.PatientScheduleTemplateItem, sch_two models.PatientScheduleTemplateItem, new_sch models.PatientScheduleTemplateItem) (err error) {
+	utx := writeDb.Begin()
+	if err = utx.Model(&models.PatientScheduleTemplateItem{}).Where("status=1 AND id = ?", sch.ID).Updates(map[string]interface{}{"status": 0}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	if err = utx.Model(&models.PatientScheduleTemplateItem{}).Where("status=1 AND id = ?", sch_two.ID).Updates(map[string]interface{}{"status": 0}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	if err = utx.Save(&new_sch).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	utx.Commit()
 
-	return
+	return err
 }
 
-func SaveSchTemplate(sch models.PatientScheduleTemplateItem) (err error) {
-	err = writeDb.Save(&sch).Error
-	return
+func SaveSchTemplate(sch models.PatientScheduleTemplateItem, sch_two models.PatientScheduleTemplateItem) (err error) {
+	utx := writeDb.Begin()
+	if err = utx.Save(&sch).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+
+	if err = utx.Save(&sch_two).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	utx.Commit()
+
+	return err
 }
 
-func UpdateScheduleTemplateThree(schone models.PatientScheduleTemplateItem, schtwo models.PatientScheduleTemplateItem) {
-	utx := XTWriteDB()
+func UpdateScheduleTemplateThree(schone models.PatientScheduleTemplateItem, schtwo models.PatientScheduleTemplateItem) error {
+	utx := XTWriteDB().Begin()
 	//床位
 	var tempBedID int64
 	var tempBedIDTwo int64
@@ -1544,10 +1590,17 @@ func UpdateScheduleTemplateThree(schone models.PatientScheduleTemplateItem, scht
 
 	schone.Weekday = sch_week_two
 	schtwo.Weekday = sch_week_one
+	if err = utx.Model(&models.PatientScheduleTemplateItem{}).Where("id = ?", schone.ID).Updates(map[string]interface{}{"device_number_id": schone.DeviceNumberID, "time_type": schone.TimeType, "weekday": schone.Weekday, "is_export": 70000}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	if err = utx.Model(&models.PatientScheduleTemplateItem{}).Where("id = ?", schtwo.ID).Updates(map[string]interface{}{"device_number_id": schtwo.DeviceNumberID, "time_type": schtwo.TimeType, "weekday": schtwo.Weekday, "is_export": 70000}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	utx.Commit()
 
-	utx.Model(&models.PatientScheduleTemplateItem{}).Where("id = ?", schone.ID).Updates(map[string]interface{}{"device_number_id": schone.DeviceNumberID, "time_type": schone.TimeType, "weekday": schone.Weekday, "is_export": 9000})
-	utx.Model(&models.PatientScheduleTemplateItem{}).Where("id = ?", schtwo.ID).Updates(map[string]interface{}{"device_number_id": schtwo.DeviceNumberID, "time_type": schtwo.TimeType, "weekday": schtwo.Weekday, "is_export": 9000})
-
+	return err
 }
 
 func GetScheduleTemplateForDeviceNumberTwo(orgID int64, deviceNumberID int64, template_id int64, week_type int64, time_type int64, patient_id int64) (models.PatientScheduleTemplateItem, error) {
@@ -1555,3 +1608,22 @@ func GetScheduleTemplateForDeviceNumberTwo(orgID int64, deviceNumberID int64, te
 	err := readDb.Model(&models.PatientScheduleTemplateItem{}).Where("device_number_id = ? AND org_id = ? AND status = 1 AND template_id = ? AND weekday = ? AND time_type = ? AND patient_id = ?", deviceNumberID, orgID, template_id, week_type, time_type, patient_id).First(&item).Error
 	return item, err
 }
+
+func ClearSchedules(user_org_id int64, start_time int64) (err error) {
+	err = writeDb.Table("xt_schedule as s").
+		Where("s.schedule_date > ? AND s.status = 1 AND "+
+			"s.user_org_id = ?", start_time, user_org_id).
+		Updates(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
+	return
+}
+
+func CreateScheduleTwo(m *models.Schedule) error {
+	utx := XTWriteDB().Begin()
+	err = utx.Create(&m).Error
+	if err != nil {
+		utx.Rollback()
+		return err
+	}
+	utx.Commit()
+	return err
+}