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

controllers/dialysis_record_api_controller.go

@@ -806,11 +806,18 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		// 修改了床位逻辑
 		daySchedule, _ := service.GetDaySchedule(adminUserInfo.CurrentOrgId, 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)
+			//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
@@ -828,11 +835,18 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 				} else {
 					daySchedule, _ := service.GetDaySchedule(adminUserInfo.CurrentOrgId, 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)
+						//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
@@ -842,11 +856,18 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 			} else if order_err == gorm.ErrRecordNotFound { //该床位没被占用
 				daySchedule, _ := service.GetDaySchedule(adminUserInfo.CurrentOrgId, 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)
+					//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
@@ -984,6 +1005,20 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 			UpdatedTime:           time.Now().Unix(),
 		}
 
+		//只针对广慈医院
+		if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.CurrentOrgId == 9987 || adminUserInfo.CurrentOrgId == 9526 || template.TemplateId == 32 || adminUserInfo.CurrentOrgId == 9918 || adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 4 {
+			// 查询病人是否有透前评估数据
+			befor, errcode := service.GetAssessmentBefor(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
+			//如果有数据就插入
+			if errcode == nil {
+				record.SystolicBloodPressure = befor.SystolicBloodPressure
+				record.DiastolicBloodPressure = befor.DiastolicBloodPressure
+				record.BreathingRate = befor.BreathingRate
+				record.PulseFrequency = befor.PulseFrequency
+				record.Temperature = befor.Temperature
+			}
+		}
+
 		// 如果当天有插入数据，则不再往透析纪录里插入数据
 		if newdialysisRecord.ID > 0 {
 			err := service.CreateMonitor(&record)
@@ -1375,11 +1410,18 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 			// 修改了床位逻辑
 			daySchedule, _ := service.GetDaySchedule(adminUserInfo.CurrentOrgId, schedulestartTime, scheduleendTime, tempDialysisRecord.PatientId)
 			if daySchedule.ID > 0 {
-				daySchedule.BedId = bedID
-				daySchedule.PartitionId = deviceNumber.ZoneID
-				daySchedule.ScheduleType = schedual_type
-				daySchedule.UpdatedTime = time.Now().Unix()
-				err := service.UpdateSchedule(&daySchedule)
+				//daySchedule.BedId = bedID
+				//daySchedule.PartitionId = deviceNumber.ZoneID
+				//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
@@ -1390,12 +1432,19 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 			if schedule.ID > 0 && schedule.DialysisOrder.ID == 0 { //有排班没上机记录
 				daySchedule, _ := service.GetDaySchedule(adminUserInfo.CurrentOrgId, schedulestartTime, scheduleendTime, tempDialysisRecord.PatientId)
 				if daySchedule.ID > 0 {
-					daySchedule.BedId = bedID
-					daySchedule.PartitionId = deviceNumber.ZoneID
-
-					daySchedule.ScheduleType = schedual_type
-					daySchedule.UpdatedTime = time.Now().Unix()
-					err := service.UpdateSchedule(&daySchedule)
+					//daySchedule.BedId = bedID
+					//daySchedule.PartitionId = deviceNumber.ZoneID
+					//
+					//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

controllers/doctors_api_controller.go

@@ -291,7 +291,6 @@ func (c *DoctorsApiController) UpdatedDryWeightData() {
 		nowTime := time.Now()
 		nowDay := nowTime.Format("2006-01-02")
 		dayTime, _ := time.ParseInLocation("2006-01-02 15:04:05", nowDay+" 00:00:00", loc)
-		fmt.Println("是错2323223322323232323", dayTime.Unix())
 		redis := service.RedisClient()
 		keyTwo := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patientid, 10) + ":last_dry_weight"
 		redis.Set(keyTwo, "", time.Second)
@@ -300,8 +299,11 @@ func (c *DoctorsApiController) UpdatedDryWeightData() {
 			DryWeight:      dry_weight,
 			AssessmentDate: dayTime.Unix(),
 		}
-		errors := service.UpdateDialysisPrescription(patientid, orgid, dryweight, prescription)
-		fmt.Println(errors)
+		if orgid != 10016 || orgid != 9882 {
+			errors := service.UpdateDialysisPrescription(patientid, orgid, dryweight, prescription)
+			fmt.Println(errors)
+		}
+
 		keyThree := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patientid, 10) + ":" + strconv.FormatInt(dayTime.Unix(), 10) + ":assessment_before_dislysis"
 		redis.Set(keyThree, "", time.Second)
 		keyFive := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(dayTime.Unix(), 10) + ":assessment_befores_list_all"
@@ -361,12 +363,14 @@ func (c *DoctorsApiController) UpdatedDryWeightData() {
 		DryWeight:      dry_weight,
 		AssessmentDate: dayTime.Unix(),
 	}
-	errors := service.UpdateDialysisPrescription(patientid, orgid, dryweight, prescription)
+	if orgid != 10016 || orgid != 9882 {
+		errors := service.UpdateDialysisPrescription(patientid, orgid, dryweight, prescription)
+		fmt.Println(errors)
+	}
 	key := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patientid, 10) + ":" + strconv.FormatInt(dayTime.Unix(), 10) + ":assessment_before_dislysis"
 	redis.Set(key, "", time.Second)
 	keySix := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(dayTime.Unix(), 10) + ":assessment_befores_list_all"
 	redis.Set(keySix, "", time.Second)
-	fmt.Println("error", errors)
 	fmt.Println("err", err)
 	redis.Close()
 	c.ServeSuccessJSON(map[string]interface{}{

controllers/drug_stock_api_contorller.go

@@ -719,7 +719,6 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 			if item.WarehousingCount > warehouseInfo.WarehousingCount {
 				total = item.WarehousingCount - warehouseInfo.WarehousingCount
 				item.StockMaxNumber = warehouseInfo.StockMaxNumber + total
-
 				errs = service.UpDateDrugWarehousingInfo(item)
 				if len(drugFlow) > 0 {
 					for _, it := range drugFlow {
@@ -732,7 +731,6 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 
 					}
 				}
-				break
 			}
 
 			// 如果当前的入库数量 小于 历史入库数量
@@ -751,7 +749,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						fmt.Println(parseDateErr)
 					}
 				}
-				break
+
 			}
 
 			if item.WarehousingCount == warehouseInfo.WarehousingCount {
@@ -1923,6 +1921,10 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 			////比较当前出库数量 和 最后一次出库数量,正常出库
 			if max_number <= min_number {
 				errs = service.UpDateDrugWarehouseOutInfo(item)
+				flow := models.DrugFlow{
+					Count: item.Count,
+				}
+				service.UpdateDrugFlowSix(item.WarehouseOutId, item.DrugId, item.WarehouseOutOrderNumber, flow)
 				cha_number = min_number - max_number
 
 				if item.CountUnit == medical.MaxUnit {
@@ -1989,7 +1991,10 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 				if all_number > cha_number {
 
 					errs = service.UpDateDrugWarehouseOutInfo(item)
-
+					flow := models.DrugFlow{
+						Count: item.Count,
+					}
+					service.UpdateDrugFlowSix(item.WarehouseOutId, item.DrugId, item.WarehouseOutOrderNumber, flow)
 					if item.CountUnit == medical.MaxUnit {
 						maxNumber = cha_number / medical.MinNumber
 
@@ -2958,6 +2963,7 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 		var now_count int64
 		var all_count int64
 		for _, item := range upDateCancelStockInfos {
+
 			//查询最后一条退库记录
 			info, _ := service.GetLastCancelStockInfoOne(id, item.DrugId)
 			errs = service.UpDateDrugCancelStockInfo(item)
@@ -3038,6 +3044,11 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 				service.UpdatedDrugFlow(info.CancelStockId, item.DrugId, flow)
 				break
 			}
+
+			//if(item.MaxUnit == info.MaxUnit && item.Count == info.Count){
+			//
+			//  service.UpdateDrugCancelStockInfo(item)
+			//}
 		}
 	}
 

controllers/manage_api_controller.go

@@ -2475,12 +2475,13 @@ func (this *MachineApiController) UpdateForm() {
 	//更新床位号
 	err = service.UpdateAddMacherBedID(equitment_id, orgid, &addmacher)
 	fmt.Println("更新设备失败", err)
+
 	//更新区号
-	deviceNumber := models.DeviceNumber{
-		ZoneID: zone,
-	}
-	err = service.UpdatedZoneID(bednumber, orgid, &deviceNumber)
-	fmt.Println("更新区号失败", err)
+	//deviceNumber := models.DeviceNumber{
+	//	ZoneID: zone,
+	//}
+	//err = service.UpdatedZoneID(bednumber, orgid, &deviceNumber)
+	//fmt.Println("更新区号失败", err)
 	information := models.DeviceInformation{
 		Date:                  startdate,
 		Class:                 classtype,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -428,7 +428,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	}()
 
 	go func() {
-		lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribeByModeId(adminInfo.Org.Id, patientID, schedual.ModeId)
+		lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribeByModeIdSix(adminInfo.Org.Id, patientID, schedual.ModeId)
 
 		ch <- struct{}{}
 	}()
@@ -2078,7 +2078,13 @@ func (this *DialysisAPIController) StartDialysis() {
 			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
@@ -2096,11 +2102,18 @@ func (this *DialysisAPIController) StartDialysis() {
 				} 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)
+						//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
@@ -2110,11 +2123,18 @@ func (this *DialysisAPIController) StartDialysis() {
 			} else if order_err == gorm.ErrRecordNotFound { //该床位没被占用
 				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)
+					//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
@@ -2247,7 +2267,7 @@ func (this *DialysisAPIController) StartDialysis() {
 	}
 
 	//只针对广慈医院
-	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 || template.TemplateId == 32 {
+	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 || template.TemplateId == 32 || adminUserInfo.Org.Id == 9918 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 4 {
 		// 查询病人是否有透前评估数据
 		befor, errcode := service.GetAssessmentBefor(adminUserInfo.Org.Id, patientID, recordDate.Unix())
 		//如果有数据就插入
@@ -2939,11 +2959,18 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 			// 修改了床位逻辑
 			daySchedule, _ := service.GetDaySchedule(adminUserInfo.Org.Id, schedulestartTime, scheduleendTime, tempDialysisRecord.PatientId)
 			if daySchedule.ID > 0 {
-				daySchedule.BedId = bedID
-				daySchedule.PartitionId = deviceNumber.ZoneID
-				daySchedule.ScheduleType = schedual_type
-				daySchedule.UpdatedTime = time.Now().Unix()
-				err := service.UpdateSchedule(&daySchedule)
+				//daySchedule.BedId = bedID
+				//daySchedule.PartitionId = deviceNumber.ZoneID
+				//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
@@ -2954,12 +2981,19 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 			if schedule.ID > 0 && schedule.DialysisOrder.ID == 0 { //有排班没上机记录
 				daySchedule, _ := service.GetDaySchedule(adminUserInfo.Org.Id, schedulestartTime, scheduleendTime, tempDialysisRecord.PatientId)
 				if daySchedule.ID > 0 {
-					daySchedule.BedId = bedID
-					daySchedule.PartitionId = deviceNumber.ZoneID
-
-					daySchedule.ScheduleType = schedual_type
-					daySchedule.UpdatedTime = time.Now().Unix()
-					err := service.UpdateSchedule(&daySchedule)
+					//daySchedule.BedId = bedID
+					//daySchedule.PartitionId = deviceNumber.ZoneID
+					//
+					//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

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -688,12 +688,10 @@ func (c *StaffScheduleApiController) CreateMobileSchedulePatient() {
 	}
 
 	redis := service.RedisClient()
-	defer redis.Close()
 	err = service.CreateSchedule(&schedule)
-
 	key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
 	redis.Set(key, "", time.Second)
-
+	defer redis.Close()
 	fmt.Println(err)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateScheduleFail)

controllers/patient_api_controller.go

@@ -2514,6 +2514,10 @@ func (c *PatientApiController) DeleteDoctorAdvice() {
 
 	err := service.DeleteDoctorAdvice(&advice)
 	redis := service.RedisClient()
+	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
+
+	redis.Set(keyOne, "", time.Second)
+
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
 	redis.Set(key, "", time.Second)
 	redis.Close()
@@ -2556,12 +2560,14 @@ func (c *PatientApiController) DeleteGroupAdvice() {
 	//}
 
 	err := service.DeleteGroupAdvice(adminUserInfo.CurrentOrgId, groupNo, adminUserInfo.AdminUser.Id)
+
 	key := strconv.FormatInt(advice.UserOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 	redis := service.RedisClient()
 
 	redis.Set(key, "", time.Second)
 	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
 	redis.Set(keyOne, "", time.Second)
+
 	defer redis.Close()
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteAdviceFail)

service/auto_create_week_schedules_service.go

@@ -150,6 +150,7 @@ func _refreshWeekSchedulesWithTemplateItems(tx *gorm.DB, orgID int64, week time.
 
 		valueStrs := make([]string, 0, len(templateItems))
 		values := make([]interface{}, 0, len(templateItems)*11)
+
 		for _, item := range templateItems {
 			deviceNumber := deviceNumberMap[item.DeviceNumberID]
 			if deviceNumber == nil {

service/patient_service.go

@@ -2581,7 +2581,8 @@ func GetAllPrescriptionByListOne(orgID int64, scheduleDate int64) (prescriptions
 
 	redis := RedisClient()
 	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":prescriptions_list_all"
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":prescriptions_list_all"
+
 	prescriptions_list_all, _ := redis.Get(key).Result()
 
 	if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis

service/schedule_service.go

@@ -208,6 +208,13 @@ func UpdateSchedule(m *models.Schedule) error {
 	return err
 }
 
+func UpdateScheduleOne(id int64, schedule models.Schedule) error {
+	utx := XTWriteDB().Begin()
+	err := XTWriteDB().Model(&schedule).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"partition_id": schedule.PartitionId, "bed_id": schedule.BedId, "schedule_type": schedule.ScheduleType}).Error
+	utx.Commit()
+	return err
+}
+
 func GetPatientScheduleFormToday(orgId, id, start int64) (schedules []*models.PatientSchedule, err error) {
 
 	err = readDb.Table("xt_schedule as s").

service/stock_service.go

@@ -2193,6 +2193,12 @@ func UpDateDrugWarehouseOutInfo(info *models.DrugWarehouseOutInfo) (err error) {
 	return err
 }
 
+func UpdateDrugFlowSix(warehousoutid int64, drugid int64, warehouse_out_order_number string, flow models.DrugFlow) error {
+
+	err := XTWriteDB().Model(&flow).Where("warehouse_out_id = ? and drug_id = ? and warehouse_out_order_number = ?", warehousoutid, drugid, warehouse_out_order_number).Updates(map[string]interface{}{"count": flow.Count}).Error
+	return err
+}
+
 func FindAllCancelList(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string) (list []*models.CancelStock, total int64, err error) {
 	db := readDb.Model(&models.CancelStock{})
 	db = db.Where("xt_cancel_stock.org_id = ? AND xt_cancel_stock.status = 1 AND xt_cancel_stock.type = ?", orgId, types)
@@ -3004,10 +3010,10 @@ func IsExistDrugByName(drugname string, drugdesc string, orgid int64) (*models.B
 	return &drug, nil
 }
 
-func IsExistDrugByNameOne(drugname string, dosage float64, maxunit string, unival int64, minunit string, packtunit string, orgid int64) (*models.BaseDrugLib, error) {
+func IsExistDrugByNameOne(drugname string, dosage float64, doseunit string, minnumber int64, minunit string, packtunit string, orgid int64) (*models.BaseDrugLib, error) {
 	var drug models.BaseDrugLib
 	var err error
-	err = XTReadDB().Model(&drug).Where("drug_name = ? and dosage = ?  and max_unit = ? and unval = ? and min_unit=? and packing_unit = ? and status =1 and org_id = ?", drugname, dosage, maxunit, unival, minunit, packtunit, orgid).Find(&drug).Error
+	err = XTReadDB().Model(&drug).Where("drug_name = ? and dose = ? and dose_unit = ?   and min_number = ? and min_unit=? and max_unit = ? and status =1 and org_id = ?", drugname, dosage, doseunit, minnumber, minunit, packtunit, orgid).Find(&drug).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -5116,3 +5122,9 @@ func CreatedCancelStock(info models.DrugCancelStockInfo) error {
 	err := XTWriteDB().Create(&info).Error
 	return err
 }
+
+func UpdateDrugCancelStockInfo(info *models.DrugCancelStockInfo) error {
+
+	err := XTWriteDB().Save(&info).Error
+	return err
+}