diff --git a/lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart b/lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart index 09cfe6b8..2ba0386e 100644 --- a/lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart +++ b/lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart @@ -167,8 +167,7 @@ class ProfileGridForSearch extends StatelessWidget { isInPatient: item.isInPatient, isDischargedPatient: item.isDischargedPatient, isDisable: item.isDisable, - onTap: () {}, - //item.onTap(), + onTap:item.onTap, isLoading: item.isLoading, ); }).toList(), diff --git a/lib/screens/patients/profile/radiology/radiology_home_page.dart b/lib/screens/patients/profile/radiology/radiology_home_page.dart index 485ddcaf..20878cf4 100644 --- a/lib/screens/patients/profile/radiology/radiology_home_page.dart +++ b/lib/screens/patients/profile/radiology/radiology_home_page.dart @@ -115,7 +115,7 @@ class _RadiologyHomePageState extends State { //Colors.red[900] Color(0xff404545) color: model.radiologyList[index].isLiveCareAppodynamicment ?? false ? Colors.red[900] - : !model.radiologyList[index].isInOutPatient! + : model.radiologyList[index].isInOutPatient !=null && model.radiologyList[index].isInOutPatient==false ? Colors.black : Color(0xffa9a089), borderRadius: BorderRadius.only( @@ -128,9 +128,9 @@ class _RadiologyHomePageState extends State { quarterTurns: 3, child: Center( child: Text( - model.radiologyList[index].isLiveCareAppodynamicment! + model.radiologyList[index].isLiveCareAppodynamicment !=null && model.radiologyList[index].isLiveCareAppodynamicment==true ? TranslationBase.of(context).liveCare.toUpperCase() - : !model.radiologyList[index].isInOutPatient! + : model.radiologyList[index].isInOutPatient!=null && model.radiologyList[index].isInOutPatient==false ? TranslationBase.of(context).inPatientLabel.toUpperCase() : TranslationBase.of(context).outpatient.toUpperCase(), style: TextStyle(color: Colors.white),