From c97e9ec544b20ed3276246f2a8cbae17b2c286eb Mon Sep 17 00:00:00 2001
From: Djery-Tom <dietchidjery@gmail.com>
Date: Thu, 13 Jan 2022 16:49:10 +0100
Subject: [PATCH] Add beneficiary_id to health care sheets table v3

---
 .../Controllers/HealthCareSheetController.php     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/HealthCareSheetController.php b/app/Http/Controllers/HealthCareSheetController.php
index a9162ca..4cca885 100755
--- a/app/Http/Controllers/HealthCareSheetController.php
+++ b/app/Http/Controllers/HealthCareSheetController.php
@@ -1029,10 +1029,12 @@ class HealthCareSheetController extends Controller
         $beneficiary_id = $request->input('beneficiary_id');
         $network_agent_id = $request->input('network_agent_id');
 
-        if (!empty($user_id) || !empty($beneficiary_id)) {
+        if (!empty($user_id)) {
             $query = NhInfosHealthCareSheets::where('user_id', $user_id);
             if (!empty($beneficiary_id)) {
                 $query = $query->where('beneficiary_id', $beneficiary_id);
+            } else {
+                $query = $query->whereNull('beneficiary_id');
             }
             if (!empty($network_agent_id)) {
                 $query = $query->where('network_agent_id', $network_agent_id);
@@ -1563,10 +1565,14 @@ class HealthCareSheetController extends Controller
             $sheet->practitioner_provider_class_id = $request->input('practitioner_provider_class_id', $sheet->practitioner_provider_class_id);
 
             if ($sheet->type == HealthCareSheetType::CONSULTATION) {
+                $accident_date = $request->input('accident_date');
+                $pregnancy_start_at = $request->input('pregnancy_start_at');
+                $pregnancy_end_at = $request->input('pregnancy_end_at');
+
                 $sheet->care_condition = $request->input('care_condition', $sheet->care_condition);
-                $sheet->accident_date = $request->input('accident_date', $sheet->accident_date);
-                $sheet->pregnancy_start_at = $request->input('pregnancy_start_at', $sheet->pregnancy_start_at);
-                $sheet->pregnancy_end_at = $request->input('pregnancy_end_at', $sheet->pregnancy_end_at);
+                $sheet->accident_date = !empty($accident_date) ? $accident_date : null;
+                $sheet->pregnancy_start_at = !empty($pregnancy_start_at) ? $pregnancy_start_at : null;
+                $sheet->pregnancy_end_at = !empty($pregnancy_end_at) ? $pregnancy_end_at : null;
                 if (isset($beneficiary)) {
                     $sheet->patient_lastname = $beneficiary->lastname;
                     $sheet->patient_firstname = $beneficiary->firstname;
@@ -1721,6 +1727,7 @@ class HealthCareSheetController extends Controller
     {
         $sheet->state = trans('states.' . $sheet->state);
         $sheet->patient_situation = trans('states.' . $sheet->patient_situation);
+        $sheet->_care_condition = $sheet->care_condition;
         $sheet->care_condition = trans('states.' . $sheet->care_condition);
         foreach ($sheet->performances as $p) {
             $p->amount_formatted = $this->toMoneyWithCurrencyCode($p->amount, $sheet->currency_code);