耗材参数

service/statistics_service/index_evaluation_service.go

@@ -1420,6 +1420,8 @@ func GetNurseWorkloadTableData(user_org_id int64, start_time int64, end_time int
 		var TotalFive int64
 		var TotalSix int64
 		var TotalSeven int64
+		var TotalEghit int64
+		var TotalNight int64
 		//db.Raw("select count(*) as total from  (select d.patient_id as patient, d.id, d.`assessment_date` as date,config.name as name from  xt_assessment_before_dislysis as d  JOIN `xt_data_config` config on  d.`blood_access_part_opera_id` = config.value AND config.org_id = ? AND config.parent_id = ? AND FIND_IN_SET('内瘘',config.name) > 0 Where d.user_org_id = ? AND d.assessment_date >=? AND d.assessment_date <= ?  Group by d.id)  b JOIN `xt_dialysis_order`  on xt_dialysis_order.`dialysis_date` = b.date AND xt_dialysis_order.user_org_id = ? AND xt_dialysis_order.status = 1  AND xt_dialysis_order.start_nurse = ? AND xt_dialysis_order.dialysis_date >= ? AND xt_dialysis_order.dialysis_date <= ? ", user_org_id, tempConfig.ID, user_org_id, start_time, end_time, user_org_id, item.AdminUserId, start_time, end_time).Count(&Total)
 		//db.Raw("select count(*) as total_one from  (select d.patient_id as patient, d.id, d.`assessment_date` as date,config.name as name from  xt_assessment_before_dislysis as d  JOIN `xt_data_config` config on  d.`blood_access_part_opera_id` = config.value AND config.org_id = ? AND config.parent_id = ? AND FIND_IN_SET('导管',config.name) > 0 Where  d.user_org_id = ?  AND d.assessment_date >=? AND d.assessment_date <= ?  Group by d.id)  b JOIN `xt_dialysis_order`  on xt_dialysis_order.`dialysis_date` = b.date AND xt_dialysis_order.user_org_id = ? AND xt_dialysis_order.status = 1  AND xt_dialysis_order.start_nurse = ? AND xt_dialysis_order.dialysis_date >= ? AND xt_dialysis_order.dialysis_date <= ? ", user_org_id, tempConfig.ID, user_org_id, start_time, end_time, user_org_id, item.AdminUserId, start_time, end_time).Count(&TotalOne)
 		db.Table("xt_monitoring_record as monitor ").Joins("join xt_schedule sch On sch.schedule_date = monitor.monitoring_date AND sch.patient_id = monitor.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("monitor.user_org_id = ? AND monitor.status = 1 AND monitor.monitoring_nurse = ? AND monitor.monitoring_date >= ? AND monitor.monitoring_date <= ?", user_org_id, item.AdminUserId, start_time, end_time).Count(&TotalTwo)
@@ -1430,6 +1432,8 @@ func GetNurseWorkloadTableData(user_org_id int64, start_time int64, end_time int
 		db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND o.difficult_puncture_nurse = ?", user_org_id, start_time, end_time, item.AdminUserId).Count(&TotalFive)
 		db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND o.new_fistula_nurse = ?", user_org_id, start_time, end_time, item.AdminUserId).Count(&TotalSix)
 		db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND o.start_nurse = ?", user_org_id, start_time, end_time, item.AdminUserId).Count(&TotalSeven)
+		db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND o.finish_nurse = ?", user_org_id, start_time, end_time, item.AdminUserId).Count(&TotalEghit)
+		db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND o.washpipe_nurse = ?", user_org_id, start_time, end_time, item.AdminUserId).Count(&TotalNight)
 
 		item.PunctureCount = Total
 		item.CureCount = TotalTwo
@@ -1438,6 +1442,8 @@ func GetNurseWorkloadTableData(user_org_id int64, start_time int64, end_time int
 		item.DiffiCultPuntureNuserCount = TotalFive
 		item.NewNuserCount = TotalSix
 		item.StartNuserCount = TotalSeven
+		item.FinshNurserCount = TotalEghit
+		item.WashpipeNurserCount = TotalNight
 	}
 
 	if err != nil {

service/statistics_service/index_models.go

@@ -142,6 +142,8 @@ type VMUserAdminRole struct {
 	DiffiCultPuntureNuserCount int64 `gorm:"-" json:"difficult_nuser_count" `
 	NewNuserCount              int64 `gorm:"-" json:"new_nuser_count" `
 	StartNuserCount            int64 `gorm:"-" json:"start_nuser_count" `
+	WashpipeNurserCount        int64 `gorm:"-" json:"washpipe_nuser_count" `
+	FinshNurserCount           int64 `gorm:"-" json:"finish_nuser_count" `
 
 	PRatio      string `gorm:"-" json:"p_ratio"`
 	CourseRatio string `gorm:"-" json:"course_ratio" `
@@ -156,6 +158,8 @@ type VMUserAdminRole struct {
 	DiffiCultNuserRatio string `gorm:"-" json:"difficult_nurse_ratio" `
 	NewNuserRatio       string `gorm:"-" json:"new_nurse_ratio" `
 	StartNuserRatio     string `gorm:"-" json:"start_nurse_ratio" `
+	WashpipeNurseRatio  string `gorm:"-" json:"washpipe_nurse_ratio" `
+	FinshNurseRatio     string `gorm:"-" json:"finish_nurse_ratio" `
 }
 
 func (VMUserAdminRole) TableName() string {