11月8日库存管理

models/device_models.go

@@ -393,18 +393,19 @@ type Schedules struct {
 }
 
 type XtSchedule struct {
-	ID           int64 `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
-	BedId        int64 `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
-	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
-	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
-	ModeId       int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
-	Status       int64 `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime  int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	ID              int64                   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId       int64                   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId     int64                   `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId           int64                   `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId       int64                   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate    int64                   `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType    int64                   `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek    int64                   `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId          int64                   `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status          int64                   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime     int64                   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime     int64                   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	LastAfterWeight AssessmentAfterDislysis `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
 }
 
 func (XtSchedule) TableName() string {

models/schedule_models.go

@@ -197,6 +197,7 @@ type VmSchedulesRemind struct {
 	HisDoctorAdviceInfo        []*HisDoctorAdviceInfo     `json:"hisdoctoradviceinfo" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId;"`
 	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	LastAfterWeight            AssessmentAfterDislysis    `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
 }
 
 func (VmSchedulesRemind) TableName() string {

service/schedule_service.go

@@ -609,6 +609,8 @@ func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType in
 		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", scheduleDate).Preload("DialysisPrescription", "status = 1 and record_date =?", scheduleDate).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1").Order("id asc")
+	}).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, scheduleDate)
 	}).Find(&list).Error
 
 	return list, err
@@ -634,6 +636,8 @@ func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int
 		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", scheduleDate).Preload("DialysisPrescription", "status = 1 and record_date = ?", scheduleDate).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1").Order("id asc")
+	}).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, scheduleDate)
 	}).Find(&list).Error
 
 	return list, err
@@ -987,6 +991,8 @@ func GetDataPrint(orgid int64) (models.XtDataPrint, error) {
 
 func GetNextWeekPanels(startime int64, endtime int64, orgid int64) (schedule []*models.XtSchedule, err error) {
 
-	err = XTReadDB().Model(&schedule).Where("schedule_date >=? and schedule_date<=? and status = 1 and user_org_id = ?", startime, endtime, orgid).Find(&schedule).Error
+	err = XTReadDB().Model(&schedule).Where("schedule_date >=? and schedule_date<=? and status = 1 and user_org_id = ?", startime, endtime, orgid).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, endtime)
+	}).Find(&schedule).Error
 	return schedule, err
 }