diff --git a/app/Services/DutyReportService.php b/app/Services/DutyReportService.php index bf24b29..949b509 100644 --- a/app/Services/DutyReportService.php +++ b/app/Services/DutyReportService.php @@ -1030,7 +1030,7 @@ class DutyReportService 'observable_in' => $observable['observable_in'] ?? $reportDuty->period_start, ], [ 'source_type' => $observable['source_type'] ?? 'mis', - 'original_id' => $observable['original_id'], + 'original_id' => $observable['original_id'] ?? $observable['id'], 'observable_in' => $observable['observable_in'] ?? $reportDuty->period_start, 'observable_out' => $observable['observable_out'] ?? null, 'observable_reason' => $observable['observable_reason'], @@ -1045,8 +1045,8 @@ class DutyReportService 'urgency_id' => $observable['urgency_id'], 'hospital_result_id' => $observable['hospital_result_id'], 'visit_result_id' => $observable['visit_result_id'], - 'comment' => $observable['comment'], - 'user_id' => $observable['user_id'], + 'comment' => $observable['observable_reason'], + 'user_id' => $reportDuty->rf_user_id, ]); }