radiology fixes

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.20'
     repositories {
         google()
         jcenter()

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip

lib/core/viewModel/patient-ucaf-viewmodel.dart

@@ -71,7 +71,7 @@ class UcafViewModel extends BaseViewModel {
 
     // await _ucafService.getPatientVitalSignsHistory(patient, from, to);
     await _ucafService.getInPatientVitalSignHistory(patient, false);
-    // await _ucafService.getPatientChiefComplaint(patient);
+    await _ucafService.getPatientChiefComplaint(patient);
 
     if (_ucafService.hasError) {
       error = _ucafService.error;

lib/core/viewModel/radiology_view_model.dart

@@ -15,54 +15,35 @@ class RadiologyViewModel extends BaseViewModel {
   List<FinalRadiologyList> _finalRadiologyListClinic = List();
   List<FinalRadiologyList> _finalRadiologyListHospital = List();
 
-  List<FinalRadiologyList> get finalRadiologyList =>
+  List<FinalRadiologyList> get finalRadiologyList => filterType == FilterType.Clinic ? _finalRadiologyListClinic : _finalRadiologyListHospital;
-      filterType == FilterType.Clinic
-          ? _finalRadiologyListClinic
-          : _finalRadiologyListHospital;
 
-  void getPatientRadOrders(PatiantInformtion patient,
+  void getPatientRadOrders(PatiantInformtion patient, {isInPatient = false}) async {
-      {isInPatient = false}) async {
     setState(ViewState.Busy);
-    await _radiologyService.getPatientRadOrders(patient,
+    await _radiologyService.getPatientRadOrders(patient, isInPatient: isInPatient);
-        isInPatient: isInPatient);
     if (_radiologyService.hasError) {
       error = _radiologyService.error;
       setState(ViewState.Error);
     } else {
       _radiologyService.finalRadiologyList.forEach((element) {
-        List<FinalRadiologyList> finalRadiologyListClinic =
+        List<FinalRadiologyList> finalRadiologyListClinic = _finalRadiologyListClinic.where((elementClinic) => elementClinic.filterName == element.clinicDescription).toList();
-            _finalRadiologyListClinic
-                .where((elementClinic) =>
-                    elementClinic.filterName == element.clinicDescription)
-                .toList();
 
         if (finalRadiologyListClinic.length != 0) {
-          _finalRadiologyListClinic[
+          _finalRadiologyListClinic[finalRadiologyListClinic.indexOf(finalRadiologyListClinic[0])].finalRadiologyList.add(element);
-                  finalRadiologyListClinic.indexOf(finalRadiologyListClinic[0])]
-              .finalRadiologyList
-              .add(element);
         } else {
-          _finalRadiologyListClinic.add(FinalRadiologyList(
+          _finalRadiologyListClinic.add(FinalRadiologyList(filterName: element.clinicDescription, finalRadiology: element));
-              filterName: element.clinicDescription, finalRadiology: element));
         }
 
         //   FinalRadiologyList list sort via project
-        List<FinalRadiologyList> finalRadiologyListHospital =
+        List<FinalRadiologyList> finalRadiologyListHospital = _finalRadiologyListHospital
-            _finalRadiologyListHospital
+            .where(
-                .where(
+              (elementClinic) => elementClinic.filterName == element.projectName,
-                  (elementClinic) =>
+            )
-                      elementClinic.filterName == element.projectName,
+            .toList();
-                )
-                .toList();
 
         if (finalRadiologyListHospital.length != 0) {
-          _finalRadiologyListHospital[finalRadiologyListHospital
+          _finalRadiologyListHospital[finalRadiologyListHospital.indexOf(finalRadiologyListHospital[0])].finalRadiologyList.add(element);
-                  .indexOf(finalRadiologyListHospital[0])]
-              .finalRadiologyList
-              .add(element);
         } else {
-          _finalRadiologyListHospital.add(FinalRadiologyList(
+          _finalRadiologyListHospital.add(FinalRadiologyList(filterName: element.projectName, finalRadiology: element));
-              filterName: element.projectName, finalRadiology: element));
         }
       });
 
@@ -72,17 +53,9 @@ class RadiologyViewModel extends BaseViewModel {
 
   String get radImageURL => _radiologyService.url;
 
-  getRadImageURL(
+  getRadImageURL({int invoiceNo, int lineItem, int projectId, @required PatiantInformtion patient}) async {
-      {int invoiceNo,
-      int lineItem,
-      int projectId,
-      @required PatiantInformtion patient}) async {
     setState(ViewState.Busy);
-    await _radiologyService.getRadImageURL(
+    await _radiologyService.getRadImageURL(invoiceNo: invoiceNo, lineItem: lineItem, projectId: projectId, patient: patient);
-        invoiceNo: invoiceNo,
-        lineItem: lineItem,
-        projectId: projectId,
-        patient: patient);
     if (_radiologyService.hasError) {
       error = _radiologyService.error;
       setState(ViewState.Error);

lib/screens/patients/profile/radiology/radiology_details_page.dart

@@ -94,7 +94,6 @@ class RadiologyDetailsPage extends StatelessWidget {
                   margin: EdgeInsets.only(left: 35, right: 35, top: 12, bottom: 12),
                   child: AppButton(
                     color: Color(0xffD02127),
-                    disabled: finalRadiology.dIAPACSURL == "",
                     onPressed: () async {
                       await locator<AnalyticsService>().logEvent(
                         eventCategory: "RadiologyDetailsPage",