Browse Source

库存调拨修改

28169 2 years ago
parent
commit
0d22ffd72a
2 changed files with 22 additions and 20 deletions
  1. 13 13
      models/new_monitor.go
  2. 9 7
      service/patient_service.go

+ 13 - 13
models/new_monitor.go View File

57
 }
57
 }
58
 
58
 
59
 type VMDialysisPrescription struct {
59
 type VMDialysisPrescription struct {
60
-	ID                    int64   `gorm:"column:id" json:"id"`
61
-	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id"`
62
-	PatientId             int64   `gorm:"column:patient_id" json:"patient_id"`
63
-	Status                int64   `gorm:"column:status" json:"status"`
64
-	RecordDate            int64   `gorm:"column:record_date" json:"record_date"`
65
-	TargetUltrafiltration float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration"`
66
-
60
+	ID                         int64   `gorm:"column:id" json:"id"`
61
+	UserOrgId                  int64   `gorm:"column:user_org_id" json:"user_org_id"`
62
+	PatientId                  int64   `gorm:"column:patient_id" json:"patient_id"`
63
+	Status                     int64   `gorm:"column:status" json:"status"`
64
+	RecordDate                 int64   `gorm:"column:record_date" json:"record_date"`
65
+	TargetUltrafiltration      float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration"`
67
 	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
66
 	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
68
 	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
67
 	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
69
 	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
68
 	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
91
 }
90
 }
92
 
91
 
93
 type VMAssessmentAfterDislysis struct {
92
 type VMAssessmentAfterDislysis struct {
94
-	ID             int64   `gorm:"column:id" json:"id"`
95
-	UserOrgId      int64   `gorm:"column:user_org_id" json:"user_org_id"`
96
-	PatientId      int64   `gorm:"column:patient_id" json:"patient_id"`
97
-	AssessmentDate int64   `gorm:"column:assessment_date" json:"assessment_date"`
98
-	WeightAfter    float64 `gorm:"column:weight_after" json:"weight_after"`
99
-	Status         int64   `gorm:"column:status" json:"status"`
93
+	ID                    int64   `gorm:"column:id" json:"id"`
94
+	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id"`
95
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id"`
96
+	AssessmentDate        int64   `gorm:"column:assessment_date" json:"assessment_date"`
97
+	WeightAfter           float64 `gorm:"column:weight_after" json:"weight_after"`
98
+	Status                int64   `gorm:"column:status" json:"status"`
99
+	ActualUltrafiltration float64 `gorm:"column:actual_ultrafiltration" json:"actual_ultrafiltration" form:"actual_ultrafiltration"`
100
 }
100
 }
101
 
101
 
102
 func (VMAssessmentAfterDislysis) TableName() string {
102
 func (VMAssessmentAfterDislysis) TableName() string {

+ 9 - 7
service/patient_service.go View File

11
 	"github.com/jinzhu/gorm"
11
 	"github.com/jinzhu/gorm"
12
 )
12
 )
13
 
13
 
14
-//GetPatientList 返回患者的列表
14
+// GetPatientList 返回患者的列表
15
 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) {
15
 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) {
16
 
16
 
17
 	db := readDb.Table("xt_patients as p").Where("p.status=1")
17
 	db := readDb.Table("xt_patients as p").Where("p.status=1")
79
 
79
 
80
 }
80
 }
81
 
81
 
82
-//GetAllPatientList 返回全部患者的列表
82
+// GetAllPatientList 返回全部患者的列表
83
 func GetAllPatientList(orgID int64) (patients []*models.Patients, total int64, err error) {
83
 func GetAllPatientList(orgID int64) (patients []*models.Patients, total int64, err error) {
84
 
84
 
85
 	db := readDb.Table("xt_patients as p").Where("p.user_org_id=? and p.status=1", orgID)
85
 	db := readDb.Table("xt_patients as p").Where("p.user_org_id=? and p.status=1", orgID)
103
 	return patients, err
103
 	return patients, err
104
 }
104
 }
105
 
105
 
106
-//GetAllPatientList 返回全部患者的列表
106
+// GetAllPatientList 返回全部患者的列表
107
 func GetAllPatientListByList(orgID int64) (patients []*models.MSchedualPatientList, err error) {
107
 func GetAllPatientListByList(orgID int64) (patients []*models.MSchedualPatientList, err error) {
108
 	redis := RedisClient()
108
 	redis := RedisClient()
109
 	defer redis.Close()
109
 	defer redis.Close()
557
 	return
557
 	return
558
 }
558
 }
559
 
559
 
560
-//func FindPatientByIdWithDiseases(orgID int64, id int64) (patient models.Patients, err error) {
560
+// func FindPatientByIdWithDiseases(orgID int64, id int64) (patient models.Patients, err error) {
561
 // 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
561
 // 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
562
 // return
562
 // return
563
-//}
563
+// }
564
 func FindPatientByIdWithDiseases(orgID int64, id int64) (patient models.Patients, err error) {
564
 func FindPatientByIdWithDiseases(orgID int64, id int64) (patient models.Patients, err error) {
565
 	redis := RedisClient()
565
 	redis := RedisClient()
566
 	defer redis.Close()
566
 	defer redis.Close()
919
 	return
919
 	return
920
 }
920
 }
921
 
921
 
922
-//GetPatientDialysisSolutionList 返回患者透析方案的列表
922
+// GetPatientDialysisSolutionList 返回患者透析方案的列表
923
 func GetPatientDialysisSolutionList(orgID int64, patientID int64, page, limit int64) (solutions []*models.DialysisSolution, total int64, err error) {
923
 func GetPatientDialysisSolutionList(orgID int64, patientID int64, page, limit int64) (solutions []*models.DialysisSolution, total int64, err error) {
924
 
924
 
925
 	offset := (page - 1) * limit
925
 	offset := (page - 1) * limit
964
 	return
964
 	return
965
 }
965
 }
966
 
966
 
967
-//GetPatientDryWeightAdjustList 返回患者调整干体重的列表
967
+// GetPatientDryWeightAdjustList 返回患者调整干体重的列表
968
 func GetPatientDryWeightAdjustList(orgID int64, patientID int64, page int64, limit int64) (weights []*models.DryWeightAdjust, total int64, err error) {
968
 func GetPatientDryWeightAdjustList(orgID int64, patientID int64, page int64, limit int64) (weights []*models.DryWeightAdjust, total int64, err error) {
969
 	db := readDb.Table("xt_dry_weight_adjust as dwa").Where("dwa.status=1")
969
 	db := readDb.Table("xt_dry_weight_adjust as dwa").Where("dwa.status=1")
970
 	if orgID > 0 {
970
 	if orgID > 0 {
2363
 	redis := RedisClient()
2363
 	redis := RedisClient()
2364
 	defer redis.Close()
2364
 	defer redis.Close()
2365
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":prescriptions_list_all"
2365
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":prescriptions_list_all"
2366
+	redis.Set(key, "", time.Second)
2366
 	prescriptions_list_all, _ := redis.Get(key).Result()
2367
 	prescriptions_list_all, _ := redis.Get(key).Result()
2367
 
2368
 
2368
 	if len(prescriptions_list_all) == 0 { //没有到缓存数据,从数据库中获取数据,进行缓存到redis
2369
 	if len(prescriptions_list_all) == 0 { //没有到缓存数据,从数据库中获取数据,进行缓存到redis
2461
 	redis := RedisClient()
2462
 	redis := RedisClient()
2462
 	defer redis.Close()
2463
 	defer redis.Close()
2463
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":assessment_after_dislysis_list_all"
2464
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":assessment_after_dislysis_list_all"
2465
+	redis.Set(key, "", time.Second)
2464
 	assessment_after_dislysis__all, _ := redis.Get(key).Result()
2466
 	assessment_after_dislysis__all, _ := redis.Get(key).Result()
2465
 
2467
 
2466
 	if len(assessment_after_dislysis__all) == 0 { //没有到缓存数据,从数据库中获取数据,进行缓存到redis
2468
 	if len(assessment_after_dislysis__all) == 0 { //没有到缓存数据,从数据库中获取数据,进行缓存到redis