diff --git a/Modules/Client/Http/Controllers/Api/CorporateMemberController.php b/Modules/Client/Http/Controllers/Api/CorporateMemberController.php
index 14acd29a..b113a246 100644
--- a/Modules/Client/Http/Controllers/Api/CorporateMemberController.php
+++ b/Modules/Client/Http/Controllers/Api/CorporateMemberController.php
@@ -222,7 +222,7 @@ class CorporateMemberController extends Controller
'requestLogBenefits:id,request_log_id,benefit_id,amount_incurred,amount_approved,amount_not_approved,excess_paid,keterangan' => [
'benefit'
],
- 'requestLogDailyMonitorings:id,request_log_id,submission_date,subject,body_temperature,sistole,diastole,respiration_rate,analysis,lab_date,provider,examination' => [
+ 'requestLogDailyMonitorings:id,request_log_id,submission_date,subject,object,body_temperature,sistole,diastole,respiration_rate,analysis,lab_date,provider,examination' => [
'requestLogMedicalPlans:request_log_daily_monitoring_id,plan,type',
// 'document'
],
diff --git a/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php b/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php
index 22933443..0a19f4ce 100644
--- a/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php
+++ b/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php
@@ -141,6 +141,7 @@ class DataServiceMonitoring extends JsonResource
'time' => Carbon::parse($requestLogDailyMonitoring->submission_date)->format('H:i') ?? null,
'status' => 'Done' ?? null,
'subject' => $requestLogDailyMonitoring->subject ?? null,
+ 'object' => $requestLogDailyMonitoring->object ?? null,
'bodyTemperature' => $requestLogDailyMonitoring->body_temperature ?? null,
'sistole' => $requestLogDailyMonitoring->sistole . 'mm[Hg]' ?? null,
'diastole' => $requestLogDailyMonitoring->diastole . 'mm[Hg]' ?? null,
diff --git a/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php b/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
index 763d189a..9805bc73 100644
--- a/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
+++ b/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
@@ -102,7 +102,7 @@ class DailyMonitoringController extends Controller
{
// get id request log
$request_logs = DB::table('request_logs')
- ->select('id')
+ ->select('id','organization_id')
->where('code', $request_code)
->first();
@@ -115,6 +115,7 @@ class DailyMonitoringController extends Controller
'message' => "success",
'data' => [
'detail_list'=> $detail_list,
+ 'organization_id' => $request_logs->organization_id
]
],200);
}
@@ -164,6 +165,7 @@ class DailyMonitoringController extends Controller
$db_response = DailyMonitoring::create([
'claim_id' => $claim->id,
'subject' => $request->subject,
+ 'objective' => $request->objective,
'sistole' => $request->sistole,
'diastole' => $request->diastole,
'body_temperature' => $request->body_temperature,
@@ -232,10 +234,10 @@ class DailyMonitoringController extends Controller
'request_code' => 'required|exists:request_logs,code',
'subject' => 'required',
'submission_date' => 'required',
- 'body_temperature' => 'required|numeric',
- 'sistole' => 'required|numeric',
- 'diastole' => 'required|numeric',
- 'respiration_rate' => 'required|numeric',
+ 'body_temperature' => 'required',
+ 'sistole' => 'required',
+ 'diastole' => 'required',
+ 'respiration_rate' => 'required',
'analysis' => 'required',
'medical_plan' => 'required',
'non_medikamentosa_plan' => 'required',
@@ -261,6 +263,7 @@ class DailyMonitoringController extends Controller
'request_log_id' => $request_log->id,
'submission_date' => $request->submission_date,
'subject' => $request->subject,
+ 'object' => $request->objective,
'sistole' => $request->sistole,
'diastole' => $request->diastole,
'body_temperature' => $request->body_temperature,
diff --git a/app/Models/RequestDailyMonitoring.php b/app/Models/RequestDailyMonitoring.php
index 97933ea6..b9918039 100644
--- a/app/Models/RequestDailyMonitoring.php
+++ b/app/Models/RequestDailyMonitoring.php
@@ -15,6 +15,7 @@ class RequestDailyMonitoring extends Model
protected $fillable = [
'request_log_id',
'subject',
+ 'object',
'submission_date',
'body_temperature',
'respiration_rate',
diff --git a/database/migrations/2024_02_19_124934_add_coloumn_to_request_daily_monitoring_table.php b/database/migrations/2024_02_19_124934_add_coloumn_to_request_daily_monitoring_table.php
new file mode 100644
index 00000000..99468645
--- /dev/null
+++ b/database/migrations/2024_02_19_124934_add_coloumn_to_request_daily_monitoring_table.php
@@ -0,0 +1,32 @@
+text('object')->after('subject')->nullable()->default(null);
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('request_log_daily_monitorings', function (Blueprint $table) {
+ $table->dropColumn('object');
+ });
+ }
+};
diff --git a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx
index 64ac0451..eaafcaee 100644
--- a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx
+++ b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx
@@ -169,10 +169,11 @@ type ServiceMonitoringProps = {
time: string;
status: string;
subject: string;
- bodyTemperature: string;
- sistole: string;
- diastole: string;
- respirationRate: string;
+ object: string;
+ bodyTemperature: number;
+ sistole: number;
+ diastole: number;
+ respirationRate: number;
analysis: string;
complaints: string;
plans: {
@@ -942,10 +943,15 @@ export default function ServiceMonitoring() {
-
-
+
+
Objektif
+
+ {dailyMonitoring.object
+ ? dailyMonitoring.object
+ : '-'}
+
@@ -958,7 +964,7 @@ export default function ServiceMonitoring() {
- {dailyMonitoring.bodyTemperature
+ {dailyMonitoring.bodyTemperature > 0
? dailyMonitoring.bodyTemperature
: '-'}
@@ -974,7 +980,7 @@ export default function ServiceMonitoring() {
- {dailyMonitoring.sistole
+ {dailyMonitoring.sistole > 0
? dailyMonitoring.sistole
: '-'}
@@ -990,7 +996,7 @@ export default function ServiceMonitoring() {
- {dailyMonitoring.diastole
+ {dailyMonitoring.diastole > 0
? dailyMonitoring.diastole
: '-'}
@@ -1008,7 +1014,7 @@ export default function ServiceMonitoring() {
- {dailyMonitoring.respirationRate
+ {dailyMonitoring.respirationRate > 0
? dailyMonitoring.respirationRate
: '-'}
diff --git a/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringForm.tsx b/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringForm.tsx
index 2643b9ec..d4e53b4c 100644
--- a/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringForm.tsx
+++ b/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringForm.tsx
@@ -28,21 +28,31 @@ import InsertDriveFileIcon from '@mui/icons-material/InsertDriveFile';
* Utils, Types, Functions
* ============================================
*/
-import { AddMonitoringDetail } from '../Model/Functions';
+import { AddMonitoringDetail, getOrganizationId } from '../Model/Functions';
import { DetailMonitoringListType} from '../Model/Types';
import FormCreateFilesUpload from '@/pages/CustomerService/FinalLog/Components/FormCreateFilesUpload';
import MultiFilePreview from '@/components/upload/MultiFilePreview';
import Iconify from '@/components/Iconify';
-import { useRef } from 'react';
+import { useEffect, useRef, useState } from 'react';
export default function DetailMonitoringList() {
const { member_id, claim_code } = useParams();
+ const [organizationId, setOrganizationId] = useState();
+
const navigate = useNavigate()
const pageTitle = claim_code??'_ _ _ _';
const fileInput1 = useRef(null);
const fileInput2 = useRef(null);
const fileInput3 = useRef(null);
-
+
+ const loadOrganizationID = async () => {
+ const organization_id = await getOrganizationId(claim_code??'');
+ setOrganizationId(organization_id);
+ }
+ useEffect(() => {
+ loadOrganizationID();
+ }, [])
+
// setup form
// ====================================
const defaultValues: DetailMonitoringListType = {
@@ -50,6 +60,7 @@ export default function DetailMonitoringList() {
claim_code : '',
claim_id : '',
subject : '',
+ objective : '',
submission_date : '',
body_temperature: '',
sistole : '',
@@ -157,13 +168,11 @@ export default function DetailMonitoringList() {
// Submit Form
// =====================================
const submitHandler = async (data: DetailMonitoringListType) => {
- console.log(claim_code);
-
const response = await AddMonitoringDetail(claim_code??'', data);
if (response == true) {
reset();
- navigate('/case_management/daily_monitoring/'+member_id+'/claims', { replace: true });
+ navigate('/case_management/daily_monitoring/'+member_id+'/'+organizationId+'/claims', { replace: true });
// window.location.reload()
}
}
@@ -171,7 +180,7 @@ export default function DetailMonitoringList() {
return (
- navigate(`/case_management/daily_monitoring/${member_id}/claims`)} >
+ navigate(`/case_management/daily_monitoring/${member_id}/${organizationId}/claims`)} >
@@ -215,6 +224,8 @@ export default function DetailMonitoringList() {
id="subject"
name='subject'
placeholder='Subjective'
+ multiline
+ rows={4}
/>
@@ -225,9 +236,18 @@ export default function DetailMonitoringList() {
- Objectif
+ Objective
+
+
+
diff --git a/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringList.tsx b/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringList.tsx
index e610170f..f9753abb 100644
--- a/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringList.tsx
+++ b/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DetailMonitoringList.tsx
@@ -29,6 +29,7 @@ import FiberManualRecord from '@mui/icons-material/FiberManualRecord';
*/
import { fDate, fDateOnly } from '@/utils/formatTime';
import { getMonitoringDetailList } from '../Model/Functions';
+import { getOrganizationId } from '../Model/Functions';
import { DetailMonitoringListType } from '../Model/Types';
@@ -40,7 +41,7 @@ export default function DetailMonitoringList() {
// State
// --------------------
const [detailMonitoringList, setDetailMonitoringList] = useState();
-
+ const [organizationId, setOrganizationId] = useState();
// Use Effect
// --------------------
useEffect(() => {
@@ -51,8 +52,10 @@ export default function DetailMonitoringList() {
// -------------------
const loadDataTableData = async () => {
const response = await getMonitoringDetailList(claim_code??'');
+ const organization_id = await getOrganizationId(claim_code??'');
setDetailMonitoringList(response);
+ setOrganizationId(organization_id);
}
return (
@@ -61,7 +64,7 @@ export default function DetailMonitoringList() {
{/* back button */}
- navigate(`/case_management/daily_monitoring/${member_id}/claims`)} >
+ navigate(`/case_management/daily_monitoring/${member_id}/${organizationId}/claims`)} >
@@ -129,6 +132,11 @@ export default function DetailMonitoringList() {
Object :
+
+
+ {row.object}
+
+
diff --git a/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Model/Functions.ts b/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Model/Functions.ts
index ffbe3be3..52a1071e 100644
--- a/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Model/Functions.ts
+++ b/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Model/Functions.ts
@@ -99,3 +99,21 @@ export const getMonitoringDetailList = async ( claim_code: string ): Promise => {
+ const response = await axios.get(`/case_management/daily_monitoring/detail/${claim_code}/list`)
+ .then((res) =>{
+ return res.data.data.organization_id;
+ })
+ .catch((res) => {
+ enqueueSnackbar("server error !", {
+ variant: 'error',
+ });
+
+ return [];
+ });
+
+ return response;
+};
diff --git a/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Model/Types.ts b/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Model/Types.ts
index 4ae90a30..430a8990 100644
--- a/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Model/Types.ts
+++ b/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Model/Types.ts
@@ -52,6 +52,8 @@ export type DetailMonitoringListType = {
claim_id : string|null,
claim_code : string,
subject : string,
+ object : string,
+ objective : string,
body_temperature: string,
respiration_rate: string,
sistole : string,
@@ -69,6 +71,9 @@ export type DetailMonitoringListType = {
result : files[],
document : document[],
created_at : string|null
+ data : {
+ organization_id : number
+ }
}
export type MedicalPlanStrType = {