Merge branch 'fix_bugs_new' into 'development'

Fix in patient screen bug

See merge request Cloud_Solution/doctor_app_flutter!809

lib/core/service/base/base_service.dart

@@ -14,7 +14,11 @@ class BaseService {
 
   List<PatiantInformtion> patientArrivalList = [];
 
-//TODO add the user login model when we need it
+  BaseService(){
+    doctorProfile = null;
+  }
+
+  //TODO add the user login model when we need it
   Future<DoctorProfileModel> getDoctorProfile({bool isGetProfile = false}) async {
     if(isGetProfile)
     {

lib/core/service/patient/patientInPatientService.dart

@@ -10,7 +10,7 @@ class PatientInPatientService extends BaseService {
   Future getInPatientList(
       PatientSearchRequestModel requestModel, bool isMyInpatient) async {
     hasError = false;
-    await getDoctorProfile();
+    await getDoctorProfile(isGetProfile: true);
 
     if (isMyInpatient) {
       requestModel.doctorID = doctorProfile.doctorID;

lib/screens/patients/PatientsInPatientScreen.dart

@@ -71,7 +71,7 @@ class _PatientInPatientScreenState extends State<PatientInPatientScreen>
               model.specialClinicalCareMappingList[0].nursingStationID;
           requestModel.clinicID = 0;
         }
-        model.getInPatientList(requestModel);
+        await model.getInPatientList(requestModel);
       },
       builder: (_, model, w) =>
           AppScaffold(

lib/screens/patients/profile/lab_result/LabResultHistoryPage.dart

@@ -15,7 +15,7 @@ class LabResultHistoryPage extends StatelessWidget {
   final PatiantInformtion patient;
 
   LabResultHistoryPage({this.patientLabOrder, this.filterName, this.patient});
-
+// TODO mosa changes
   @override
   Widget build(BuildContext context) {
     return BaseView<LabsViewModel>(

lib/screens/patients/profile/medical_report/MedicalReportDetailPage.dart

@@ -75,8 +75,6 @@ class MedicalReportDetailPage extends StatelessWidget {
                     ),
                   ),
                   child: Html(
-
-
                       data: medicalReport.reportDataHtml ?? ""
                   ),
                 ) : Container(