Merge branch 'progress_note' into 'development'

fix radiology_service

See merge request Cloud_Solution/doctor_app_flutter!565

lib/core/service/radiology_service.dart

@@ -29,9 +29,13 @@ class RadiologyService extends BaseService {
 
   Future getPatientRadOrders(PatiantInformtion patient , {isInPatient = false}) async {
     String url = GET_PATIENT_ORDERS;
+    final Map<String, dynamic> body = new Map<String, dynamic>();
     if(isInPatient) {
       url = GET_IN_PATIENT_ORDERS;
+      body['ProjectID'] = patient.projectId;
     }
+
+
     hasError = false;
     await baseAppClient.postPatient(url,
         patient: patient,
@@ -47,7 +51,7 @@ class RadiologyService extends BaseService {
         }, onFailure: (String error, int statusCode) {
           hasError = true;
           super.error = error;
-        }, body: Map());
+        }, body:body);
   }
 
 

lib/screens/sick-leave/add-sickleave.dart

@@ -29,7 +29,7 @@ class AddSickLeavScreen extends StatelessWidget {
     final routeArgs = ModalRoute.of(context).settings.arguments as Map;
     patient = routeArgs['patient'];
     return BaseView<SickLeaveViewModel>(
-        onModelReady: (model) => model.getSickLeave(patient.patientMRN),
+        onModelReady: (model) => model.getSickLeave(patient.patientMRN??patient.patientId),
         builder: (_, model, w) => AppScaffold(
             baseViewModel: model,
             isShowAppBar: true,

lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart

@@ -5,6 +5,7 @@ import 'package:doctor_app_flutter/models/SOAP/PostEpisodeReqModel.dart';
 import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/routes.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
+import 'package:doctor_app_flutter/screens/reschedule-leaves/add-rescheduleleave.dart';
 import 'package:doctor_app_flutter/util/date-utils.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
 import 'package:doctor_app_flutter/widgets/patients/profile/PatientProfileButton.dart';
@@ -166,6 +167,15 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget {
               nameLine1: "Discharge",
               nameLine2: "Summery",
               icon: 'patient/patient_sick_leave.png'),
+          PatientProfileButton(
+              key: key,
+              patient: patient,
+              patientType: patientType,
+              arrivalType: arrivalType,
+              route: ADD_SICKLEAVE,
+              nameLine1: TranslationBase.of(context).patientSick,
+              nameLine2: TranslationBase.of(context).leave,
+              icon: 'patient/patient_sick_leave.png'),
         ],
       ),
     );