历史排班

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -118,6 +118,8 @@ func (this *DialysisAPIController) Scheduals() {
 
 				hisAdvices, _ := service.GetAllHisAdvicesByList(orgID, date.Unix())
 				inforMation, _ := service.GetTodayInforMation(orgID, date.Unix())
+
+				//monitor, _ := service.GetMonitorByListSix(orgID, date.Unix())
 				for key, item := range scheduals {
 
 					for _, infor := range inforMation {
@@ -204,6 +206,14 @@ func (this *DialysisAPIController) Scheduals() {
 							break
 						}
 					}
+
+					////	监测
+					//scheduals[key].VMMonitoringRecord = make([]models.VMMonitoringRecord, 0)
+					//for _, moni := range monitor {
+					//	if item.PatientId == moni.PatientId {
+					//		scheduals[key].VMMonitoringRecord = append(scheduals[key].VMMonitoringRecord, moni)
+					//	}
+					//}
 				}
 				//缓存数据
 				scheduals_json, err := json.Marshal(&scheduals)

models/new_monitor.go

@@ -117,6 +117,11 @@ type VMMonitoringRecord struct {
 	Status                 int64   `gorm:"column:status" json:"status"`
 	AccumulatedBloodVolume float64 `gorm:"column:accumulated_blood_volume" json:"accumulated_blood_volume" form:"accumulated_blood_volume"`
 	UltrafiltrationVolume  float64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume" form:"ultrafiltration_volume"`
+	VenousPressure         float64 `gorm:"column:venous_pressure" json:"venous_pressure" form:"venous_pressure"`
+	ArterialPressure       float64 `gorm:"column:arterial_pressure" json:"arterial_pressure" form:"arterial_pressure"`
+	BloodOxygenSaturation  string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
+	Dispose                string  `gorm:"column:dispose" json:"dispose" form:"dispose"`
+	Result                 string  `gorm:"column:result" json:"result" form:"result"`
 }
 
 func (VMMonitoringRecord) TableName() string {

service/manage_service.go

@@ -768,7 +768,7 @@ func QueryInfo(bed int64, start int64, end int64, orgId int64, limit int64, page
 	}
 	offset := (page - 1) * limit
 
-	err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Order("x.ctime desc").Offset(offset).Limit(limit).Scan(&infor).Error
+	err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Order("x.date desc").Offset(offset).Limit(limit).Scan(&infor).Error
 	if err != nil {
 
 		return

service/mobile_dialysis_service.go

@@ -159,6 +159,7 @@ type MDialysisScheduleVMForList struct {
 	DialysisSolution         *models.DialysisSolution          `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"dialysis_solution"`
 	DoubleCheck              *models.DoubleCheck               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dobule_check"`
 	NewDeviceInformation     *NewDeviceInformation             `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"device_information"`
+	//VMMonitoringRecord       []models.VMMonitoringRecord       `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitor_record"`
 }
 
 func (MDialysisScheduleVMForList) TableName() string {

service/patient_service.go

@@ -153,6 +153,12 @@ func GetAllDevicetByListSix(orgID int64) (devices []*models.MDeviceNumberForList
 	return devices, err
 }
 
+func GetMonitorByListSix(orgID int64, monitor_date int64) (monitor []models.VMMonitoringRecord, err error) {
+
+	err = readDb.Where("user_org_id = ? and monitor_date = ? and status =1", orgID, monitor_date).Find(&monitor).Error
+	return monitor, err
+}
+
 func GetAllDevicetByList(orgID int64) (devices []*models.MDeviceNumberForList, err error) {
 	redis := RedisClient()
 	defer redis.Close()

service/schedule_service.go

@@ -1718,3 +1718,10 @@ func CreateNewSchedule(schedule models.XtSchedule) error {
 
 	return err
 }
+
+func GetNumberListById(id int64, org_id int64) (number []*models.DeviceNumber, err error) {
+
+	err = XTReadDB().Where("zone_id = ? and org_id = ? and status= 1", id, org_id).Find(&number).Error
+
+	return number, err
+}