Добавлено сохранение правок поверх МИС
Добавлено версионирование сохраненных правок Добавлено сохранение отчета мед. сестры
This commit is contained in:
@@ -4,14 +4,16 @@ namespace App\Http\Controllers\Api;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\MedicalHistory;
|
||||
use App\Models\MedicalHistoryCorrection;
|
||||
use App\Models\MedicalHistoryNurse;
|
||||
use App\Models\UnifiedMedicalHistory;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class NurseController extends Controller
|
||||
{
|
||||
public function getPatient($id, Request $request)
|
||||
{
|
||||
return MedicalHistory::where('id', $id)->first();
|
||||
return UnifiedMedicalHistory::where('id', $id)->first();
|
||||
}
|
||||
|
||||
public function searchPatients(Request $request)
|
||||
@@ -54,4 +56,31 @@ class NurseController extends Controller
|
||||
'data' => $result,
|
||||
], 201);
|
||||
}
|
||||
|
||||
public function storeCorrection($id, Request $request)
|
||||
{
|
||||
$data = $request->validate([
|
||||
'medical_card_number' => 'nullable',
|
||||
'full_name' => 'nullable',
|
||||
'birth_date' => 'nullable',
|
||||
'recipient_date' => 'nullable',
|
||||
'extract_date' => 'nullable',
|
||||
'death_date' => 'nullable',
|
||||
'male' => 'nullable',
|
||||
'urgency_id' => 'nullable',
|
||||
'hospital_result_id' => 'nullable',
|
||||
'visit_result_id' => 'nullable',
|
||||
'mis_user_id' => 'nullable',
|
||||
'comment' => 'nullable',
|
||||
]);
|
||||
|
||||
$data['medical_history_id'] = $id;
|
||||
$data['user_id'] = auth()->user()->id;
|
||||
|
||||
$result = MedicalHistoryCorrection::create($data);
|
||||
|
||||
return response()->json([
|
||||
'data' => $result,
|
||||
], 201);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Web;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Department;
|
||||
use App\Services\DateRangeService;
|
||||
use App\Services\MedicalHistoryService;
|
||||
use App\Services\UnifiedMedicalHistoryService;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Inertia\Inertia;
|
||||
@@ -14,7 +14,7 @@ class NurseReportController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
protected DateRangeService $dateRangeService,
|
||||
protected MedicalHistoryService $medicalHistoryService
|
||||
protected UnifiedMedicalHistoryService $unifiedMedicalHistoryService
|
||||
)
|
||||
{}
|
||||
|
||||
@@ -30,11 +30,11 @@ class NurseReportController extends Controller
|
||||
$department = Department::where('department_id', $departmentId)->firstOrFail();
|
||||
$dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user);
|
||||
|
||||
$inDepartmentHistories = $this->medicalHistoryService->getDepartmentHistories($dateRange, $department->rf_mis_department_id);
|
||||
$recipientHistories = $this->medicalHistoryService->getRecipientHistories($dateRange, $department->rf_mis_department_id);
|
||||
$dischargedHistories = $this->medicalHistoryService->getDischargedHistories($dateRange, $department->rf_mis_department_id);
|
||||
$deceasedHistories = $this->medicalHistoryService->getDeceasedHistories($dateRange, $department->rf_mis_department_id);
|
||||
$transferredHistories = $this->medicalHistoryService->getTransferredHistories($dateRange, $department->rf_mis_department_id);
|
||||
$inDepartmentHistories = $this->unifiedMedicalHistoryService->getDepartmentHistories($dateRange, $department->rf_mis_department_id);
|
||||
$recipientHistories = $this->unifiedMedicalHistoryService->getRecipientHistories($dateRange, $department->rf_mis_department_id);
|
||||
$dischargedHistories = $this->unifiedMedicalHistoryService->getDischargedHistories($dateRange, $department->rf_mis_department_id);
|
||||
$deceasedHistories = $this->unifiedMedicalHistoryService->getDeceasedHistories($dateRange, $department->rf_mis_department_id);
|
||||
$transferredHistories = $this->unifiedMedicalHistoryService->getTransferredHistories($dateRange, $department->rf_mis_department_id);
|
||||
|
||||
return Inertia::render('Nurse/Report/Index', [
|
||||
'inDepartmentHistories' => $inDepartmentHistories,
|
||||
|
||||
Reference in New Issue
Block a user