diff --git a/ios/Podfile b/ios/Podfile
index c92f7e80..264db98d 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -32,6 +32,7 @@ target 'Runner' do
use_modular_headers!
pod 'OpenTok', '~> 2.22.0'
+ pod 'VTO2Lib'
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
end
@@ -53,9 +54,34 @@ post_install do |installer|
]
build_configuration.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'arm64 i386'
build_configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
+ xcconfig_path = build_configuration.base_configuration_reference.real_path
+ xcconfig = File.read(xcconfig_path)
+ xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR")
+ File.open(xcconfig_path, "w") { |file| file << xcconfig_mod }
+
if build_configuration.build_settings['WRAPPER_EXTENSION'] == 'bundle'
build_configuration.build_settings['DEVELOPMENT_TEAM'] = '3A359E86ZF'
end
end
end
+end
+
+post_integrate do |installer|
+ compiler_flags_key = 'COMPILER_FLAGS'
+ project_path = 'Pods/Pods.xcodeproj'
+
+ project = Xcodeproj::Project.open(project_path)
+ project.targets.each do |target|
+ target.build_phases.each do |build_phase|
+ if build_phase.is_a?(Xcodeproj::Project::Object::PBXSourcesBuildPhase)
+ build_phase.files.each do |file|
+ if !file.settings.nil? && file.settings.key?(compiler_flags_key)
+ compiler_flags = file.settings[compiler_flags_key]
+ file.settings[compiler_flags_key] = compiler_flags.gsub(/-DOS_OBJECT_USE_OBJC=0\s*/, '')
+ end
+ end
+ end
+ end
+ end
+ project.save()
end
\ No newline at end of file
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 240eb6e4..c3e46b58 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 51;
+ objectVersion = 54;
objects = {
/* Begin PBXBuildFile section */
@@ -322,6 +322,7 @@
/* Begin PBXShellScriptBuildPhase section */
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
isa = PBXShellScriptBuildPhase;
+ alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -392,6 +393,7 @@
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
+ alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -538,7 +540,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
- MARKETING_VERSION = 4.5.63;
+ MARKETING_VERSION = 4.5.75;
PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -682,7 +684,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
- MARKETING_VERSION = 4.5.63;
+ MARKETING_VERSION = 4.5.75;
PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -720,7 +722,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
- MARKETING_VERSION = 4.5.63;
+ MARKETING_VERSION = 4.5.75;
PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
new file mode 100644
index 00000000..ea96fe5f
--- /dev/null
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/config/config.dart b/lib/config/config.dart
index d5482cb8..6666141f 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -20,10 +20,18 @@ var PACKAGES_ORDERS = '/api/orders';
var PACKAGES_ORDER_HISTORY = '/api/orders/items';
var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
// var BASE_URL = 'http://10.50.100.198:4422/';
-var BASE_URL = 'https://uat.hmgwebservices.com/';
+//var BASE_URL = 'https://uat.hmgwebservices.com/';
// var BASE_URL = 'https://hmgwebservices.com/';
+ // var BASE_URL = 'http://10.20.200.111:1010/';
+ // var BASE_URL = 'https://uat.hmgwebservices.com/';
+var BASE_URL = 'https://hmgwebservices.com/';
// var BASE_URL = 'https://orash.cloudsolutions.com.sa/';
// var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/';
+// var BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/';
+
+// var BASE_URL = 'https://webservices.hmg.com/';
+
+// var BASE_URL = 'http://10.50.100.198:4422/';
// Pharmacy UAT URLs
// var BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
@@ -33,6 +41,12 @@ var BASE_URL = 'https://uat.hmgwebservices.com/';
var BASE_PHARMACY_URL = 'https://mdlaboratories.com/exacartapi/api/';
var PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapi/api/';
+var PHARMACY_REDIRECT_URL = 'https://bit.ly/AlhabibPharmacy';
+
+// Pharmacy VidaPlus URLs
+// var BASE_PHARMACY_URL = 'https://mdlaboratories.com/exacartapitest/api/';
+// var PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapitest/api/';
+
// // Pharmacy Pre-Production URLs
// var BASE_PHARMACY_URL = 'https://mdlaboratories.com/exacartapitest/api/';
// var PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapitest/api/';
@@ -40,6 +54,8 @@ var PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapi/api/';
// RC API URL
var RC_BASE_URL = 'https://rc.hmg.com/';
+// var RC_BASE_URL = 'https://ms.hmg.com/rc/';
+
var PING_SERVICE = 'Services/Weather.svc/REST/CheckConnectivity';
var GET_PROJECT = 'Services/Lists.svc/REST/GetProject';
@@ -326,7 +342,7 @@ var UPDATE_COVID_QUESTIONNAIRE = 'Services/Doctors.svc/REST/COVID19_Questionnari
var CHANNEL = 3;
var GENERAL_ID = 'Cs2020@2016\$2958';
var IP_ADDRESS = '10.20.10.20';
-var VERSION_ID = 10.8;
+var VERSION_ID = 11.6;
var SETUP_ID = '91877';
var LANGUAGE = 2;
// var PATIENT_OUT_SA = 0;
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index 4984053d..ba17f2ec 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -182,7 +182,7 @@ const Map localizedValues = {
'passQRAppoAttend': {'en': 'Pass the QR code through the attendance devices available in the Hospital.', 'ar': 'تمرير الكود من خلال اجهزة تسجيل الحضور المتوفرة في الفرع.'},
'sitWaitingQR': {'en': 'Sit in the waiting rooms until called by the nurse.', 'ar': 'الجلوس في غرف الانتظار لحين منادتك من قبل الممرضة.'},
'attendRegisterCode': {'en': 'Attendance registration code', 'ar': 'رمز تسجيل الحضور'},
- 'scanQRHospital': {'en': 'Approach the Online Check-In board in the hospital & scan via NFC to Check-In', 'ar': 'اقترب من لوحة تسجيل الوصول عبر الإنترنت في المستشفى وافحصها عبر NFC لتسجيل الوصول'},
+ 'scanQRHospital': {'en': 'Approach the Online Check-In board in the hospital & scan via NFC or QR Code to Check-In', 'ar': 'اقترب من لوحة تسجيل الوصول عبر الإنترنت في المستشفى وقم بالمسح الضوئي عبر NFC أو رمز الاستجابة السريعة لتسجيل الوصول'},
'scanNFC': {'en': 'Scan NFC to Check-In', 'ar': 'مسح NFC لتسجيل الوصول'},
"sendEmail": {"en": "Send Email", "ar": "ارسال نسخة"},
"success": {"en": "Done successfully", "ar": "تم تنفذ الطلب بنجاح"},
@@ -791,7 +791,7 @@ const Map localizedValues = {
"Upon activation of this service, the system will send a monthly report automatically to the registered email which lists the vital signs and the results for the last visits made in AlHabib Medical Group.",
"ar": "خدمة التقارير الشهرية: عند تفعيل هذه الخدمة سيقوم النظام بارسال تقرير شهري بشكل آلي على الايميل المسجل والذي يسرد المؤشرات الحيوية ونتائج التحاليل لآخر زيارات تمت بمجموعة الحبيب الطبية."
},
- "language-setting": {"en": "SMS and Confirmation Calls Language", "ar": "لغة الرسائل القصيرة و الاتصال الآلي"},
+ "language-setting": {"en": "SMS, WhatsApp and Confirmation Calls Language", "ar": "لغة الرسائل القصيرة والواتس اب وتأكيد المكالمات"},
"alert": {"en": "Alerts", "ar": "التنبيهات"},
"email-alert": {"en": "Alert by Email", "ar": "استلام التنبيهات بالبريد الالكتروني"},
"sms-alert": {"en": "Alert by SMS", "ar": "استلام التنبيهات بالرسائل القصيرة"},
@@ -1893,4 +1893,14 @@ const Map localizedValues = {
"sickLeaveAdmittedPatient": {"en": "You cannot activate this sick leave since you're an admitted patient.", "ar": "لا يمكنك تفعيل هذه الإجازة المرضية لأنك مريض مقبل."},
"dischargeDate": {"en": "Discharge Date", "ar": "تاريخ التفريغ"},
"selectAdmissionText": {"en": "Please select one of the admissions from below to view medical reports:", "ar": "يرجى تحديد أحد حالات القبول من الأسفل لعرض التقارير الطبية:"},
+ "invalidEligibility": {"en": "You cannot make online payment because you are not eligible to use the provided service.", "ar": "لا يمكنك إجراء الدفع عبر الإنترنت لأنك غير مؤهل لاستخدام الخدمة المقدمة."},
+ "invalidInsurance": {"en": "You cannot make online payment because you do not have a valid insurance.", "ar": "لا يمكنك إجراء الدفع عبر الإنترنت لأنه ليس لديك تأمين صالح."},
+ "continueCash": {"en": "Continue as cash", "ar": "تواصل نقدا"},
+ "updateInsurance": {"en": "Update insurance", "ar": "تحديث التأمين"},
+ "downloadReport": {"en": "Download Report", "ar": "تحميل تقرير المختبر"},
+ "habibCallCenter": {"en": "Please contact AlHabib call center to update your insurance manually.", "ar": "يرجى الاتصال بمركز اتصال الحبيب لتحديث التأمين الخاص بك يدوياً."},
+ "cashAmountUpdateInsurance": {"en": "Please note that this is the cash amount, If you want to update your insurance, Please tap below:", "ar": "يرجى ملاحظة أن هذا هو المبلغ النقدي، إذا كنت ترغب في تحديث التأمين الخاص بك، يرجى النقر أدناه:"},
+ "validInsurance": {"en": "Do you have a valid insurance?", "ar": "هل لديك تأمين صالح؟"},
+ "checkInViaLocation": {"en": "Check-In Via Location", "ar": "تسجيل الوصول عبر الموقع"},
+ "locationCheckInError": {"en": "Please make sure that you're within the hospital location to perform online check-in.", "ar": "يرجى التأكد من تواجدك داخل موقع المستشفى لإجراء تسجيل الوصول عبر الإنترنت."},
};
\ No newline at end of file
diff --git a/lib/config/shared_pref_kay.dart b/lib/config/shared_pref_kay.dart
index ec82db11..f92841e3 100644
--- a/lib/config/shared_pref_kay.dart
+++ b/lib/config/shared_pref_kay.dart
@@ -43,3 +43,4 @@ const CLINICS_LIST = 'CLINICS_LIST';
const COVID_QA_LIST = 'COVID_QA_LIST';
const IS_COVID_CONSENT_SHOWN = 'IS_COVID_CONSENT_SHOWN';
const REGISTER_INFO_DUBAI ='register-info-dubai';
+const IS_LAST_APPOINTMENT_RATE_SHOWN ='is-last-appointment-rate-shown';
diff --git a/lib/core/model/labs/patient_lab_orders.dart b/lib/core/model/labs/patient_lab_orders.dart
index 3c49b80a..c58222e3 100644
--- a/lib/core/model/labs/patient_lab_orders.dart
+++ b/lib/core/model/labs/patient_lab_orders.dart
@@ -16,6 +16,8 @@ class PatientLabOrders {
int gender;
String genderDescription;
String invoiceNo;
+ String invoiceNo_VP;
+ String invoiceType;
bool isActiveDoctorProfile;
bool isDoctorAllowVedioCall;
bool isExecludeDoctor;
@@ -35,6 +37,7 @@ class PatientLabOrders {
String setupID;
List speciality;
bool isLiveCareAppointment;
+
PatientLabOrders(
{this.actualDoctorRate,
this.clinicDescription,
@@ -68,7 +71,10 @@ class PatientLabOrders {
this.projectNameN,
this.qR,
this.setupID,
- this.speciality,this.isLiveCareAppointment});
+ this.invoiceNo_VP,
+ this.invoiceType,
+ this.speciality,
+ this.isLiveCareAppointment});
PatientLabOrders.fromJson(Map json) {
actualDoctorRate = json['ActualDoctorRate'];
@@ -103,8 +109,10 @@ class PatientLabOrders {
projectNameN = json['ProjectNameN'];
qR = json['QR'];
setupID = json['SetupID'];
+ invoiceNo_VP = json['invoiceNo_VP'];
+ invoiceType = json['InvoiceType'];
isLiveCareAppointment = json['IsLiveCareAppointment'];
- // speciality = json['Speciality'].cast();
+ // speciality = json['Speciality'].cast();
}
Map toJson() {
@@ -143,6 +151,7 @@ class PatientLabOrders {
data['SetupID'] = this.setupID;
data['Speciality'] = this.speciality;
data['IsLiveCareAppointment'] = this.isLiveCareAppointment;
+ data['invoiceNo_VP'] = this.invoiceNo_VP;
return data;
}
}
@@ -151,8 +160,7 @@ class PatientLabOrdersList {
String filterName = "";
List patientLabOrdersList = List();
- PatientLabOrdersList(
- {this.filterName, PatientLabOrders patientDoctorAppointment}) {
+ PatientLabOrdersList({this.filterName, PatientLabOrders patientDoctorAppointment}) {
patientLabOrdersList.add(patientDoctorAppointment);
}
}
diff --git a/lib/core/model/labs/request_patient_lab_special_result.dart b/lib/core/model/labs/request_patient_lab_special_result.dart
index bdeb3930..795fa025 100644
--- a/lib/core/model/labs/request_patient_lab_special_result.dart
+++ b/lib/core/model/labs/request_patient_lab_special_result.dart
@@ -1,5 +1,7 @@
class RequestPatientLabSpecialResult {
String invoiceNo;
+ String invoiceNoVP;
+ String invoiceType;
String orderNo;
String setupID;
String projectID;
@@ -20,26 +22,30 @@ class RequestPatientLabSpecialResult {
RequestPatientLabSpecialResult(
{this.invoiceNo,
- this.orderNo,
- this.setupID,
- this.projectID,
- this.clinicID,
- this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.patientID,
- this.tokenID,
- this.patientTypeID,
- this.patientType});
+ this.invoiceNoVP,
+ this.invoiceType,
+ this.orderNo,
+ this.setupID,
+ this.projectID,
+ this.clinicID,
+ this.versionID,
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.patientID,
+ this.tokenID,
+ this.patientTypeID,
+ this.patientType});
RequestPatientLabSpecialResult.fromJson(Map json) {
invoiceNo = json['InvoiceNo'];
+ invoiceNo = json['InvoiceNo_VP'];
+ invoiceType = json['InvoiceType'];
orderNo = json['OrderNo'];
setupID = json['SetupID'];
projectID = json['ProjectID'];
@@ -62,6 +68,8 @@ class RequestPatientLabSpecialResult {
Map toJson() {
final Map data = new Map();
data['InvoiceNo'] = this.invoiceNo;
+ data['InvoiceNo_VP'] = this.invoiceNoVP;
+ data['InvoiceType'] = this.invoiceType;
data['OrderNo'] = this.orderNo;
data['SetupID'] = this.setupID;
data['ProjectID'] = this.projectID;
diff --git a/lib/core/model/labs/request_send_lab_report_email.dart b/lib/core/model/labs/request_send_lab_report_email.dart
index 65ac1762..41fa30f9 100644
--- a/lib/core/model/labs/request_send_lab_report_email.dart
+++ b/lib/core/model/labs/request_send_lab_report_email.dart
@@ -23,8 +23,12 @@ class RequestSendLabReportEmail {
String doctorName;
String projectID;
String invoiceNo;
+ String invoiceNoVP;
+ String invoiceType;
String orderDate;
String orderNo;
+ bool isDownload;
+ int doctorID;
RequestSendLabReportEmail(
{this.versionID,
@@ -51,8 +55,12 @@ class RequestSendLabReportEmail {
this.doctorName,
this.projectID,
this.invoiceNo,
+ this.invoiceNoVP,
+ this.invoiceType,
this.orderDate,
- this.orderNo});
+ this.orderNo,
+ this.isDownload,
+ this.doctorID});
RequestSendLabReportEmail.fromJson(Map json) {
versionID = json['VersionID'];
@@ -79,8 +87,12 @@ class RequestSendLabReportEmail {
doctorName = json['DoctorName'];
projectID = json['ProjectID'];
invoiceNo = json['InvoiceNo'];
+ invoiceNoVP = json['InvoiceNo_VP'];
+ invoiceType = json['InvoiceType'];
orderDate = json['OrderDate'];
orderNo = json['OrderNo'];
+ isDownload = json['IsDownload'];
+ doctorID = json['DoctorID'];
}
Map toJson() {
@@ -109,8 +121,12 @@ class RequestSendLabReportEmail {
data['DoctorName'] = this.doctorName;
data['ProjectID'] = this.projectID;
data['InvoiceNo'] = this.invoiceNo;
+ data['InvoiceNo_VP'] = this.invoiceNoVP;
+ data['InvoiceType'] = this.invoiceType;
data['OrderDate'] = this.orderDate;
data['OrderNo'] = this.orderNo;
+ data['IsDownload'] = this.isDownload;
+ data['DoctorID'] = this.doctorID;
return data;
}
}
diff --git a/lib/core/model/privilege/HMCProjectListModel.dart b/lib/core/model/privilege/HMCProjectListModel.dart
new file mode 100644
index 00000000..6b69c1c5
--- /dev/null
+++ b/lib/core/model/privilege/HMCProjectListModel.dart
@@ -0,0 +1,15 @@
+class HMCProjectListModel {
+ int projectID;
+
+ HMCProjectListModel({this.projectID});
+
+ HMCProjectListModel.fromJson(Map json) {
+ projectID = json['ProjectID'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['ProjectID'] = this.projectID;
+ return data;
+ }
+}
diff --git a/lib/core/model/privilege/ProjectDetailListModel.dart b/lib/core/model/privilege/ProjectDetailListModel.dart
new file mode 100644
index 00000000..b8241797
--- /dev/null
+++ b/lib/core/model/privilege/ProjectDetailListModel.dart
@@ -0,0 +1,32 @@
+class ProjectDetailListModel {
+ int projectID;
+ String latitude;
+ String longitude;
+ int geofenceRadius;
+ String checkInQrCode;
+
+ ProjectDetailListModel(
+ {this.projectID,
+ this.latitude,
+ this.longitude,
+ this.geofenceRadius,
+ this.checkInQrCode});
+
+ ProjectDetailListModel.fromJson(Map json) {
+ projectID = json['ProjectID'];
+ latitude = json['Latitude'];
+ longitude = json['Longitude'];
+ geofenceRadius = json['GeofenceRadius'];
+ checkInQrCode = json['CheckInQrCode'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['ProjectID'] = this.projectID;
+ data['Latitude'] = this.latitude;
+ data['Longitude'] = this.longitude;
+ data['GeofenceRadius'] = this.geofenceRadius;
+ data['CheckInQrCode'] = this.checkInQrCode;
+ return data;
+ }
+}
diff --git a/lib/core/model/privilege/VidaPlusProjectListModel.dart b/lib/core/model/privilege/VidaPlusProjectListModel.dart
new file mode 100644
index 00000000..e56b82db
--- /dev/null
+++ b/lib/core/model/privilege/VidaPlusProjectListModel.dart
@@ -0,0 +1,15 @@
+class VidaPlusProjectListModel {
+ int projectID;
+
+ VidaPlusProjectListModel({this.projectID});
+
+ VidaPlusProjectListModel.fromJson(Map json) {
+ projectID = json['ProjectID'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['ProjectID'] = this.projectID;
+ return data;
+ }
+}
diff --git a/lib/core/model/radiology/final_radiology.dart b/lib/core/model/radiology/final_radiology.dart
index 7a9121fa..a600d0be 100644
--- a/lib/core/model/radiology/final_radiology.dart
+++ b/lib/core/model/radiology/final_radiology.dart
@@ -3,9 +3,11 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
class FinalRadiology {
String setupID;
int projectID;
- Null patientID;
+ dynamic patientID;
int invoiceLineItemNo;
int invoiceNo;
+ dynamic invoiceNo_VP;
+ String invoiceType;
int doctorID;
int clinicID;
DateTime orderDate;
@@ -49,6 +51,8 @@ class FinalRadiology {
this.patientID,
this.invoiceLineItemNo,
this.invoiceNo,
+ this.invoiceNo_VP,
+ this.invoiceType,
this.doctorID,
this.clinicID,
this.orderDate,
@@ -83,7 +87,8 @@ class FinalRadiology {
this.reportDataTextString,
this.speciality,
this.isCVI,
- this.isRadMedicalReport,this.isLiveCareAppointment});
+ this.isRadMedicalReport,
+ this.isLiveCareAppointment});
FinalRadiology.fromJson(Map json) {
try {
@@ -92,6 +97,8 @@ class FinalRadiology {
patientID = json['PatientID'];
invoiceLineItemNo = json['InvoiceLineItemNo'];
invoiceNo = json['InvoiceNo'];
+ invoiceNo_VP = json['InvoiceNo_VP'];
+ invoiceType = json['InvoiceType'];
doctorID = json['DoctorID'];
clinicID = json['ClinicID'];
orderDate = DateUtil.convertStringToDate(json['OrderDate']);
@@ -125,10 +132,9 @@ class FinalRadiology {
isLiveCareAppointment = json['IsLiveCareAppointment'];
reportDataHTML = json['ReportDataHTML'];
reportDataTextString = json['ReportDataTextString'];
- // speciality = json['Speciality'].cast();
+ // speciality = json['Speciality'].cast();
isCVI = json['isCVI'];
isRadMedicalReport = json['isRadMedicalReport'];
-
} catch (e) {
print(e);
}
@@ -141,6 +147,8 @@ class FinalRadiology {
data['PatientID'] = this.patientID;
data['InvoiceLineItemNo'] = this.invoiceLineItemNo;
data['InvoiceNo'] = this.invoiceNo;
+ data['InvoiceNo_VP'] = this.invoiceNo_VP;
+ data['InvoiceType'] = this.invoiceType;
data['DoctorID'] = this.doctorID;
data['ClinicID'] = this.clinicID;
data['OrderDate'] = this.orderDate;
@@ -185,7 +193,7 @@ class FinalRadiologyList {
List finalRadiologyList = List();
FinalRadiologyList({this.filterName, this.finalRadiologyList});
- // {
- // finalRadiologyList.add(finalRadiology);
- // }
+// {
+// finalRadiologyList.add(finalRadiology);
+// }
}
diff --git a/lib/core/model/radiology/request_send_rad_report_email.dart b/lib/core/model/radiology/request_send_rad_report_email.dart
index a461156e..1f3b7117 100644
--- a/lib/core/model/radiology/request_send_rad_report_email.dart
+++ b/lib/core/model/radiology/request_send_rad_report_email.dart
@@ -6,6 +6,8 @@ class RequestSendRadReportEmail {
String doctorName;
String generalid;
int invoiceNo;
+ int invoiceNo_VP;
+ String invoiceType;
String iPAdress;
bool isDentalAllowedBackend;
int languageID;
@@ -35,6 +37,8 @@ class RequestSendRadReportEmail {
this.doctorName,
this.generalid,
this.invoiceNo,
+ this.invoiceNo_VP,
+ this.invoiceType,
this.iPAdress,
this.isDentalAllowedBackend,
this.languageID,
@@ -63,6 +67,8 @@ class RequestSendRadReportEmail {
doctorName = json['DoctorName'];
generalid = json['generalid'];
invoiceNo = json['InvoiceNo'];
+ invoiceNo_VP = json['InvoiceNo_VP'];
+ invoiceType = json['InvoiceType'];
iPAdress = json['IPAdress'];
isDentalAllowedBackend = json['isDentalAllowedBackend'];
languageID = json['LanguageID'];
@@ -94,6 +100,8 @@ class RequestSendRadReportEmail {
data['DoctorName'] = this.doctorName;
data['generalid'] = this.generalid;
data['InvoiceNo'] = this.invoiceNo;
+ data['InvoiceNo_VP'] = this.invoiceNo_VP;
+ data['InvoiceType'] = this.invoiceType;
data['IPAdress'] = this.iPAdress;
data['isDentalAllowedBackend'] = this.isDentalAllowedBackend;
data['LanguageID'] = this.languageID;
diff --git a/lib/core/model/rate/appoitment_rated.dart b/lib/core/model/rate/appoitment_rated.dart
index 95358b23..820e36a5 100644
--- a/lib/core/model/rate/appoitment_rated.dart
+++ b/lib/core/model/rate/appoitment_rated.dart
@@ -26,12 +26,12 @@ class AppoitmentRated {
String arrivedOn;
int editedBy;
String editedOn;
- Null doctorName;
+ dynamic doctorName;
String doctorNameN;
String statusDesc;
String statusDescN;
bool vitalStatus;
- Null vitalSignAppointmentNo;
+ dynamic vitalSignAppointmentNo;
int episodeID;
String doctorTitle;
bool isAppoitmentLiveCare;
diff --git a/lib/core/service/ancillary_orders_service.dart b/lib/core/service/ancillary_orders_service.dart
index 631f17ff..dcb34aad 100644
--- a/lib/core/service/ancillary_orders_service.dart
+++ b/lib/core/service/ancillary_orders_service.dart
@@ -54,15 +54,18 @@ class AncillaryOrdersService extends BaseService {
return Future.value(localRes);
}
- Future getOrdersDetails(appointmentNo, orderNo, projectID) async {
+ Future