updates

lib/core/model/auth/activation_code_for_verification_screen_model.dart

@@ -8,6 +8,7 @@ class ActivationCodeForVerificationScreenModel {
   double? versionID;
   int? memberID;
   int? facilityId;
+  int? projectId;
   String? generalid;
   int? isMobileFingerPrint;
   String? vidaAuthTokenID;
@@ -23,6 +24,7 @@ class ActivationCodeForVerificationScreenModel {
       this.versionID,
       this.memberID,
       this.facilityId,
+      this.projectId,
       this.generalid,
       this.isMobileFingerPrint,
       this.vidaAuthTokenID,
@@ -39,6 +41,7 @@ class ActivationCodeForVerificationScreenModel {
     versionID = json['VersionID'];
     memberID = json['MemberID'];
     facilityId = json['facilityId'];
+    projectId = json['ProjectID'];
     generalid = json['generalid'];
     isMobileFingerPrint = json['IsMobileFingerPrint'];
     vidaAuthTokenID = json['VidaAuthTokenID'];
@@ -61,6 +64,7 @@ class ActivationCodeForVerificationScreenModel {
     data['IsMobileFingerPrint'] = this.isMobileFingerPrint;
     data['IMEI'] = this.iMEI;
     data['LoginDoctorID'] = this.loginDoctorID;
+    data['ProjectID'] = this.projectId;
     return data;
   }
 }

lib/core/viewModel/authentication_view_model.dart

@@ -156,6 +156,7 @@ class AuthenticationViewModel extends BaseViewModel {
     ActivationCodeForVerificationScreenModel activationCodeModel = ActivationCodeForVerificationScreenModel(
         iMEI: user!.iMEI,
         facilityId: user!.projectID,
+        projectId: user!.projectID,
         memberID: user!.doctorID,
         loginDoctorID: int.parse(user!.editedBy.toString()),
         zipCode: user!.outSA == true ? '971' : '966',

lib/screens/patients/out_patient/out_patient_screen.dart

@@ -212,6 +212,7 @@ class _OutPatientsScreenState extends State<OutPatientsScreen> {
                             itemCount: model.filterData.length,
                             itemBuilder: (BuildContext ctxt, int index) {
                               if (_activeLocation != 0 || (model.filterData[index].patientStatusType != null && model.filterData[index].patientStatusType == 43))
+                              // if (_activeLocation != 0)
                                 return Padding(
                                   padding: EdgeInsets.symmetric(horizontal: 8, vertical: 0),
                                   child: PatientCard(
@@ -236,8 +237,8 @@ class _OutPatientsScreenState extends State<OutPatientsScreen> {
                                     // isFromSearch: widget.isSearch,
                                   ),
                                 );
-                              else
-                                return SizedBox();
+                              // else
+                              //   return SizedBox();
                             })),
               ),
             ],

lib/screens/patients/profile/lab_result/laboratory_result/laboratory_result_page.dart

@@ -26,7 +26,7 @@ class _LaboratoryResultPageState extends State<LaboratoryResultPage> {
   @override
   Widget build(BuildContext context) {
     return BaseView<LabsViewModel>(
-      onModelReady: (model) => model.getPatientLabResult(patientLabOrder: widget.patientLabOrders, patient: widget.patient, isInpatient: true),
+      onModelReady: (model) => model.getPatientLabResult(patientLabOrder: widget.patientLabOrders, patient: widget.patient, isInpatient: !widget.patientLabOrders.isInOutPatient!),
       builder: (_, model, w) => AppScaffold(
         isShowAppBar: true,
         appBar: PatientProfileAppBar(