库存调拨修改

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -87,10 +87,9 @@ func (this *DialysisAPIController) Scheduals() {
 	defer redis.Close()
 
 	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
-
+	redis.Set(key, "", time.Second)
 	scheduals_json_str, _ := redis.Get(key).Result()
 
-	redis.Set(key, "", time.Second)
 	patients, _ := service.GetAllPatientListSix(orgID)
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		scheduals, err := service.MobileGetDialysisScheduals(orgID, date.Unix(), schedualType)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3193,13 +3193,13 @@ func (c *PatientApiController) GetPatientMonitor() {
 			//获取所有分区
 			zoneList, _ := service.GetAllZoneByList(orgID)
 			//获取透析处方
-			prescriptions, _ := service.GetAllPrescriptionByList(orgID, theStartTime)
+			prescriptions, _ := service.GetAllPrescriptionByListSix(orgID, theStartTime)
 			//获取透前评估
 			assessmentBefores, _ := service.GetAllAssessmentBeforesByListOne(orgID, theStartTime)
 			//获取上机
 			dialysisOrders, _ := service.GetAllDialysisOrdersByListSix(orgID, theStartTime)
 			//获取透后
-			AssessmentAfterDislysis, _ := service.GetAllAssessmentAfterDislysisByListOne(orgID, theStartTime)
+			AssessmentAfterDislysis, _ := service.GetAllAssessmentAfterDislysisByListSix(orgID, theStartTime)
 
 			//获取透后监测
 			monitorlist, _ := service.GetAllMonitorList(orgID, theStartTime)
@@ -3349,7 +3349,7 @@ func (c *PatientApiController) GetPatientDialysisSolutionList() {
 	return
 }
 
-//GetDoctorAdvices 医嘱列表
+// GetDoctorAdvices 医嘱列表
 func (c *PatientApiController) GetDoctorAdvices() {
 	id, _ := c.GetInt64("id", 0)
 	adviceType, _ := c.GetInt64("advice_type", 0)

controllers/schedule_api_controller.go

@@ -3379,6 +3379,7 @@ func (this *ScheduleApiController) GetNextWeekDayScheduleOne() {
 	}
 
 	schedule, err := service.GetNextWeekDayScheduleSix(week_type, week_time, start_time, end_time, adminUserInfo.CurrentOrgId, zone, theStartTIme)
+	fmt.Println("schedule------------------------------------------------", len(schedule))
 	for _, item := range schedule {
 		order, _ := service.GetLastDialysisOrder(adminUserInfo.CurrentOrgId, item.PatientId, theStartTIme)
 		item.XtDialysisOrderSix = order

service/patient_service.go

@@ -2358,6 +2358,40 @@ func GetAllDialysisOrdersByListSeven(orgID int64, scheduleDate int64) (dialysisO
 	return dialysisOrders, err
 }
 
+func GetAllPrescriptionByListSix(orgID int64, scheduleDate int64) (prescriptions []*models.VMDialysisPrescription, err error) {
+
+	err = readDb.Model(&models.VMDialysisPrescription{}).Where("status= 1 and user_org_id = ? and record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
+	return prescriptions, err
+	//redis := RedisClient()
+	//defer redis.Close()
+	//key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":prescriptions_list_all"
+	//redis.Set(key, "", time.Second)
+	//prescriptions_list_all, _ := redis.Get(key).Result()
+	//
+	//if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+	//	err = readDb.Model(&models.VMDialysisPrescription{}).Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
+	//	if err != nil {
+	//		if err == gorm.ErrRecordNotFound {
+	//			return nil, nil
+	//		} else {
+	//			return nil, err
+	//		}
+	//	} else {
+	//		if len(prescriptions) > 0 {
+	//			//缓存数据
+	//			prescriptions_list_all, err := json.Marshal(&prescriptions)
+	//			if err == nil {
+	//				redis.Set(key, prescriptions_list_all, time.Second*60*60*18)
+	//			}
+	//		}
+	//		return prescriptions, nil
+	//	}
+	//} else { //缓存数据了数据，将redis缓存的json字符串转为map
+	//	json.Unmarshal([]byte(prescriptions_list_all), &prescriptions)
+	//	return prescriptions, nil
+	//}
+}
+
 func GetAllPrescriptionByList(orgID int64, scheduleDate int64) (prescriptions []*models.VMDialysisPrescription, err error) {
 
 	redis := RedisClient()
@@ -2458,6 +2492,40 @@ func GetAllDialysisOrdersByListOne(orgID int64, scheduleDate int64) (dialysisOrd
 	}
 }
 
+func GetAllAssessmentAfterDislysisByListSix(orgID int64, scheduleDate int64) (assessmentAfterDislysis []*models.VMAssessmentAfterDislysis, err error) {
+
+	err = readDb.Model(&models.VMAssessmentAfterDislysis{}).Where("status=1 and user_org_id = ? and assessment_date = ?", orgID, scheduleDate).Find(&assessmentAfterDislysis).Error
+	return assessmentAfterDislysis, err
+	//redis := RedisClient()
+	//defer redis.Close()
+	//key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":assessment_after_dislysis_list_all"
+	//redis.Set(key, "", time.Second)
+	//assessment_after_dislysis__all, _ := redis.Get(key).Result()
+	//
+	//if len(assessment_after_dislysis__all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+	//	err = readDb.Model(&models.VMAssessmentAfterDislysis{}).Where("status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).Find(&assessmentAfterDislysis).Error
+	//	if err != nil {
+	//		if err == gorm.ErrRecordNotFound {
+	//			return nil, nil
+	//		} else {
+	//			return nil, err
+	//		}
+	//	} else {
+	//		if len(assessmentAfterDislysis) > 0 {
+	//			//缓存数据
+	//			assessment_after_dislysis__all, err := json.Marshal(&assessmentAfterDislysis)
+	//			if err == nil {
+	//				redis.Set(key, assessment_after_dislysis__all, time.Second*60*60*18)
+	//			}
+	//		}
+	//		return assessmentAfterDislysis, nil
+	//	}
+	//} else { //缓存数据了数据，将redis缓存的json字符串转为map
+	//	json.Unmarshal([]byte(assessment_after_dislysis__all), &assessmentAfterDislysis)
+	//	return assessmentAfterDislysis, nil
+	//}
+}
+
 func GetAllAssessmentAfterDislysisByListOne(orgID int64, scheduleDate int64) (assessmentAfterDislysis []*models.VMAssessmentAfterDislysis, err error) {
 	redis := RedisClient()
 	defer redis.Close()