merge-requests/508/head
hussam al-habibeh 5 years ago
parent 1bce2ad979
commit 369a5789a3

@ -104,7 +104,9 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => MedicalFileDetails( builder: (context) => MedicalFileDetails(
age: patient.age is String ? patient.age ?? "" : "${patient.age}", age: patient.age is String
? patient.age ?? ""
: "${patient.age}",
firstName: patient.firstName, firstName: patient.firstName,
lastName: patient.lastName, lastName: patient.lastName,
gender: patient.genderDescription, gender: patient.genderDescription,
@ -115,40 +117,45 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
.medicalFileList[0] .medicalFileList[0]
.entityList[0] .entityList[0]
.timelines[index] .timelines[index]
.doctorName, .timeLineEvents[0]
clinicName: model .consulations
.isNotEmpty
? model
.medicalFileList[0] .medicalFileList[0]
.entityList[0] .entityList[0]
.timelines[index] .timelines[index]
.clinicName, .doctorName
doctorImage: model : "",
clinicName: model
.medicalFileList[0] .medicalFileList[0]
.entityList[0] .entityList[0]
.timelines[index] .timelines[index]
.doctorImage, .timeLineEvents[0]
episode: .consulations
model .isNotEmpty
? model
.medicalFileList[0] .medicalFileList[0]
.entityList[0] .entityList[0]
.timelines[index] .timelines[index]
.timeLineEvents[0] .clinicName
.consulations.isNotEmpty? : "",
model doctorImage: model
.medicalFileList[0] .medicalFileList[0]
.entityList[0] .entityList[0]
.timelines[index] .timelines[index]
.timeLineEvents[0] .timeLineEvents[0]
.consulations[0] .consulations
.episodeID .isNotEmpty
.toString():"", ? model
vistDate: model
.medicalFileList[0] .medicalFileList[0]
.entityList[0] .entityList[0]
.timelines[index] .timelines[index]
.date .doctorImage
.toString() : "",
.toString(), episode: model.medicalFileList[0].entityList[0].timelines[index].timeLineEvents[0].consulations.isNotEmpty
)), ? model.medicalFileList[0].entityList[0].timelines[index].timeLineEvents[0].consulations[0].episodeID.toString()
: "",
vistDate: model.medicalFileList[0].entityList[0].timelines[index].date.toString())),
); );
}, },
child: DoctorCard( child: DoctorCard(

@ -182,7 +182,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
color: HexColor("#20A169"), color: HexColor("#20A169"),
), ),
child: AppText( child: AppText(
patient.startTime??"", patient.startTime ?? "",
color: Colors.white, color: Colors.white,
fontSize: 1.5 * SizeConfig.textMultiplier, fontSize: 1.5 * SizeConfig.textMultiplier,
textAlign: TextAlign.center, textAlign: TextAlign.center,
@ -235,7 +235,9 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
Row( Row(
children: [ children: [
AppText( AppText(
patient.nationalityName ?? patient.nationality??"", patient.nationalityName ??
patient.nationality ??
"",
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 12, fontSize: 12,
), ),
@ -307,7 +309,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
children: <Widget>[ children: <Widget>[
Container( Container(
child: LargeAvatar( child: LargeAvatar(
name: doctorName??"", name: doctorName ?? "",
url: profileUrl, url: profileUrl,
), ),
width: 25, width: 25,
@ -382,6 +384,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
Texts(vistDate ?? '', fontSize: 12) Texts(vistDate ?? '', fontSize: 12)
], ],
), ),
if (!isMedicalFile)
Row( Row(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(

Loading…
Cancel
Save