11月9日库存管理

conf/app.conf

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

controllers/dialysis_api_controller.go

@@ -4356,14 +4356,17 @@ func (this *DialysisApiController) GetDialysisAdviceTemplateList() {
 	schedule_type, _ := this.GetInt64("schedule_type")
 
 	start_time := this.GetString("schedule_date")
+
+	ids := this.GetString("ids")
+	idArray := strings.Split(ids, ",")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-
-	list, total, err := service.GetDialysisAdviceTemplateList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId)
-
+	fmt.Println("idArray", idArray)
+	list, total, err := service.GetDialysisAdviceTemplateList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId, idArray)
+	fmt.Println("list2323223323223323323223wi", list)
 	//获取长期医嘱
 	adviceList, _ := service.GetAllLongAdviceList(orgId)
 

controllers/dialysis_record_api_controller.go

@@ -1131,6 +1131,8 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 				record.Conductivity = 14
 				record.BreathingRate = "20"
 				record.DialysateTemperature = 36.5
+				record.VenousPressure = 80
+				record.TransmembranePressure = 60
 			}
 
 			err := service.CreateMonitor(&record)

controllers/drug_stock_api_contorller.go

@@ -1301,6 +1301,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 					AdminUserId:             admin_user_id,
 					StockCount:              stock_count,
 					IsCheck:                 2,
+					SysRecordTime:           warehousingOutDate.Unix(),
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -377,7 +377,9 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			newprescribe.TargetUltrafiltration = dewater_amount
 			newprescribe.Status = 1
 			newprescribe.Remark = dialysisSolution.Remark
-
+			if adminUserInfo.Org.Id == 10340 {
+				newprescribe.TargetUltrafiltration = 0
+			}
 			//插入透析处方
 			err := service.AddSigleRecord(&newprescribe)
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -446,7 +448,9 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.TargetUltrafiltration = dewater_amount
 				newprescribe.Status = 1
 				newprescribe.Remark = lastDialysisPrescribe.Remark
-
+				if adminUserInfo.Org.Id == 10340 {
+					newprescribe.TargetUltrafiltration = 0
+				}
 				err := service.AddSigleRecord(&newprescribe)
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()
@@ -511,9 +515,9 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.TargetUltrafiltration = dewater_amount
 				newprescribe.Status = 1
 
-				fmt.Println(newprescribe.DewaterAmount)
-				fmt.Println(newprescribe.TargetUltrafiltration)
-
+				if adminUserInfo.Org.Id == 10340 {
+					newprescribe.TargetUltrafiltration = 0
+				}
 				err := service.AddSigleRecord(&newprescribe)
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()
@@ -564,7 +568,9 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			dialysisPrescribe.DewaterAmount = dewater_amount
 			dialysisPrescribe.TargetUltrafiltration = dewater_amount
 			dialysisPrescribe.Status = 1
-
+			if adminUserInfo.Org.Id == 10340 {
+				dialysisPrescribe.TargetUltrafiltration = 0
+			}
 			updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 			redis := service.RedisClient()

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2428,7 +2428,8 @@ func (this *DialysisAPIController) StartDialysis() {
 			record.DialysateTemperature = 36.5
 			record.Conductivity = 14
 			record.BreathingRate = "20"
-
+			record.VenousPressure = 80
+			record.TransmembranePressure = 60
 		}
 		err := service.CreateMonitor(&record)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"

controllers/mobile_api_controllers/patient_api_controller.go

@@ -684,6 +684,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.Org.Id)
 
 		storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.Org.Id)
+		fmt.Println("drugStockConfig.IsOpen32232323232", drugStockConfig.IsOpen)
 		if drugStockConfig.IsOpen == 1 {
 			if groupno > 0 {
 				advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
@@ -699,6 +700,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				if isHasWay {
 					var total int64
 					var prescribing_number_total int64
+					fmt.Println("advicesssssssssssssssss", len(advices))
 					for _, item := range advices {
 						if item.Way == 1 {
 							houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
@@ -721,7 +723,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								total = list.Count*medical.MinNumber + list.StockMinNumber
 								prescribing_number_total = count
 							}
-
+							fmt.Println("meiddidididssddssddsdsds", medical.IsUse)
 							if medical.IsUse == 1 {
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "1",
@@ -807,13 +809,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 						}
 					}
+
 				}
-				c.ServeSuccessJSON(map[string]interface{}{
-					"msg":    "1",
-					"advice": advice,
-					"ids":    ids,
-				})
-				return
 			} else {
 
 				advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
@@ -905,12 +902,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 									//剩余库存
 									service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
-									c.ServeSuccessJSON(map[string]interface{}{
-										"msg":    "1",
-										"advice": advice,
-										"ids":    ids,
-									})
-									return
 								}
 								if medical.IsUse == 1 {
 									c.ServeSuccessJSON(map[string]interface{}{
@@ -926,6 +917,13 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 				}
 			}
+
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg":    "1",
+				"advice": advice,
+				"ids":    ids,
+			})
+			return
 		}
 
 		if privateDrugConfig != nil && privateDrugConfig.DrugStart == 1 {

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -173,7 +173,7 @@ func (this *NewDialysisApiController) SavePatient() {
 	fmt.Print(birth)
 	phone := dataBody["phone"].(string)
 	relative_phone := dataBody["relative_phone"].(string)
-	fmt.Print("电话号码", phone)
+
 	patientType := dataBody["result"].([]interface{})
 	fmt.Print("患者标签", patientType)
 	dialysis := dataBody["dialysis"].(string)
@@ -243,6 +243,7 @@ func (this *NewDialysisApiController) SavePatient() {
 
 	remark := dataBody["remark"].(string)
 
+	treatment_plan := dataBody["treatment_plan"].(string)
 	//查询身份证号码是否存在
 	thisPatientOne, _ := service.FindPatientByIdCardNoFive(orgid, idCard)
 	if thisPatientOne.ID > 0 {
@@ -291,8 +292,9 @@ func (this *NewDialysisApiController) SavePatient() {
 			IsInfectious:      is_infectious,
 			RegistrarsId:      adminInfo.AdminUser.Id,
 			RelativePhone:     relative_phone,
-			Remark:            remark,
+			Remark:            "",
 			SchRemark:         remark,
+			TreatmentPlan:     treatment_plan,
 		}
 		err = service.CreateOldPatient(&patients)
 		fmt.Print("报错", err)
@@ -334,8 +336,9 @@ func (this *NewDialysisApiController) SavePatient() {
 			IdCardNo:          idCard,
 			RegistrarsId:      adminInfo.AdminUser.Id,
 			RelativePhone:     relative_phone,
-			Remark:            remark,
+			Remark:            "",
 			SchRemark:         remark,
+			TreatmentPlan:     treatment_plan,
 		}
 		err = service.CreateNewPatient(&patientsNew)
 		key := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patient.ID, 10) + ":patient_info"
@@ -402,8 +405,9 @@ func (this *NewDialysisApiController) SavePatient() {
 					IsInfectious:      is_infectious,
 					IdCardNo:          idCard,
 					EquitmentId:       requipmentId,
-					Remark:            remark,
+					Remark:            "",
 					SchRemark:         remark,
+					TreatmentPlan:     treatment_plan,
 				}
 				err = service.CreateNewPatient(&patientsNew)
 				if err != nil {
@@ -465,7 +469,8 @@ func (this *NewDialysisApiController) SavePatient() {
 								MemberTreatement:  treatmentmethod,
 								RelativePhone:     relative_phone,
 								SchRemark:         remark,
-								Remark:            remark,
+								Remark:            "",
+								TreatmentPlan:     treatment_plan,
 							}
 							err = service.CreateNewPatient(&patientsNew)
 							fmt.Print("报错", err)
@@ -552,8 +557,9 @@ func (this *NewDialysisApiController) SavePatient() {
 					MemberPatienttype: patient_type,
 					MemberTreatement:  treatmentmethod,
 					RelativePhone:     relative_phone,
-					Remark:            remark,
+					Remark:            "",
 					SchRemark:         remark,
+					TreatmentPlan:     treatment_plan,
 				}
 				err = service.CreateNewPatient(&patientsNew)
 				fmt.Print("报错", err)
@@ -1338,6 +1344,8 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 	out_reason := dataBody["out_reason"].(string)
 
 	remark := dataBody["remark"].(string)
+
+	treatment_plan := dataBody["treatment_plan"].(string)
 	fmt.Print(fisttime)
 	//如果是血透病人
 	if bloodPatient == 1 {
@@ -1392,8 +1400,9 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			DeathTime:         death_time,
 			OutReason:         out_reason,
 			RelativePhone:     relative_phone,
-			Remark:            remark,
+			Remark:            "",
 			SchRemark:         remark,
+			TreatmentPlan:     treatment_plan,
 		}
 		err = service.UpdatedPatient(patients, patient.BloodId)
 		key := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patient.BloodId, 10) + ":patient_info"
@@ -1424,8 +1433,9 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			OutReason:         out_reason,
 			DeathTime:         death_time,
 			RelativePhone:     relative_phone,
-			Remark:            remark,
+			Remark:            "",
 			SchRemark:         remark,
+			TreatmentPlan:     treatment_plan,
 		}
 		err = service.UpdateXtPatientNew(patientsNew, id)
 		if err != nil {
@@ -1484,8 +1494,9 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			OutReason:         out_reason,
 			DeathTime:         death_time,
 			RelativePhone:     relative_phone,
-			Remark:            remark,
+			Remark:            "",
 			SchRemark:         remark,
+			TreatmentPlan:     treatment_plan,
 		}
 		err = service.UpdateXtPatientNew(xtPatientsNew, id)
 		fmt.Print("更新失败", err)
@@ -1543,8 +1554,9 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			OutReason:         out_reason,
 			DeathTime:         death_time,
 			RelativePhone:     relative_phone,
-			Remark:            remark,
+			Remark:            "",
 			SchRemark:         remark,
+			TreatmentPlan:     treatment_plan,
 		}
 		err = service.UpdateXtPatientNewOne(patientsNew, id)
 		if err != nil {

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -724,7 +724,8 @@ func (c *StaffScheduleApiController) GetSolutionSchedule() {
 func (c *StaffScheduleApiController) GetAllBedList() {
 
 	orgId := c.GetMobileAdminUserInfo().Org.Id
-	list, _ := service.GetAllBedNumberSix(orgId)
+	partition_id, _ := c.GetInt64("partition_id")
+	list, _ := service.GetAllBedNumberTen(orgId, partition_id)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list": list,
 	})
@@ -744,3 +745,109 @@ func (c *StaffScheduleApiController) ChangeScheduleById() {
 		"msg": "ok",
 	})
 }
+
+func (c *StaffScheduleApiController) ChangeScheduleType() {
+
+	schedule_type, _ := c.GetInt64("schedule_type")
+	schedule_date, _ := c.GetInt64("schedule_date")
+	patient_id, _ := c.GetInt64("patient_id")
+	bed_id, _ := c.GetInt64("bed_id")
+	schedule_week, _ := c.GetInt64("schedule_week")
+	mode_id, _ := c.GetInt64("mode_id")
+	id, _ := c.GetInt64("id")
+	org_id := c.GetMobileAdminUserInfo().Org.Id
+	//查询该班次该床位是否已经存在患者
+	schedule, _ := service.GetScheduleByClassType(schedule_type, schedule_date, bed_id, org_id)
+	//查询该床位所属分区
+	numberlist, _ := service.GetPartionId(bed_id, org_id)
+	//存在
+	if schedule.ID > 0 {
+
+		//调换位置
+		sch := models.Schedule{
+			PatientId: schedule.PatientId,
+			ModeId:    schedule.ModeId,
+		}
+		service.UpdateScheduleById(id, sch)
+
+		schedu := models.Schedule{
+			PatientId: patient_id,
+			ModeId:    mode_id,
+		}
+		service.UpdateScheduleById(schedule.ID, schedu)
+
+	} else {
+		xtSchedule := models.Schedule{
+			UserOrgId:    org_id,
+			PartitionId:  numberlist.ZoneId,
+			BedId:        bed_id,
+			PatientId:    patient_id,
+			ScheduleDate: schedule_date,
+			ScheduleType: schedule_type,
+			ScheduleWeek: schedule_week,
+			ModeId:       mode_id,
+			Status:       1,
+			CreatedTime:  time.Now().Unix(),
+			UpdatedTime:  0,
+			IsExport:     0,
+		}
+		service.CreateSchedule(&xtSchedule)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+}
+
+func (c *StaffScheduleApiController) ChangeScheduleBed() {
+
+	fmt.Println("jin23323232233222323323232")
+	schedule_type, _ := c.GetInt64("schedule_type")
+	schedule_date, _ := c.GetInt64("schedule_date")
+	patient_id, _ := c.GetInt64("patient_id")
+	bed_id, _ := c.GetInt64("bed_id")
+	schedule_week, _ := c.GetInt64("schedule_week")
+	mode_id, _ := c.GetInt64("mode_id")
+	id, _ := c.GetInt64("id")
+	org_id := c.GetMobileAdminUserInfo().Org.Id
+
+	//查询该班次该床位是否已经存在患者
+	schedule, _ := service.GetScheduleByClassType(schedule_type, schedule_date, bed_id, org_id)
+	//查询该床位所属分区
+	numberlist, _ := service.GetPartionId(bed_id, org_id)
+	//存在
+	if schedule.ID > 0 {
+
+		//调换位置
+		sch := models.Schedule{
+			PatientId: schedule.PatientId,
+			ModeId:    schedule.ModeId,
+		}
+		service.UpdateScheduleById(id, sch)
+
+		schedu := models.Schedule{
+			PatientId: patient_id,
+			ModeId:    mode_id,
+		}
+		service.UpdateScheduleById(schedule.ID, schedu)
+	} else {
+		xtSchedule := models.Schedule{
+			UserOrgId:    org_id,
+			PartitionId:  numberlist.ZoneId,
+			BedId:        bed_id,
+			PatientId:    patient_id,
+			ScheduleDate: schedule_date,
+			ScheduleType: schedule_type,
+			ScheduleWeek: schedule_week,
+			ModeId:       mode_id,
+			Status:       1,
+			CreatedTime:  time.Now().Unix(),
+			UpdatedTime:  0,
+			IsExport:     0,
+		}
+		service.DeleteSchedule(id)
+		service.CreateSchedule(&xtSchedule)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+}

controllers/new_mobile_api_controllers/staff_schedule_api_router.go

@@ -30,4 +30,8 @@ func StaffScheduleApiControllersRegisterRouters() {
 	beego.Router("m/api/schedule/getallbedlist", &StaffScheduleApiController{}, "Get:GetAllBedList")
 
 	beego.Router("m/api/schedule/changeschedulebyid", &StaffScheduleApiController{}, "Get:ChangeScheduleById")
+
+	beego.Router("m/api/schedule/changescheduletype", &StaffScheduleApiController{}, "Get:ChangeScheduleType")
+
+	beego.Router("m/api/schedule/changeschedulebed", &StaffScheduleApiController{}, "Get:ChangeScheduleBed")
 }

enums/error_code.go

@@ -262,6 +262,8 @@ const ( // ErrorCode
 	ErrorCodeDeletePChargeWrongTwo = 3900004
 
 	ErrorCodeHisPatientNoRegException = 4000000
+
+	ErrorCodeSchedule = 50000000
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -512,6 +514,7 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeDeletePChargeWrongTwo: "该医嘱所属处方已经收费或已经上传的处方,无法删除",
 
 	ErrorCodeHisPatientNoRegException: "该患者尚未挂号，请先挂号",
+	ErrorCodeSchedule:                 "该班次该床位已有患者",
 }
 
 type SGJError struct {

service/device_service.go

@@ -777,6 +777,12 @@ func GetAllBedNumberSix(orgId int64) (devicenumber []*models.ScheduleDeviceNumbe
 	return devicenumber, err
 }
 
+func GetAllBedNumberTen(orgId int64, zone_id int64) (devicenumber []*models.ScheduleDeviceNumber, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status = 1 and zone_id = ?", orgId, zone_id).Find(&devicenumber).Error
+	return devicenumber, err
+}
+
 func GetAllBedNumberSeven(orgId int64) (devicenumber []*models.SgjDeviceNumber, err error) {
 
 	err = XTReadDB().Where("org_id = ? and status= 1", orgId).Preload("Zone", "status = 1").Find(&devicenumber).Error
@@ -796,3 +802,22 @@ func ChangeDialysisSolution(patient_id int64, schedule_date int64, org_id int64,
 	return err
 
 }
+
+func GetScheduleByClassType(schedule_type int64, schedule_date int64, bed_id int64, user_org_id int64) (models.XtSchedule, error) {
+	schedule := models.XtSchedule{}
+	err := XTReadDB().Where("schedule_type = ? and schedule_date = ? and bed_id = ? and user_org_id = ? and status = 1", schedule_type, schedule_date, bed_id, user_org_id).Find(&schedule).Error
+	return schedule, err
+}
+
+func GetPartionId(bed_id int64, org_id int64) (models.XtDeviceNumber, error) {
+
+	number := models.XtDeviceNumber{}
+	err = XTReadDB().Where("id = ? and status = 1 and org_id = ?", bed_id, org_id).Find(&number).Error
+	return number, err
+}
+
+func UpdateScheduleById(id int64, schedule models.Schedule) error {
+
+	err := XTWriteDB().Model(&models.Schedule{}).Where("id = ? and status =1", id).Update(map[string]interface{}{"patient_id": schedule.PatientId, "mode_id": schedule.ModeId}).Error
+	return err
+}

service/dialysis_solution_service.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"XT_New/models"
+	"fmt"
 	"github.com/jinzhu/gorm"
 )
 
@@ -75,7 +76,7 @@ func GetPatientDialysisSolutionGroupList(keywords string, limit int64, page int6
 	return schedule, total, err
 }
 
-func GetDialysisAdviceTemplateList(keywords string, limit int64, page int64, partition_id int64, schedule_type int64, scheduleDate int64, orgID int64) (schedule []*models.VmBloodSchedule, total int64, err error) {
+func GetDialysisAdviceTemplateList(keywords string, limit int64, page int64, partition_id int64, schedule_type int64, scheduleDate int64, orgID int64, idArray []string) (schedule []*models.VmBloodSchedule, total int64, err error) {
 	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("xt_schedule.status = 1")
 	offset := (page - 1) * limit
 	if scheduleDate > 0 {
@@ -90,6 +91,10 @@ func GetDialysisAdviceTemplateList(keywords string, limit int64, page int64, par
 	if orgID > 0 {
 		db = db.Where("xt_schedule.user_org_id  = ?", orgID)
 	}
+	fmt.Println("idArray23233223323232233232", len(idArray))
+	if len(idArray) > 1 {
+		db = db.Where("xt_schedule.id in(?)", idArray)
+	}
 
 	if len(keywords) > 0 {
 		keywords = "%" + keywords + "%"

service/patient_schedule_template_service.go

@@ -288,18 +288,21 @@ 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 orgID != 9671 && orgID != 10340 {
+		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 shouldUpdateNextSecondWeekSchedules {
+			nextWeek := now.AddDate(0, 0, 14)
+			if updateErr := _updateWeekSchedules(tx, orgID, nextWeek, addTemplateItems, delTemplateItems, changeTemplateItems, devicesMap); updateErr != nil {
+				tx.Rollback()
+				return updateErr
+			}
 		}
 	}
 

service/patientmanage_service.go

@@ -950,21 +950,21 @@ func GetNewPatient(id int64) (models.XtPatientsNew, error) {
 
 func UpdatedPatient(patients models.Patients, id int64) error {
 
-	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone, "remark": patients.Remark, "sch_remark": patients.SchRemark}).Error
+	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone, "remark": patients.Remark, "sch_remark": patients.SchRemark, "treatment_plan": patients.TreatmentPlan}).Error
 
 	return err
 }
 
 func UpdateXtPatientNew(patients models.XtPatientsNew, id int64) error {
 
-	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone, "remark": patients.Remark, "sch_remark": patients.SchRemark}).Error
+	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone, "remark": patients.Remark, "sch_remark": patients.SchRemark, "treatment_plan": patients.TreatmentPlan}).Error
 
 	return err
 }
 
 func UpdateXtPatientNewOne(patients models.XtPatientsNew, id int64) error {
 
-	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "adminssion_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "member_patienttype": patients.MemberPatienttype, "member_treatement": patients.MemberTreatement}).Error
+	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "adminssion_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "member_patienttype": patients.MemberPatienttype, "member_treatement": patients.MemberTreatement, "treatment_plan": patients.TreatmentPlan}).Error
 	return err
 }