Несколько отделений для врачей
Поправил подсчет операций Закончил функцию наполнения отчетов
This commit is contained in:
@@ -38,9 +38,9 @@ class LifeMisMigrationPatient extends Model
|
||||
$query->where('rf_kl_VisitResultID', 0)
|
||||
->where('rf_kl_StatCureResultID', 0)
|
||||
->whereBetween('DateIngoing', [$dateRange->startSql(), $dateRange->endSql()])
|
||||
->whereHas('medicalHistory', function ($query) use ($branchId, $dateRange) {
|
||||
$query->whereDate('DateExtract', '1900-01-01');
|
||||
})
|
||||
// ->whereHas('medicalHistory', function ($query) use ($branchId, $dateRange) {
|
||||
// $query->whereDate('DateExtract', '1900-01-01');
|
||||
// })
|
||||
->where('rf_MedicalHistoryID', '<>', 0);
|
||||
|
||||
if ($branchId) {
|
||||
|
||||
@@ -59,6 +59,16 @@ class User extends Authenticatable
|
||||
return $this->belongsTo(Department::class, 'rf_department_id');
|
||||
}
|
||||
|
||||
public function departments()
|
||||
{
|
||||
return $this->hasMany(UserDepartment::class, 'rf_user_id', 'id');
|
||||
}
|
||||
|
||||
public function favoriteDepartment()
|
||||
{
|
||||
return $this->department()->where('is_favorited', true);
|
||||
}
|
||||
|
||||
public function userRoles(): HasMany
|
||||
{
|
||||
return $this->hasMany(UserRole::class, 'rf_user_id', 'id');
|
||||
|
||||
26
app/Models/UserDepartment.php
Normal file
26
app/Models/UserDepartment.php
Normal file
@@ -0,0 +1,26 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class UserDepartment extends Model
|
||||
{
|
||||
public $timestamps = false;
|
||||
|
||||
protected $fillable = [
|
||||
'rf_user_id',
|
||||
'rf_department_id',
|
||||
'is_favorite',
|
||||
];
|
||||
|
||||
public function user()
|
||||
{
|
||||
return $this->belongsTo(User::class, 'rf_user_id');
|
||||
}
|
||||
|
||||
public function department()
|
||||
{
|
||||
return $this->belongsTo(Department::class, 'rf_department_id');
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user