Merge branch '20220812' of http://git.shengws.com/csx/XT_New into 20220812

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -259,6 +259,75 @@ func (this *StaffScheduleApiController) GetAllZone() {
 	})
 }
 
+func (this *StaffScheduleApiController) GetAllZonePb() {
+	orgid := this.GetMobileAdminUserInfo().Org.Id
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	zoneid, _ := this.GetInt64("zoneid")
+	classtype, _ := this.GetInt64("classtype")
+
+	// is_open, _ := this.GetInt64("is_open")
+
+	
+	//获取空床位的排班数据
+	list, _ := service.GetPatientScheduleByPd(startTime, zoneid, orgid, classtype)
+	if len(list) > 0 {
+		for _, item := range list {
+			for _, device := range item.DeviceNumber {
+				item.TotalBed += 1
+				for _, schedule := range device.Schedule {
+					if schedule.ScheduleType == 1 {
+						item.SwBed += 1
+					}
+					if schedule.ScheduleType == 2 {
+						item.XwBed += 1
+					}
+					if schedule.ScheduleType == 3 {
+						item.WsBed += 1
+					}
+				}
+			}
+		}
+	}
+
+	// stockType, _ := service.GetStockType(orgid)
+	// zonelist, _ := service.GetPatientScheduleListByZone(startTime, classtype, orgid)
+	// if err != nil {
+	// 	this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+	// 	return
+	// }
+	this.ServeSuccessJSON(map[string]interface{}{
+		"schedule":  list,
+		// "stockType": stockType,
+		// "zonelist":  zonelist,
+	})
+	
+
+
+
+	// id := this.GetMobileAdminUserInfo().Org.Id
+	// zone, err := service.GetAllMobileZonePb(id)
+
+	// if err != nil {
+	// 	this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+	// 	return
+	// }
+	// this.ServeSuccessJSON(map[string]interface{}{
+	// 	"zone": zone,
+	// })
+}
+
+
 func (this *StaffScheduleApiController) GetPatientScheduleList() {
 	orgid := this.GetMobileAdminUserInfo().Org.Id
 	fmt.Println("orgid", orgid)

controllers/new_mobile_api_controllers/staff_schedule_api_router.go

@@ -16,6 +16,7 @@ func StaffScheduleApiControllersRegisterRouters() {
 	beego.Router("/m/api/tosearchmobiletotal", &StaffScheduleApiController{}, "Get:ToSearchMobileTotal")
 	beego.Router("/m/api/changemobileoption", &StaffScheduleApiController{}, "Get:ChangeMobileOption")
 	beego.Router("/m/api/getallzone", &StaffScheduleApiController{}, "Get:GetAllZone")
+	beego.Router("/m/api/getallzonepb", &StaffScheduleApiController{}, "Get:GetAllZonePb")
 	beego.Router("/m/api/getpatientschedulelist", &StaffScheduleApiController{}, "Get:GetPatientScheduleList")
 	beego.Router("/m/api/deleteSchedule", &StaffScheduleApiController{}, "Get:DeleteSchedule")
 	beego.Router("/m/api/ssearchpatient", &StaffScheduleApiController{}, "Get:SearchPatient")

service/doctor_schedule_service.go

@@ -588,6 +588,42 @@ func GetAllMobileZone(orgid int64) (zone []*models.DeviceZone, err error) {
 	return zone, err
 }
 
+func GetAllMobileZonePb(orgid int64) (zone []*models.DeviceZonePb, err error) {
+
+	err = XTReadDB().Model(&zone).Preload("DeviceNumber", "status =1").Where("org_id = ? and status = 1", orgid).Find(&zone).Error
+	return zone, err
+}
+
+func GetPatientScheduleByPd(schedule_date int64, zoneid int64, orgid int64, class_type int64) (list []*models.DeviceZonePb, err error) {
+
+	db := XTReadDB().Table("xt_device_zone as x").Where("x.status = 1")
+	if zoneid > 0 {
+		db = db.Where("x.id = ?", zoneid)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if class_type > 0 {
+		err = db.Select("x.id,x.org_id,x.name,x.type,x.sort").Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Model(&models.DeviceNumber{}).Where("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 schedule_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).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+					return db.Where("user_org_id = ? and status = 1", orgid).Group("patient_id,mode_id").Order("created_time asc")
+				})
+			})
+		}).Find(&list).Error
+	} else {
+		err = db.Select("x.id,x.org_id,x.name,x.type,x.sort").Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Model(&models.DeviceNumber{}).Where("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).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+					return db.Where("user_org_id = ? and status = 1", orgid).Group("patient_id,mode_id").Order("created_time asc")
+				})
+			})
+		}).Find(&list).Error
+	}
+
+	return list, err
+}
+
 func GetPatientSchedule(startime int64, zoneid int64, classtype int64, orgid int64) (schedule []*models.ScheduleTwenty, err error) {
 
 	db := XTReadDB().Table("xt_schedule as s")