Merge remote-tracking branch 'origin/staging' into origin/production
This commit is contained in:
@@ -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() {
|
||||
</Stack>
|
||||
</Grid>
|
||||
<Grid item xs={12} lg={12} md={12}>
|
||||
<Stack spacing={1}>
|
||||
<Typography variant="h6" sx={{ paddingBottom: 2 }}>
|
||||
<Stack spacing={1} sx={{ paddingBottom: 2 }}>
|
||||
<Typography variant="h6">
|
||||
Objektif
|
||||
</Typography>
|
||||
<Typography variant="inherit">
|
||||
{dailyMonitoring.object
|
||||
? dailyMonitoring.object
|
||||
: '-'}
|
||||
</Typography>
|
||||
</Stack>
|
||||
<Stack direction={'row'} sx={{ paddingY: 1 }} spacing={2}>
|
||||
<Grid item xs={6} lg={6} md={6}>
|
||||
@@ -958,8 +964,8 @@ export default function ServiceMonitoring() {
|
||||
<Grid item xs={6} lg={6} md={6}>
|
||||
<Stack>
|
||||
<Typography variant="subtitle1">
|
||||
{dailyMonitoring.bodyTemperature
|
||||
? dailyMonitoring.bodyTemperature
|
||||
{dailyMonitoring.bodyTemperature > 0
|
||||
? dailyMonitoring.bodyTemperature + ' Cel'
|
||||
: '-'}
|
||||
</Typography>
|
||||
</Stack>
|
||||
@@ -974,8 +980,8 @@ export default function ServiceMonitoring() {
|
||||
<Grid item xs={6} lg={6} md={6}>
|
||||
<Stack>
|
||||
<Typography variant="subtitle1">
|
||||
{dailyMonitoring.sistole
|
||||
? dailyMonitoring.sistole
|
||||
{dailyMonitoring.sistole > 0
|
||||
? dailyMonitoring.sistole + ' mm[Hg]'
|
||||
: '-'}
|
||||
</Typography>
|
||||
</Stack>
|
||||
@@ -990,8 +996,8 @@ export default function ServiceMonitoring() {
|
||||
<Grid item xs={6} lg={6} md={6}>
|
||||
<Stack>
|
||||
<Typography variant="subtitle1">
|
||||
{dailyMonitoring.diastole
|
||||
? dailyMonitoring.diastole
|
||||
{dailyMonitoring.diastole > 0
|
||||
? dailyMonitoring.diastole + ' mm[Hg]'
|
||||
: '-'}
|
||||
</Typography>
|
||||
</Stack>
|
||||
@@ -1008,14 +1014,14 @@ export default function ServiceMonitoring() {
|
||||
<Grid item xs={6} lg={6} md={6}>
|
||||
<Stack>
|
||||
<Typography variant="subtitle1">
|
||||
{dailyMonitoring.respirationRate
|
||||
? dailyMonitoring.respirationRate
|
||||
{dailyMonitoring.respirationRate > 0
|
||||
? dailyMonitoring.respirationRate + ' / min'
|
||||
: '-'}
|
||||
</Typography>
|
||||
</Stack>
|
||||
</Grid>
|
||||
</Stack>
|
||||
<Stack direction={'row'} sx={{ paddingY: 1 }} spacing={2}>
|
||||
{/* <Stack direction={'row'} sx={{ paddingY: 1 }} spacing={2}>
|
||||
<Grid item xs={6} lg={6} md={6}>
|
||||
<Stack>
|
||||
<Typography variant="inherit">Complaints</Typography>
|
||||
@@ -1030,7 +1036,7 @@ export default function ServiceMonitoring() {
|
||||
</Typography>
|
||||
</Stack>
|
||||
</Grid>
|
||||
</Stack>
|
||||
</Stack> */}
|
||||
<Stack spacing={1}>
|
||||
<Typography variant="h6" sx={{ paddingTop: 2 }}>
|
||||
Analysis
|
||||
|
||||
Reference in New Issue
Block a user