11月8日库存管理

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -293,7 +293,7 @@ func (this *StaffScheduleApiController) GetPatientScheduleList() {
 	}
 	if is_open == 1 {
 		//获取空床位的排班数据
-		list, err := service.GetPatientScheduleByBed(startTime, zoneid, orgid)
+		list, err := service.GetPatientScheduleByBed(startTime, zoneid, orgid, classtype)
 		stockType, _ := service.GetStockType(orgid)
 		if err != nil {
 			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")

service/doctor_schedule_service.go

@@ -598,7 +598,7 @@ func GetPatientSchedule(startime int64, zoneid int64, classtype int64, orgid int
 	return schedule, err
 }
 
-func GetPatientScheduleByBed(schedule_date int64, zoneid int64, orgid int64) (list []*models.PatientDeviceNumber, err error) {
+func GetPatientScheduleByBed(schedule_date int64, zoneid int64, orgid int64, class_type int64) (list []*models.PatientDeviceNumber, err error) {
 
 	db := XTReadDB().Table("xt_device_number as x").Where("x.status = 1")
 	if zoneid > 0 {
@@ -607,9 +607,15 @@ 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("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 and dialysis_date = ?", schedule_date).Preload("BloodDialysisPrescription", "status = 1 and record_date = ?", schedule_date)
-	}).Find(&list).Error
+	if class_type > 0 {
+		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 = ? and class_type = ?", orgid, schedule_date, class_type).Preload("VmBloodPatients", "status = 1 and user_org_id = ?", orgid).Preload("BloodDialysisOrder", "status = 1 and dialysis_date = ?", schedule_date).Preload("BloodDialysisPrescription", "status = 1 and record_date = ?", schedule_date)
+		}).Find(&list).Error
+	} else {
+		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 and dialysis_date = ?", schedule_date).Preload("BloodDialysisPrescription", "status = 1 and record_date = ?", schedule_date)
+		}).Find(&list).Error
+	}
 
 	return list, err
 }