11月8日库存管理

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 #

models/device_models.go

@@ -1056,16 +1056,17 @@ type VmXtSchedule struct {
 }
 
 type PatientDeviceNumber struct {
-	ID       int64           `gorm:"column:id" json:"id" form:"id"`
-	OrgId    int64           `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Number   string          `gorm:"column:number" json:"number" form:"number"`
-	GroupId  int64           `gorm:"column:group_id" json:"group_id" form:"group_id"`
-	ZoneId   int64           `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
-	Status   int64           `gorm:"column:status" json:"status" form:"status"`
-	Ctime    int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime    int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Sort     int64           `gorm:"column:sort" json:"sort" form:"sort"`
-	Schedule []*BlodSchedule `json:"schedule" gorm:"foreignkey:BedId;AssociationForeignKey:ID;"`
+	ID         int64           `gorm:"column:id" json:"id" form:"id"`
+	OrgId      int64           `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Number     string          `gorm:"column:number" json:"number" form:"number"`
+	GroupId    int64           `gorm:"column:group_id" json:"group_id" form:"group_id"`
+	ZoneId     int64           `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
+	Status     int64           `gorm:"column:status" json:"status" form:"status"`
+	Ctime      int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime      int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Sort       int64           `gorm:"column:sort" json:"sort" form:"sort"`
+	DeviceZone DeviceZone      `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:ZoneId;"`
+	Schedule   []*BlodSchedule `json:"schedule" gorm:"foreignkey:BedId;AssociationForeignKey:ID;"`
 }
 
 func (PatientDeviceNumber) TableName() string {

service/doctor_schedule_service.go

@@ -607,7 +607,7 @@ func GetPatientScheduleByBed(schedule_date int64, zoneid int64, orgid int64) (li
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.number,x.sort,x.group_id,x.zone_id,x.sort").Preload("Schedule", func(db *gorm.DB) *gorm.DB {
+	err = db.Select("x.id,x.number,x.sort,x.group_id,x.zone_id,x.sort").Preload("DeviceZone", "status = 1").Preload("Schedule", func(db *gorm.DB) *gorm.DB {
 		return XTReadDB().Model(&models.BlodSchedule{}).Where("status = 1 AND user_org_id = ? and schedule_date = ?", orgid, schedule_date).Preload("VmBloodPatients", "status = 1 and user_org_id = ?", orgid).Preload("BloodDialysisOrder", "status = 1").Preload("BloodDialysisPrescription", "status = 1")
 	}).Find(&list).Error