updates

lib/core/model/labs/request_send_lab_report_email.dart

@@ -25,6 +25,7 @@ class RequestSendLabReportEmail {
   String invoiceNo;
   String invoiceNoVP;
   String orderDate;
+  String orderNo;
 
   RequestSendLabReportEmail(
       {this.versionID,
@@ -52,7 +53,7 @@ class RequestSendLabReportEmail {
         this.projectID,
         this.invoiceNo,
         this.invoiceNoVP,
-        this.orderDate});
+        this.orderDate, this.orderNo});
 
   RequestSendLabReportEmail.fromJson(Map<String, dynamic> json) {
     versionID = json['VersionID'];
@@ -81,6 +82,7 @@ class RequestSendLabReportEmail {
     invoiceNo = json['InvoiceNo'];
     invoiceNoVP = json['InvoiceNo_VP'];
     orderDate = json['OrderDate'];
+    orderNo = json['OrderNo'];
   }
 
   Map<String, dynamic> toJson() {
@@ -111,6 +113,7 @@ class RequestSendLabReportEmail {
     data['InvoiceNo'] = this.invoiceNo;
     data['InvoiceNo_VP'] = this.invoiceNoVP;
     data['OrderDate'] = this.orderDate;
+    data['OrderNo'] = this.orderNo;
     return data;
   }
 }

lib/core/service/client/base_app_client.dart

@@ -150,8 +150,8 @@ class BaseAppClient {
 
       // body['IdentificationNo'] = 1023854217;
       // body['MobileNo'] = "531940021";
-      // body['PatientID'] = 336; //3844083
-      // body['TokenID'] = "@dm!n";
+      body['PatientID'] = 339; //3844083
+      body['TokenID'] = "@dm!n";
 
       // Patient ID: 3027574
       // Mobile no.: 0502303285

lib/core/service/medical/labs_service.dart

@@ -195,6 +195,7 @@ class LabsService extends BaseService {
     _requestSendLabReportEmail.patientMobileNumber = userObj.mobileNumber;
     _requestSendLabReportEmail.projectName = patientLabOrder.projectName;
     _requestSendLabReportEmail.setupID = patientLabOrder.setupID;
+    _requestSendLabReportEmail.orderNo = patientLabOrder.orderNo;
 
     await baseAppClient.post(SEND_LAB_RESULT_EMAIL, onSuccess: (dynamic response, int statusCode) {}, onFailure: (String error, int statusCode) {
       hasError = true;

lib/core/service/medical/radiology_service.dart

@@ -10,11 +10,11 @@ class RadiologyService extends BaseService {
 
   bool isRadiologyVIDAPlus = false;
 
-  Future getRadImageURL({int invoiceNo, int lineItem, int projectId}) async {
+  Future getRadImageURL({int invoiceNo, int lineItem, int projectId, bool isVidaPlus}) async {
     hasError = false;
     final Map<String, dynamic> body = new Map<String, dynamic>();
-    body['InvoiceNo'] = invoiceNo;
-    body['InvoiceNo_VP'] = invoiceNo;
+    body['InvoiceNo'] = isVidaPlus ? "0" : invoiceNo;
+    body['InvoiceNo_VP'] = isVidaPlus ? invoiceNo : "0";
     body['LineItemNo'] = lineItem;
     body['ProjectID'] = projectId;
 

lib/core/viewModels/medical/radiology_view_model.dart

@@ -48,9 +48,9 @@ class RadiologyViewModel extends BaseViewModel {
 
   String get radImageURL => _radiologyService.url;
 
-  getRadImageURL({int invoiceNo, int lineItem, int projectId}) async {
+  getRadImageURL({int invoiceNo, int lineItem, int projectId, bool isVidaPlus}) async {
     setState(ViewState.Busy);
-    await _radiologyService.getRadImageURL(invoiceNo: invoiceNo, lineItem: lineItem, projectId: projectId);
+    await _radiologyService.getRadImageURL(invoiceNo: invoiceNo, lineItem: lineItem, projectId: projectId, isVidaPlus: isVidaPlus);
     if (_radiologyService.hasError) {
       error = _radiologyService.error;
       setState(ViewState.Error);

lib/pages/medical/radiology/radiology_details_page.dart

@@ -6,6 +6,7 @@ import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.da
 import 'package:diplomaticquarterapp/models/header_model.dart';
 import 'package:diplomaticquarterapp/pages/base/base_view.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/uitl/utils.dart';
 import 'package:diplomaticquarterapp/uitl/utils_new.dart';
 import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
 import 'package:diplomaticquarterapp/widgets/dialogs/confirm_send_email_dialog.dart';
@@ -27,7 +28,10 @@ class RadiologyDetailsPage extends StatelessWidget {
     ProjectViewModel projectViewModel = Provider.of(context);
     return BaseView<RadiologyViewModel>(
       onModelReady: (model) => model.getRadImageURL(
-          projectId: finalRadiology.projectID, lineItem: finalRadiology.invoiceLineItemNo, invoiceNo: isRadiologyVidaPlus ? finalRadiology.invoiceNo_VP : finalRadiology.invoiceNo),
+          projectId: finalRadiology.projectID,
+          lineItem: finalRadiology.invoiceLineItemNo,
+          invoiceNo: Utils.isVidaPlusProject(projectViewModel, finalRadiology.projectID) ? finalRadiology.invoiceNo_VP : finalRadiology.invoiceNo,
+          isVidaPlus: Utils.isVidaPlusProject(projectViewModel, finalRadiology.projectID)),
       builder: (_, model, widget) => AppScaffold(
         appBarTitle: TranslationBase.of(context).report,
         isShowAppBar: true,
@@ -46,7 +50,7 @@ class RadiologyDetailsPage extends StatelessWidget {
                   finalRadiology.doctorID,
                   finalRadiology.doctorImageURL,
                   finalRadiology.speciality,
-                  finalRadiology.invoiceNo.toString(),
+                  Utils.isVidaPlusProject(projectViewModel, finalRadiology.projectID) ? finalRadiology.invoiceNo_VP.toString() : finalRadiology.invoiceNo.toString(),
                   finalRadiology.projectName,
                   finalRadiology.orderDate,
                   null,

lib/pages/medical/radiology/radiology_home_page.dart

@@ -86,6 +86,7 @@ class RadiologyHomePage extends StatelessWidget {
                                 isInOutPatient: radiology.isInOutPatient,
                                 name: TranslationBase.of(context).dr + " " + radiology.doctorName,
                                 billNo: Utils.isVidaPlusProject(projectViewModel, radiology.projectID) ? radiology.invoiceNo_VP.toString() : radiology.invoiceNo.toString(),
+                                // billNo: radiology.invoiceNo_VP.toString(),
                                 profileUrl: radiology.doctorImageURL,
                                 subName: _isSortByClinic ? radiology.projectName : radiology.clinicDescription,
                                 isLiveCareAppointment: radiology.isLiveCareAppointment,

lib/uitl/utils.dart

@@ -815,8 +815,6 @@ class Utils {
     projectViewModel.vidaPlusProjectList.forEach((element) {
       if (element.projectID == projectID) {
         isVidaPlus = true;
-      } else {
-        isVidaPlus = false;
       }
     });
     return isVidaPlus;