some fixes

merge-requests/266/head
mosazaid 4 years ago
parent 0e7d1b8130
commit 3be693337a

@ -42,6 +42,7 @@ class PatiantInformtion {
int patientMRN;
String admissionNo;
String admissionDate;
String createdOn;
String roomId;
String bedId;
String nursingStationId;
@ -77,6 +78,7 @@ class PatiantInformtion {
this.patientType,
this.admissionNo,
this.admissionDate,
this.createdOn,
this.roomId,
this.bedId,
this.nursingStationId,
@ -129,6 +131,7 @@ class PatiantInformtion {
patientType: json["PatientType"]?? json["patientType"],
admissionNo: json["AdmissionNo"]?? json["admissionNo"],
admissionDate: json["AdmissionDate"]?? json["admissionDate"],
createdOn: json["CreatedOn"]?? json["CreatedOn"],
roomId: json["RoomID"]?? json["roomID"],
bedId: json["BedID"]?? json["bedID"],
nursingStationId: json["NursingStationID"]?? json["nursingStationID"],
@ -158,10 +161,4 @@ class PatiantInformtion {
patientMRN :json['patientMRN'] ?? json['PatientMRN'],
);
}

@ -254,8 +254,8 @@ class PatientProfileWidget extends StatelessWidget {
),
Expanded(
child: AppText(
patient.admissionDate != null
? "${DateUtils.convertDateFromServerFormat(patient.admissionDate, 'EEEE dd, MMMM yyyy hh:mm a')}"
patient.createdOn != null
? "${DateUtils.convertDateFromServerFormat(patient.createdOn, 'EEEE dd, MMMM yyyy hh:mm a')}"
: "",
color: Colors.black,
fontWeight: FontWeight.normal,
@ -310,10 +310,10 @@ class PatientProfileWidget extends StatelessWidget {
),
),
AppText(
patient.admissionDate != null
patient.createdOn != null
? DateUtils
.differenceBetweenServerDateAndCurrent(
patient.admissionDate)
patient.createdOn)
: "",
color: Colors.black,
fontWeight: FontWeight.normal,

Loading…
Cancel
Save