库存调拨修改

models/new_monitor.go

@@ -57,13 +57,12 @@ func (VMMonitorDialysisOrder) TableName() string {
 }
 
 type VMDialysisPrescription struct {
-	ID                    int64   `gorm:"column:id" json:"id"`
-	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId             int64   `gorm:"column:patient_id" json:"patient_id"`
-	Status                int64   `gorm:"column:status" json:"status"`
-	RecordDate            int64   `gorm:"column:record_date" json:"record_date"`
-	TargetUltrafiltration float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration"`
-
+	ID                         int64   `gorm:"column:id" json:"id"`
+	UserOrgId                  int64   `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId                  int64   `gorm:"column:patient_id" json:"patient_id"`
+	Status                     int64   `gorm:"column:status" json:"status"`
+	RecordDate                 int64   `gorm:"column:record_date" json:"record_date"`
+	TargetUltrafiltration      float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration"`
 	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
 	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
 	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
@@ -91,12 +90,13 @@ func (VMPredialysisEvaluation) TableName() string {
 }
 
 type VMAssessmentAfterDislysis struct {
-	ID             int64   `gorm:"column:id" json:"id"`
-	UserOrgId      int64   `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId      int64   `gorm:"column:patient_id" json:"patient_id"`
-	AssessmentDate int64   `gorm:"column:assessment_date" json:"assessment_date"`
-	WeightAfter    float64 `gorm:"column:weight_after" json:"weight_after"`
-	Status         int64   `gorm:"column:status" json:"status"`
+	ID                    int64   `gorm:"column:id" json:"id"`
+	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id"`
+	AssessmentDate        int64   `gorm:"column:assessment_date" json:"assessment_date"`
+	WeightAfter           float64 `gorm:"column:weight_after" json:"weight_after"`
+	Status                int64   `gorm:"column:status" json:"status"`
+	ActualUltrafiltration float64 `gorm:"column:actual_ultrafiltration" json:"actual_ultrafiltration" form:"actual_ultrafiltration"`
 }
 
 func (VMAssessmentAfterDislysis) TableName() string {

service/patient_service.go

@@ -11,7 +11,7 @@ import (
 	"github.com/jinzhu/gorm"
 )
 
-//GetPatientList 返回患者的列表
+// GetPatientList 返回患者的列表
 func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bindingState, lapseto, source, startTime, endTime, contagion, reimbursementWay, isscheduling, isprescription int64, isStartTime, isEndTime bool) (patients []*models.Patients, total int64, err error) {
 
 	db := readDb.Table("xt_patients as p").Where("p.status=1")
@@ -79,7 +79,7 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 
 }
 
-//GetAllPatientList 返回全部患者的列表
+// GetAllPatientList 返回全部患者的列表
 func GetAllPatientList(orgID int64) (patients []*models.Patients, total int64, err error) {
 
 	db := readDb.Table("xt_patients as p").Where("p.user_org_id=? and p.status=1", orgID)
@@ -103,7 +103,7 @@ func GetAllPatientListSix(orgID int64) (patients []*models.MSchedualPatientList,
 	return patients, err
 }
 
-//GetAllPatientList 返回全部患者的列表
+// GetAllPatientList 返回全部患者的列表
 func GetAllPatientListByList(orgID int64) (patients []*models.MSchedualPatientList, err error) {
 	redis := RedisClient()
 	defer redis.Close()
@@ -557,10 +557,10 @@ func FindPatientByIdTwo(orgID int64, id int64) (patient models.XtPatientsNew, er
 	return
 }
 
-//func FindPatientByIdWithDiseases(orgID int64, id int64) (patient models.Patients, err error) {
+// func FindPatientByIdWithDiseases(orgID int64, id int64) (patient models.Patients, err error) {
 // err = readDb.Model(&models.Patients{}).Preload("Contagions", "status = 1").Preload("Diseases", "status = 1").Where("id = ? and user_org_id=? and status=1", id, orgID).First(&patient).Error
 // return
-//}
+// }
 func FindPatientByIdWithDiseases(orgID int64, id int64) (patient models.Patients, err error) {
 	redis := RedisClient()
 	defer redis.Close()
@@ -919,7 +919,7 @@ func UpdatePatientDialysisSolution(solution *models.DialysisSolution) (err error
 	return
 }
 
-//GetPatientDialysisSolutionList 返回患者透析方案的列表
+// GetPatientDialysisSolutionList 返回患者透析方案的列表
 func GetPatientDialysisSolutionList(orgID int64, patientID int64, page, limit int64) (solutions []*models.DialysisSolution, total int64, err error) {
 
 	offset := (page - 1) * limit
@@ -964,7 +964,7 @@ func GetPatientDialysisSolutionList(orgID int64, patientID int64, page, limit in
 	return
 }
 
-//GetPatientDryWeightAdjustList 返回患者调整干体重的列表
+// GetPatientDryWeightAdjustList 返回患者调整干体重的列表
 func GetPatientDryWeightAdjustList(orgID int64, patientID int64, page int64, limit int64) (weights []*models.DryWeightAdjust, total int64, err error) {
 	db := readDb.Table("xt_dry_weight_adjust as dwa").Where("dwa.status=1")
 	if orgID > 0 {
@@ -2363,6 +2363,7 @@ func GetAllPrescriptionByList(orgID int64, scheduleDate int64) (prescriptions []
 	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
@@ -2461,6 +2462,7 @@ func GetAllAssessmentAfterDislysisByListOne(orgID int64, scheduleDate int64) (as
 	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