Merge branch 'medical-profile-services' into 'development'

hot fix See merge request Cloud_Solution/doctor_app_flutter!708
5 years ago · 4b6263ca1a
parent 8cdcd51086 c7ce4676f6
commit 4b6263ca1a
2 changed files with 2 additions and 2 deletions
--- a/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
+++ b/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
@ -57,7 +57,7 @@ class VitalSignDetailsScreen extends StatelessWidget {
                              crossAxisAlignment: CrossAxisAlignment.start,
                              children: [
                                AppText(
-                                  "${patient.firstName ?? patient.patientDetails != null ? patient.patientDetails.firstName : patient.fullName}'s",
+                                  "${patient.firstName ?? patient?.patientDetails?.firstName??  patient.fullName?? ''}'s",
                                  fontSize: SizeConfig.textMultiplier * 1.6,
                                  fontWeight: FontWeight.w700,
                                  color: Color(0xFF2E303A),
--- a/lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart
+++ b/lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart
@ -202,7 +202,7 @@ class VitalSignItemDetailsScreen extends StatelessWidget {
                crossAxisAlignment: CrossAxisAlignment.start,
                children: [
                  AppText(
-                    "${patient.firstName ?? patient.patientDetails != null ? patient.patientDetails.firstName : patient.fullName}'s",
+                    "${patient.firstName ?? patient?.patientDetails?.firstName??  patient.fullName?? ''}'s",
                    fontFamily: 'Poppins',
                    fontSize: SizeConfig.textMultiplier * 1.6,
                    fontWeight: FontWeight.w600,