|
|
|
@ -349,21 +349,22 @@ class PatientCard extends StatelessWidget {
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Expanded(
|
|
|
|
Expanded(
|
|
|
|
child: Row(
|
|
|
|
child: Row(
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
Expanded(
|
|
|
|
Expanded(
|
|
|
|
child: Column(
|
|
|
|
child: Column(
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
CustomRow(
|
|
|
|
CustomRow(
|
|
|
|
label: TranslationBase.of(context).fileNumber,
|
|
|
|
label:
|
|
|
|
|
|
|
|
TranslationBase.of(context).fileNumber,
|
|
|
|
value: patientInfo.patientId.toString(),
|
|
|
|
value: patientInfo.patientId.toString(),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
CustomRow(
|
|
|
|
CustomRow(
|
|
|
|
label: TranslationBase.of(context).age + " : ",
|
|
|
|
label:
|
|
|
|
|
|
|
|
TranslationBase.of(context).age + " : ",
|
|
|
|
value:
|
|
|
|
value:
|
|
|
|
"${AppDateUtils.getAgeByBirthday(patientInfo.dateofBirth, context, isServerFormat: !isFromLiveCare)}",
|
|
|
|
"${AppDateUtils.getAgeByBirthday(patientInfo.dateofBirth, context, isServerFormat: !isFromLiveCare)}",
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
|
|
|
|
if (isInpatient)
|
|
|
|
if (isInpatient)
|
|
|
|
CustomRow(
|
|
|
|
CustomRow(
|
|
|
|
label: patientInfo.admissionDate == null
|
|
|
|
label: patientInfo.admissionDate == null
|
|
|
|
@ -377,33 +378,46 @@ class PatientCard extends StatelessWidget {
|
|
|
|
),
|
|
|
|
),
|
|
|
|
if (patientInfo.admissionDate != null)
|
|
|
|
if (patientInfo.admissionDate != null)
|
|
|
|
CustomRow(
|
|
|
|
CustomRow(
|
|
|
|
label: TranslationBase.of(context).numOfDays +
|
|
|
|
label: TranslationBase.of(context)
|
|
|
|
|
|
|
|
.numOfDays +
|
|
|
|
" : ",
|
|
|
|
" : ",
|
|
|
|
value:
|
|
|
|
value:
|
|
|
|
"${DateTime.now().difference(AppDateUtils.getDateTimeFromServerFormat(patientInfo.admissionDate)).inDays + 1}",
|
|
|
|
"${DateTime.now().difference(AppDateUtils.getDateTimeFromServerFormat(patientInfo.admissionDate)).inDays + 1}",
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
if (patientInfo.admissionDate != null)
|
|
|
|
|
|
|
|
CustomRow(
|
|
|
|
|
|
|
|
// TODO Elham* add translation
|
|
|
|
|
|
|
|
label:
|
|
|
|
|
|
|
|
"Clinic Name" +
|
|
|
|
|
|
|
|
" : ",
|
|
|
|
|
|
|
|
value: "${patientInfo.clinicDescription}",
|
|
|
|
|
|
|
|
),
|
|
|
|
if (patientInfo.admissionDate != null)
|
|
|
|
if (patientInfo.admissionDate != null)
|
|
|
|
CustomRow(
|
|
|
|
CustomRow(
|
|
|
|
label:
|
|
|
|
label:
|
|
|
|
TranslationBase.of(context).roomNo + " : ",
|
|
|
|
TranslationBase.of(context).roomNo +
|
|
|
|
|
|
|
|
" : ",
|
|
|
|
value: "${patientInfo.roomId}",
|
|
|
|
value: "${patientInfo.roomId}",
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
|
|
|
|
if (isFromLiveCare)
|
|
|
|
if (isFromLiveCare)
|
|
|
|
Column(
|
|
|
|
Column(
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
CustomRow(
|
|
|
|
CustomRow(
|
|
|
|
label: TranslationBase.of(context).clinic +
|
|
|
|
label: TranslationBase.of(context)
|
|
|
|
|
|
|
|
.clinic +
|
|
|
|
" : ",
|
|
|
|
" : ",
|
|
|
|
value: patientInfo.clinicName,
|
|
|
|
value: patientInfo.clinicName,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
]),
|
|
|
|
]),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Icon(Icons.arrow_forward, size: 24,),
|
|
|
|
Icon(
|
|
|
|
],
|
|
|
|
Icons.arrow_forward,
|
|
|
|
))
|
|
|
|
size: 24,
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
],
|
|
|
|
|
|
|
|
))
|
|
|
|
]),
|
|
|
|
]),
|
|
|
|
isFromLiveCare
|
|
|
|
isFromLiveCare
|
|
|
|
? Row(
|
|
|
|
? Row(
|
|
|
|
@ -458,5 +472,3 @@ class PatientCard extends StatelessWidget {
|
|
|
|
));
|
|
|
|
));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|