diff --git a/assets/fonts/DoctorApp.ttf b/assets/fonts/DoctorApp.ttf
index bc62109b..aa108809 100644
Binary files a/assets/fonts/DoctorApp.ttf and b/assets/fonts/DoctorApp.ttf differ
diff --git a/assets/images/DrAppEmblemAnimation_v2.gif b/assets/images/DrAppEmblemAnimation_v2.gif
new file mode 100644
index 00000000..fd2248b5
Binary files /dev/null and b/assets/images/DrAppEmblemAnimation_v2.gif differ
diff --git a/assets/images/habib-logo.png b/assets/images/habib-logo.png
new file mode 100644
index 00000000..bcb6a42b
Binary files /dev/null and b/assets/images/habib-logo.png differ
diff --git a/assets/images/inpatient.png b/assets/images/inpatient.png
new file mode 100644
index 00000000..7a715654
Binary files /dev/null and b/assets/images/inpatient.png differ
diff --git a/assets/images/patient/vital_signs/oxg.png b/assets/images/patient/vital_signs/oxg.png
new file mode 100644
index 00000000..344344e5
Binary files /dev/null and b/assets/images/patient/vital_signs/oxg.png differ
diff --git a/assets/images/patient/vital_signs/painScale.png b/assets/images/patient/vital_signs/painScale.png
new file mode 100644
index 00000000..36b6b9f0
Binary files /dev/null and b/assets/images/patient/vital_signs/painScale.png differ
diff --git a/assets/images/soundWaveAnimation.gif b/assets/images/soundWaveAnimation.gif
new file mode 100644
index 00000000..730e27eb
Binary files /dev/null and b/assets/images/soundWaveAnimation.gif differ
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 171125d9..645c587b 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -27,7 +27,10 @@
NSFaceIDUsageDescription
We are using it for authentication
-
+ NSAppleMusicUsageDescription
+ ${PRODUCT_NAME} requires access to use voice command
+
+
UILaunchStoryboardName
LaunchScreen
UIMainStoryboardFile
diff --git a/lib/UpdatePage.dart b/lib/UpdatePage.dart
index dc94b6e6..16284ed1 100644
--- a/lib/UpdatePage.dart
+++ b/lib/UpdatePage.dart
@@ -1,11 +1,13 @@
+import 'dart:io' show Platform;
+
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
-import 'package:doctor_app_flutter/widgets/shared/Text.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
-import 'package:doctor_app_flutter/widgets/shared/secondary_button.dart';
+import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:url_launcher/url_launcher.dart';
-import 'dart:io' show Platform;
+
+import 'widgets/shared/buttons/secondary_button.dart';
class UpdatePage extends StatelessWidget {
final String message;
@@ -32,14 +34,14 @@ class UpdatePage extends StatelessWidget {
),
Image.asset('assets/images/HMG_logo.png'),
SizedBox(height: 8,),
- Texts(
+ AppText(
TranslationBase.of(context).updateTheApp.toUpperCase(),fontSize: 17,
fontWeight: FontWeight.w600,
),
SizedBox(height: 12,),
Padding(
padding: const EdgeInsets.all(8.0),
- child: Texts(message??"Update the app",fontSize: 12,),
+ child: AppText(message??"Update the app",fontSize: 12,),
)
],
),
diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart
index 0ba19289..e92a921c 100644
--- a/lib/client/base_app_client.dart
+++ b/lib/client/base_app_client.dart
@@ -1,4 +1,5 @@
import 'dart:convert';
+import 'dart:io' show Platform;
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
@@ -6,32 +7,12 @@ import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
-import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:http/http.dart' as http;
-import 'dart:io' show Platform;
-
-import '../UpdatePage.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
Helpers helpers = new Helpers();
-//ProjectProvider projectsProvider = new ProjectProvider();
-/*
- *@author: Mohammad Aljammal
- *@Date:28/5/2020
- *@param: url, onSuccess callBack, onFailure callBack
- *@return:
- *@desc:
- */
-
-///Example
-/*
- await BaseAppClient.post('',
- onSuccess: (dynamic response, int statusCode) {},
- onFailure: (String error, int statusCode) {},
- body: null);
-* */
class BaseAppClient {
//TODO change the post fun to nun static when you change all service
post(String endPoint,
@@ -86,11 +67,15 @@ class BaseAppClient {
await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
}
+ if (body['ProjectID'] != null &&
+ (body['ProjectID'] == 2 || body['ProjectID'] == 3)) {
+ body['PatientOutSA'] = true;
+ }
+
print("URL : $url");
print("Body : ${json.encode(body)}");
- String req = json.encode(body);
- var asd="";
-
+ var asd = json.encode(body);
+ var asd2;
if (await Helpers.checkConnection()) {
final response = await http.post(url,
body: json.encode(body),
@@ -100,20 +85,21 @@ class BaseAppClient {
});
final int statusCode = response.statusCode;
if (statusCode < 200 || statusCode >= 400) {
- onFailure('Error While Fetching data', statusCode);
+ onFailure(Helpers.generateContactAdminMsg(), statusCode);
} else {
var parsed = json.decode(response.body.toString());
if (parsed['ErrorType'] == 4) {
- helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'],parsed['AndroidLink'],parsed['IOSLink']);
+ helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'],
+ parsed['AndroidLink'], parsed['IOSLink']);
}
if (!parsed['IsAuthenticated']) {
if (body['OTP_SendType'] != null) {
onFailure(getError(parsed), statusCode);
} else if (!isAllowAny) {
- await helpers.logout();
- helpers.showErrorToast('Your session expired Please login agian');
+ await Helpers.logout();
+ Helpers.showErrorToast('Your session expired Please login agian');
}
if (isAllowAny) {
onFailure(getError(parsed), statusCode);
@@ -161,11 +147,11 @@ class BaseAppClient {
: SETUP_ID;
}
- body['VersionID'] = 6.3;
+ body['VersionID'] = 8.3;
body['Channel'] = CHANNEL;
body['LanguageID'] = languageID == 'ar' ? 1 : 2;
- body['IPAdress'] = IP_ADDRESS;
+ body['IPAdress'] = "10.20.10.20";
body['generalid'] = GENERAL_ID;
body['PatientOutSA'] = body.containsKey('PatientOutSA')
? body['PatientOutSA'] != null
@@ -208,6 +194,11 @@ class BaseAppClient {
body['PatientOutSA'] = 0; //user['OutSA']; //TODO change it
body['SessionID'] = SESSION_ID; //getSe
+ if (body['ProjectID'] != null &&
+ (body['ProjectID'] == 2 || body['ProjectID'] == 3)) {
+ body['PatientOutSA'] = true;
+ }
+
print("URL : $url");
print("Body : ${json.encode(body)}");
@@ -225,7 +216,8 @@ class BaseAppClient {
onSuccess(parsed, statusCode);
} else {
if (parsed['ErrorType'] == 4) {
- helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'],parsed['AndroidLink'],parsed['IOSLink']);
+ helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'],
+ parsed['AndroidLink'], parsed['IOSLink']);
}
if (parsed['IsAuthenticated'] == null) {
if (parsed['isSMSSent'] == true) {
@@ -289,7 +281,6 @@ class BaseAppClient {
}
}
-
String getError(parsed) {
//TODO change this fun
String error = parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'];
@@ -308,7 +299,7 @@ class BaseAppClient {
}
}
if (error == null || error == "null" || error == "null\n") {
- return helpers.generateContactAdminMsg();
+ return Helpers.generateContactAdminMsg();
}
return error;
}
diff --git a/lib/config/config.dart b/lib/config/config.dart
index b00c3960..07151d1d 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -68,6 +68,8 @@ const GET_PRESCRIPTION_REPORT_FOR_IN_PATIENT =
const GET_MY_REFERRAL_PATIENT =
'Services/DoctorApplication.svc/REST/GtMyReferralPatient';
+const REFER_TO_DOCTOR = 'Services/DoctorApplication.svc/REST/ReferToDoctor';
+
const ADD_REFERRED_DOCTOR_REMARKS =
'Services/DoctorApplication.svc/REST/AddReferredDoctorRemarks';
@@ -127,7 +129,7 @@ const GET_SICKLEAVE_STATISTIC =
const ARRIVED_PATIENT_URL =
'Services/DoctorApplication.svc/REST/PatientArrivalList';
const ADD_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/PostSickLeave';
-const GET_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/GetAllSickLeaves';
+const GET_SICK_LEAVE = 'Services/Patients.svc/REST/GetPatientSickLeave';
const EXTEND_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/ExtendSickLeave';
const GET_OFFTIME = 'Services/DoctorApplication.svc/REST/GetMasterLookUpList';
@@ -150,6 +152,12 @@ const POST_PROCEDURE_LIST = 'Services/DoctorApplication.svc/REST/PostProcedure';
const GET_PATIENT_ARRIVAL_LIST =
'Services/DoctorApplication.svc/REST/PatientArrivalList';
+const GET_PATIENT_IN_PATIENT_LIST =
+ 'Services/DoctorApplication.svc/REST/GetMyInPatient';
+
+const Verify_Referral_Doctor_Remarks =
+ 'Services/DoctorApplication.svc/REST/VerifyReferralDoctorRemarks';
+
///Lab Order
const GET_Patient_LAB_ORDERS = 'Services/Patients.svc/REST/GetPatientLabOrders';
const GET_Patient_LAB_SPECIAL_RESULT =
@@ -233,11 +241,21 @@ const GET_BOX_QUANTITY =
///GET ECG
const GET_ECG = "Services/Patients.svc/REST/HIS_GetPatientMuseResults";
+const GET_MY_REFERRAL_INPATIENT =
+ "Services/DoctorApplication.svc/REST/GtMyReferralPatient";
+
+const GET_MY_DISCHARGE_PATIENT =
+ "Services/DoctorApplication.svc/REST/GtMyDischargeReferralPatient";
+const GET_DISCHARGE_PATIENT =
+ "Services/DoctorApplication.svc/REST/GtMyDischargePatient";
+
const GET_PAtIENTS_INSURANCE_APPROVALS =
"Services/Patients.svc/REST/GetApprovalStatus";
const GET_RAD_IMAGE_URL = 'Services/Patients.svc/Rest/GetRadImageURL';
const GET_PATIENT_ORDERS = 'Services/Patients.svc/REST/GetPatientRadOrders';
+const GET_IN_PATIENT_ORDERS =
+ 'Services/DoctorApplication.svc/REST/GetPatientRadResult';
///Prescriptions
const PRESCRIPTIONS = 'Services/Patients.svc/REST/GetPrescriptionApptList';
@@ -250,6 +268,19 @@ const SEND_PRESCRIPTION_EMAIL =
const GET_PRESCRIPTION_REPORT_ENH =
'Services/Patients.svc/REST/GetPrescriptionReport_enh';
const GET_PHARMACY_LIST = "Services/Patients.svc/REST/GetPharmcyList";
+const UPDATE_PROGRESS_NOTE_FOR_INPATIENT =
+ "Services/DoctorApplication.svc/REST/UpdateProgressNoteForInPatient";
+const CREATE_PROGRESS_NOTE_FOR_INPATIENT =
+ "Services/DoctorApplication.svc/REST/CreateProgressNoteForInPatient";
+
+const GET_PRESCRIPTION_IN_PATIENT =
+ 'Services/DoctorApplication.svc/REST/GetPrescriptionReportForInPatient';
+
+const GET_INSURANCE_IN_PATIENT =
+ "Services/DoctorApplication.svc/REST/GetApprovalStatusForInpatient";
+
+const GET_SICK_LEAVE_PATIENT = "Services/Patients.svc/REST/GetPatientSickLeave";
+const GET_MY_OUT_PATIENT = "Services/DoctorApplication.svc/REST/GetMyOutPatient";
var selectedPatientType = 1;
@@ -275,8 +306,8 @@ var SERVICES_PATIANT2 = [
"patientArrivalList"
];
var SERVICES_PATIANT_HEADER = [
- "Search Out-Patient",
- "Search In-Patient",
+ "My OutPatient",
+ "My InPatient",
"Discharge",
"Referred",
"Referral Discharge",
@@ -305,7 +336,7 @@ const TRANSACTION_NO = 0;
const LANGUAGE_ID = 2;
const STAMP = '2020-04-27T12:17:17.721Z';
const IP_ADDRESS = '9.9.9.9';
-const VERSION_ID = 5.5;
+const VERSION_ID = 5.9;
const CHANNEL = 9;
const SESSION_ID = 'BlUSkYymTt';
const IS_LOGIN_FOR_DOCTOR_APP = true;
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index a133ef7a..ea99a982 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -30,7 +30,9 @@ const Map> localizedValues = {
'ar': 'ملاحضات وتفاصيل العيادة'
},
'outPatients': {'en': 'Out Patient', 'ar': 'المريض الخارجي'},
- 'searchPatient': {'en': 'Search Patient', 'ar': 'البحث عن مريض'},
+ 'myOutPatient': {'en': 'My OutPatients', 'ar': 'المريض الخارجي'},
+
+ 'searchPatient': {'en': 'Search Patients', 'ar': 'البحث عن مريض'},
'searchAbout': {'en': 'Search', 'ar': 'البحث عن'},
'patient': {'en': 'Patient', 'ar': ' مريض'},
'patients': {'en': "Patient's", 'ar': ' مريض'},
@@ -45,10 +47,12 @@ const Map> localizedValues = {
'radiology': {'en': 'Radiology', 'ar': 'الأشعة'},
'service': {'en': 'Service', 'ar': 'خدمة'},
'referral': {'en': 'Referral', 'ar': 'الإحالة'},
- 'inPatient': {'en': 'In Patient', 'ar': 'المريض الداخلي'},
+ 'inPatient': {'en': 'My InPatients', 'ar': 'المريض الداخلي'},
+ 'inPatientLabel': {'en': 'InPatients', 'ar': 'المريض الداخلي'},
+ 'inPatientAll': {'en': 'All InPatients', 'ar': 'كل المرضى الداخليين'},
'operations': {'en': 'Operations', 'ar': 'عمليات'},
'patientServices': {'en': 'Patient Services', 'ar': 'خدمات المرضى'},
- 'searchMedicine': {'en': 'Search Medicine', 'ar': 'بحث عن الدواء'},
+ 'searchMedicine': {'en': 'Search Medicines', 'ar': 'بحث عن الدواء'},
'myReferralPatient': {'en': 'My Referral Patient', 'ar': 'مرضى الاحالة'},
'referPatient': {'en': 'Referral Patient', 'ar': 'إحالة مريض'},
'myReferral': {'en': 'My Referral', 'ar': 'إحالة'},
@@ -381,8 +385,8 @@ const Map> localizedValues = {
'leanBodyWeight': {'en': "Lean Body Weight", 'ar': 'وزن الجسم الهزيل'},
'bodyMassIndex': {'en': "Body Mass Index", 'ar': 'مؤشر كتلة الجسم'},
'yourBodyMassIndex': {
- 'en': "Your Body Mass Index is",
- 'ar': 'مؤشر كتلة جسمك هو'
+ 'en': "Body Mass Index is",
+ 'ar': 'مؤشر كتلة الجسم هو'
},
'bmiUnderWeight': {'en': "UnderWeight", 'ar': 'تحت الوزن'},
'bmiHealthy': {'en': "Healthy", 'ar': 'صحي'},
@@ -437,6 +441,7 @@ const Map> localizedValues = {
'en': "Expected Admission Date",
'ar': 'تاريخ القبول المتوقع'
},
+ 'admissionDate': {'en': "Admission Date", 'ar': 'تاريخ القبول'},
// 'emergencyAdmission': {'en': "EMERGENCY ADMISSION", 'ar': 'دخول الطوارئ'},
'isSickLeaveRequired': {
'en': "Is Sick Leave Required",
@@ -765,7 +770,7 @@ const Map> localizedValues = {
'arrived_p': {'en': "Arrived", 'ar': "وصل"},
'details': {'en': 'Details', 'ar': 'التفاصيل'},
"liveCare": {"en": "Live Care", "ar": "لايف كير"},
- "out-patient": {"en": "Out Patient", "ar": "عيادات خارجية"},
+ "out-patient": {"en": "OutPatient", "ar": "عيادات خارجية"},
"BillNo": {"en": "Bill No :", "ar": "رقم الفاتورة"},
"labResults": {"en": "Lab Result", "ar": "نتيجة المختبر"},
"sendSuc": {
@@ -779,7 +784,7 @@ const Map> localizedValues = {
},
"show-more-btn": {"en": "Flow Chart", "ar": "النتائج التراكمية"},
- "open-rad": {"en": "Open Image", "ar": "فتح صور الاشعة"},
+ "open-rad": {"en": "Open Radiology Image", "ar": "فتح صور الاشعة"},
'fileNumber': {'en': "File Number: ", 'ar': " :رقم الملف"},
'searchPatient-name': {
@@ -852,4 +857,17 @@ const Map> localizedValues = {
},
"updateNow": {"en": "Update Now", "ar": "تحديث الان"},
"updateTheApp": {"en": "Update The App", "ar": "تحديث التطبيق"},
+ "admission-date": {"en": "Admission Date", "ar": "تاريخ القبول"},
+ "noOfDays": {"en": "No of days", "ar": "عدد الأيام"},
+ "numOfDays": {"en": "Number of Days", "ar": "عدد الأيام"},
+ "replayBefore": {"en": "Replay Before", "ar": "رد قبل"},
+ "try-saying": {"en": "Try saying something", "ar": 'حاول قول شيء ما'},
+ "refClinic": {"en": "Ref Clinic", "ar": "Ref Clinic"},
+ "acknowledged": {"en": "Acknowledged", "ar": "إقرار"},
+ "didntCatch": {
+ "en": "Didn't catch that. Try Speaking again",
+ "ar": "لم يتم التقاط ذلك. حاول التحدث مرة أخرى"
+ },
+ "showDetail": {"en": "Show Detail", "ar": "أظهر المعلومات"},
+ "viewProfile": {"en": "View Profile", "ar": "إعرض الملف"},
};
diff --git a/lib/core/enum/patient_type.dart b/lib/core/enum/patient_type.dart
new file mode 100644
index 00000000..efea543c
--- /dev/null
+++ b/lib/core/enum/patient_type.dart
@@ -0,0 +1,2 @@
+enum PatientType { inPatient, OutPatient }
+
diff --git a/lib/core/insurance_approval_request_model.dart b/lib/core/insurance_approval_request_model.dart
new file mode 100644
index 00000000..02f71ecb
--- /dev/null
+++ b/lib/core/insurance_approval_request_model.dart
@@ -0,0 +1,64 @@
+class InsuranceApprovalInPatientRequestModel {
+ int patientID;
+ int patientTypeID;
+ int eXuldAPPNO;
+ int projectID;
+ int languageID;
+ String stamp;
+ String iPAdress;
+ double versionID;
+ int channel;
+ String tokenID;
+ String sessionID;
+ bool isLoginForDoctorApp;
+ bool patientOutSA;
+
+ InsuranceApprovalInPatientRequestModel(
+ {this.patientID,
+ this.patientTypeID,
+ this.eXuldAPPNO,
+ this.projectID,
+ this.languageID,
+ this.stamp,
+ this.iPAdress,
+ this.versionID,
+ this.channel,
+ this.tokenID,
+ this.sessionID,
+ this.isLoginForDoctorApp,
+ this.patientOutSA});
+
+ InsuranceApprovalInPatientRequestModel.fromJson(Map json) {
+ patientID = json['PatientID'];
+ patientTypeID = json['PatientTypeID'];
+ eXuldAPPNO = json['EXuldAPPNO'];
+ projectID = json['ProjectID'];
+ languageID = json['LanguageID'];
+ stamp = json['stamp'];
+ iPAdress = json['IPAdress'];
+ versionID = json['VersionID'];
+ channel = json['Channel'];
+ tokenID = json['TokenID'];
+ sessionID = json['SessionID'];
+ isLoginForDoctorApp = json['IsLoginForDoctorApp'];
+ patientOutSA = json['PatientOutSA'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['PatientID'] = this.patientID;
+ data['PatientTypeID'] = this.patientTypeID;
+ data['EXuldAPPNO'] = this.eXuldAPPNO;
+ data['ProjectID'] = this.projectID;
+ data['LanguageID'] = this.languageID;
+ data['stamp'] = this.stamp;
+ data['IPAdress'] = this.iPAdress;
+ data['VersionID'] = this.versionID;
+ data['Channel'] = this.channel;
+ data['TokenID'] = this.tokenID;
+ data['SessionID'] = this.sessionID;
+ data['IsLoginForDoctorApp'] = this.isLoginForDoctorApp;
+ data['PatientOutSA'] = this.patientOutSA;
+ return data;
+ }
+}
diff --git a/lib/core/model/DischargeReferralPatient.dart b/lib/core/model/DischargeReferralPatient.dart
new file mode 100644
index 00000000..523d8d0a
--- /dev/null
+++ b/lib/core/model/DischargeReferralPatient.dart
@@ -0,0 +1,218 @@
+import 'package:doctor_app_flutter/util/date-utils.dart';
+
+class DischargeReferralPatient {
+ dynamic rowID;
+ int projectID;
+ int lineItemNo;
+ int doctorID;
+ int patientID;
+ String doctorName;
+ dynamic doctorNameN;
+ String firstName;
+ String middleName;
+ String lastName;
+ dynamic firstNameN;
+ dynamic middleNameN;
+ dynamic lastNameN;
+ int gender;
+ String dateofBirth;
+ String mobileNumber;
+ String emailAddress;
+ String patientIdentificationNo;
+ int patientType;
+ String admissionNo;
+ String admissionDate;
+ String roomID;
+ String bedID;
+ dynamic nursingStationID;
+ dynamic description;
+ String nationalityName;
+ dynamic nationalityNameN;
+ int referralDoctor;
+ int referringDoctor;
+ int referralClinic;
+ int referringClinic;
+ int referralStatus;
+ DateTime referralDate;
+ String referringDoctorRemarks;
+ String referredDoctorRemarks;
+ String referralResponseOn;
+ int priority;
+ int frequency;
+ String mAXResponseTime;
+ String dischargeDate;
+ dynamic clinicID;
+ String age;
+ String clinicDescription;
+ String frequencyDescription;
+ String genderDescription;
+ bool isDoctorLate;
+ bool isDoctorResponse;
+ String nursingStationName;
+ String priorityDescription;
+ String referringClinicDescription;
+ String referringDoctorName;
+
+ DischargeReferralPatient(
+ {this.rowID,
+ this.projectID,
+ this.lineItemNo,
+ this.doctorID,
+ this.patientID,
+ this.doctorName,
+ this.doctorNameN,
+ this.firstName,
+ this.middleName,
+ this.lastName,
+ this.firstNameN,
+ this.middleNameN,
+ this.lastNameN,
+ this.gender,
+ this.dateofBirth,
+ this.mobileNumber,
+ this.emailAddress,
+ this.patientIdentificationNo,
+ this.patientType,
+ this.admissionNo,
+ this.admissionDate,
+ this.roomID,
+ this.bedID,
+ this.nursingStationID,
+ this.description,
+ this.nationalityName,
+ this.nationalityNameN,
+ this.referralDoctor,
+ this.referringDoctor,
+ this.referralClinic,
+ this.referringClinic,
+ this.referralStatus,
+ this.referralDate,
+ this.referringDoctorRemarks,
+ this.referredDoctorRemarks,
+ this.referralResponseOn,
+ this.priority,
+ this.frequency,
+ this.mAXResponseTime,
+ this.dischargeDate,
+ this.clinicID,
+ this.age,
+ this.clinicDescription,
+ this.frequencyDescription,
+ this.genderDescription,
+ this.isDoctorLate,
+ this.isDoctorResponse,
+ this.nursingStationName,
+ this.priorityDescription,
+ this.referringClinicDescription,
+ this.referringDoctorName});
+
+ DischargeReferralPatient.fromJson(Map json) {
+ rowID = json['RowID'];
+ projectID = json['ProjectID'];
+ lineItemNo = json['LineItemNo'];
+ doctorID = json['DoctorID'];
+ patientID = json['PatientID'];
+ doctorName = json['DoctorName'];
+ doctorNameN = json['DoctorNameN'];
+ firstName = json['FirstName'];
+ middleName = json['MiddleName'];
+ lastName = json['LastName'];
+ firstNameN = json['FirstNameN'];
+ middleNameN = json['MiddleNameN'];
+ lastNameN = json['LastNameN'];
+ gender = json['Gender'];
+ dateofBirth = json['DateofBirth'];
+ mobileNumber = json['MobileNumber'];
+ emailAddress = json['EmailAddress'];
+ patientIdentificationNo = json['PatientIdentificationNo'];
+ patientType = json['PatientType'];
+ admissionNo = json['AdmissionNo'];
+ admissionDate = json['AdmissionDate'];
+ roomID = json['RoomID'];
+ bedID = json['BedID'];
+ nursingStationID = json['NursingStationID'];
+ description = json['Description'];
+ nationalityName = json['NationalityName'];
+ nationalityNameN = json['NationalityNameN'];
+ referralDoctor = json['ReferralDoctor'];
+ referringDoctor = json['ReferringDoctor'];
+ referralClinic = json['ReferralClinic'];
+ referringClinic = json['ReferringClinic'];
+ referralStatus = json['ReferralStatus'];
+ referralDate = DateUtils.convertStringToDate(json['ReferralDate']);
+ referringDoctorRemarks = json['ReferringDoctorRemarks'];
+ referredDoctorRemarks = json['ReferredDoctorRemarks'];
+ referralResponseOn = json['ReferralResponseOn'];
+ priority = json['Priority'];
+ frequency = json['Frequency'];
+ mAXResponseTime = json['MAXResponseTime'];
+ dischargeDate = json['DischargeDate'];
+ clinicID = json['ClinicID'];
+ age = json['Age'];
+ clinicDescription = json['ClinicDescription'];
+ frequencyDescription = json['FrequencyDescription'];
+ genderDescription = json['GenderDescription'];
+ isDoctorLate = json['IsDoctorLate'];
+ isDoctorResponse = json['IsDoctorResponse'];
+ nursingStationName = json['NursingStationName'];
+ priorityDescription = json['PriorityDescription'];
+ referringClinicDescription = json['ReferringClinicDescription'];
+ referringDoctorName = json['ReferringDoctorName'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['RowID'] = this.rowID;
+ data['ProjectID'] = this.projectID;
+ data['LineItemNo'] = this.lineItemNo;
+ data['DoctorID'] = this.doctorID;
+ data['PatientID'] = this.patientID;
+ data['DoctorName'] = this.doctorName;
+ data['DoctorNameN'] = this.doctorNameN;
+ data['FirstName'] = this.firstName;
+ data['MiddleName'] = this.middleName;
+ data['LastName'] = this.lastName;
+ data['FirstNameN'] = this.firstNameN;
+ data['MiddleNameN'] = this.middleNameN;
+ data['LastNameN'] = this.lastNameN;
+ data['Gender'] = this.gender;
+ data['DateofBirth'] = this.dateofBirth;
+ data['MobileNumber'] = this.mobileNumber;
+ data['EmailAddress'] = this.emailAddress;
+ data['PatientIdentificationNo'] = this.patientIdentificationNo;
+ data['PatientType'] = this.patientType;
+ data['AdmissionNo'] = this.admissionNo;
+ data['AdmissionDate'] = this.admissionDate;
+ data['RoomID'] = this.roomID;
+ data['BedID'] = this.bedID;
+ data['NursingStationID'] = this.nursingStationID;
+ data['Description'] = this.description;
+ data['NationalityName'] = this.nationalityName;
+ data['NationalityNameN'] = this.nationalityNameN;
+ data['ReferralDoctor'] = this.referralDoctor;
+ data['ReferringDoctor'] = this.referringDoctor;
+ data['ReferralClinic'] = this.referralClinic;
+ data['ReferringClinic'] = this.referringClinic;
+ data['ReferralStatus'] = this.referralStatus;
+ data['ReferralDate'] = this.referralDate;
+ data['ReferringDoctorRemarks'] = this.referringDoctorRemarks;
+ data['ReferredDoctorRemarks'] = this.referredDoctorRemarks;
+ data['ReferralResponseOn'] = this.referralResponseOn;
+ data['Priority'] = this.priority;
+ data['Frequency'] = this.frequency;
+ data['MAXResponseTime'] = this.mAXResponseTime;
+ data['DischargeDate'] = this.dischargeDate;
+ data['ClinicID'] = this.clinicID;
+ data['Age'] = this.age;
+ data['ClinicDescription'] = this.clinicDescription;
+ data['FrequencyDescription'] = this.frequencyDescription;
+ data['GenderDescription'] = this.genderDescription;
+ data['IsDoctorLate'] = this.isDoctorLate;
+ data['IsDoctorResponse'] = this.isDoctorResponse;
+ data['NursingStationName'] = this.nursingStationName;
+ data['PriorityDescription'] = this.priorityDescription;
+ data['ReferringClinicDescription'] = this.referringClinicDescription;
+ data['ReferringDoctorName'] = this.referringDoctorName;
+ return data;
+ }
+}
diff --git a/lib/core/model/MyReferralPatientModel.dart b/lib/core/model/MyReferralPatientModel.dart
new file mode 100644
index 00000000..f2c9c425
--- /dev/null
+++ b/lib/core/model/MyReferralPatientModel.dart
@@ -0,0 +1,258 @@
+import 'package:doctor_app_flutter/util/date-utils.dart';
+
+class MyReferralPatientModel {
+ dynamic rowID;
+ int projectID;
+ int lineItemNo;
+ int doctorID;
+ int patientID;
+ String doctorName;
+ dynamic doctorNameN;
+ String firstName;
+ String middleName;
+ String lastName;
+ dynamic firstNameN;
+ dynamic middleNameN;
+ dynamic lastNameN;
+ int gender;
+ String dateofBirth;
+ String mobileNumber;
+ String emailAddress;
+ String patientIdentificationNo;
+ int patientType;
+ String admissionNo;
+ String admissionDate;
+ String roomID;
+ String bedID;
+ dynamic nursingStationID;
+ dynamic description;
+ String nationalityName;
+ dynamic nationalityNameN;
+ String clinicDescription;
+ String clinicDescriptionN;
+ int referralDoctor;
+ int referringDoctor;
+ int referralClinic;
+ int referringClinic;
+ int referralStatus;
+ DateTime referralDate;
+ String referringDoctorRemarks;
+ String referredDoctorRemarks;
+ String referralResponseOn;
+ int priority;
+ int frequency;
+ String mAXResponseTime;
+ int episodeID;
+ int appointmentNo;
+ String appointmentDate;
+ int appointmentType;
+ int patientMRN;
+ String createdOn;
+ int clinicID;
+ String nationalityID;
+ String age;
+ String doctorImageURL;
+ String frequencyDescription;
+ String genderDescription;
+ bool isDoctorLate;
+ bool isDoctorResponse;
+ String nationalityFlagURL;
+ String nursingStationName;
+ String priorityDescription;
+ String referringClinicDescription;
+ String referringDoctorName;
+
+ MyReferralPatientModel(
+ {this.rowID,
+ this.projectID,
+ this.lineItemNo,
+ this.doctorID,
+ this.patientID,
+ this.doctorName,
+ this.doctorNameN,
+ this.firstName,
+ this.middleName,
+ this.lastName,
+ this.firstNameN,
+ this.middleNameN,
+ this.lastNameN,
+ this.gender,
+ this.dateofBirth,
+ this.mobileNumber,
+ this.emailAddress,
+ this.patientIdentificationNo,
+ this.patientType,
+ this.admissionNo,
+ this.admissionDate,
+ this.roomID,
+ this.bedID,
+ this.nursingStationID,
+ this.description,
+ this.nationalityName,
+ this.nationalityNameN,
+ this.clinicDescription,
+ this.clinicDescriptionN,
+ this.referralDoctor,
+ this.referringDoctor,
+ this.referralClinic,
+ this.referringClinic,
+ this.referralStatus,
+ this.referralDate,
+ this.referringDoctorRemarks,
+ this.referredDoctorRemarks,
+ this.referralResponseOn,
+ this.priority,
+ this.frequency,
+ this.mAXResponseTime,
+ this.episodeID,
+ this.appointmentNo,
+ this.appointmentDate,
+ this.appointmentType,
+ this.patientMRN,
+ this.createdOn,
+ this.clinicID,
+ this.nationalityID,
+ this.age,
+ this.doctorImageURL,
+ this.frequencyDescription,
+ this.genderDescription,
+ this.isDoctorLate,
+ this.isDoctorResponse,
+ this.nationalityFlagURL,
+ this.nursingStationName,
+ this.priorityDescription,
+ this.referringClinicDescription,
+ this.referringDoctorName});
+
+ MyReferralPatientModel.fromJson(Map json) {
+ rowID = json['RowID'];
+ projectID = json['ProjectID'];
+ lineItemNo = json['LineItemNo'];
+ doctorID = json['DoctorID'];
+ patientID = json['PatientID'];
+ doctorName = json['DoctorName'];
+ doctorNameN = json['DoctorNameN'];
+ firstName = json['FirstName'];
+ middleName = json['MiddleName'];
+ lastName = json['LastName'];
+ firstNameN = json['FirstNameN'];
+ middleNameN = json['MiddleNameN'];
+ lastNameN = json['LastNameN'];
+ gender = json['Gender'];
+ dateofBirth = json['DateofBirth'];
+ mobileNumber = json['MobileNumber'];
+ emailAddress = json['EmailAddress'];
+ patientIdentificationNo = json['PatientIdentificationNo'];
+ patientType = json['PatientType'];
+ admissionNo = json['AdmissionNo'];
+ admissionDate = json['AdmissionDate'];
+ roomID = json['RoomID'];
+ bedID = json['BedID'];
+ nursingStationID = json['NursingStationID'];
+ description = json['Description'];
+ nationalityName = json['NationalityName'];
+ nationalityNameN = json['NationalityNameN'];
+ clinicDescription = json['ClinicDescription'];
+ clinicDescriptionN = json['ClinicDescriptionN'];
+ referralDoctor = json['ReferralDoctor'];
+ referringDoctor = json['ReferringDoctor'];
+ referralClinic = json['ReferralClinic'];
+ referringClinic = json['ReferringClinic'];
+ referralStatus = json['ReferralStatus'];
+ referralDate = DateUtils.convertStringToDate(json['ReferralDate']);
+ referringDoctorRemarks = json['ReferringDoctorRemarks'];
+ referredDoctorRemarks = json['ReferredDoctorRemarks'];
+ referralResponseOn = json['ReferralResponseOn'];
+ priority = json['Priority'];
+ frequency = json['Frequency'];
+ mAXResponseTime = json['MAXResponseTime'];
+ episodeID = json['EpisodeID'];
+ appointmentNo = json['AppointmentNo'];
+ appointmentDate = json['AppointmentDate'];
+ appointmentType = json['AppointmentType'];
+ patientMRN = json['PatientMRN'];
+ createdOn = json['CreatedOn'];
+ clinicID = json['ClinicID'];
+ nationalityID = json['NationalityID'];
+ age = json['Age'];
+ doctorImageURL = json['DoctorImageURL'];
+ frequencyDescription = json['FrequencyDescription'];
+ genderDescription = json['GenderDescription'];
+ isDoctorLate = json['IsDoctorLate'];
+ isDoctorResponse = json['IsDoctorResponse'];
+ nationalityFlagURL = json['NationalityFlagURL'];
+ nursingStationName = json['NursingStationName'];
+ priorityDescription = json['PriorityDescription'];
+ referringClinicDescription = json['ReferringClinicDescription'];
+ referringDoctorName = json['ReferringDoctorName'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['RowID'] = this.rowID;
+ data['ProjectID'] = this.projectID;
+ data['LineItemNo'] = this.lineItemNo;
+ data['DoctorID'] = this.doctorID;
+ data['PatientID'] = this.patientID;
+ data['DoctorName'] = this.doctorName;
+ data['DoctorNameN'] = this.doctorNameN;
+ data['FirstName'] = this.firstName;
+ data['MiddleName'] = this.middleName;
+ data['LastName'] = this.lastName;
+ data['FirstNameN'] = this.firstNameN;
+ data['MiddleNameN'] = this.middleNameN;
+ data['LastNameN'] = this.lastNameN;
+ data['Gender'] = this.gender;
+ data['DateofBirth'] = this.dateofBirth;
+ data['MobileNumber'] = this.mobileNumber;
+ data['EmailAddress'] = this.emailAddress;
+ data['PatientIdentificationNo'] = this.patientIdentificationNo;
+ data['PatientType'] = this.patientType;
+ data['AdmissionNo'] = this.admissionNo;
+ data['AdmissionDate'] = this.admissionDate;
+ data['RoomID'] = this.roomID;
+ data['BedID'] = this.bedID;
+ data['NursingStationID'] = this.nursingStationID;
+ data['Description'] = this.description;
+ data['NationalityName'] = this.nationalityName;
+ data['NationalityNameN'] = this.nationalityNameN;
+ data['ClinicDescription'] = this.clinicDescription;
+ data['ClinicDescriptionN'] = this.clinicDescriptionN;
+ data['ReferralDoctor'] = this.referralDoctor;
+ data['ReferringDoctor'] = this.referringDoctor;
+ data['ReferralClinic'] = this.referralClinic;
+ data['ReferringClinic'] = this.referringClinic;
+ data['ReferralStatus'] = this.referralStatus;
+ data['ReferralDate'] = this.referralDate;
+ data['ReferringDoctorRemarks'] = this.referringDoctorRemarks;
+ data['ReferredDoctorRemarks'] = this.referredDoctorRemarks;
+ data['ReferralResponseOn'] = this.referralResponseOn;
+ data['Priority'] = this.priority;
+ data['Frequency'] = this.frequency;
+ data['MAXResponseTime'] = this.mAXResponseTime;
+ data['EpisodeID'] = this.episodeID;
+ data['AppointmentNo'] = this.appointmentNo;
+ data['AppointmentDate'] = this.appointmentDate;
+ data['AppointmentType'] = this.appointmentType;
+ data['PatientMRN'] = this.patientMRN;
+ data['CreatedOn'] = this.createdOn;
+ data['ClinicID'] = this.clinicID;
+ data['NationalityID'] = this.nationalityID;
+ data['Age'] = this.age;
+ data['DoctorImageURL'] = this.doctorImageURL;
+ data['FrequencyDescription'] = this.frequencyDescription;
+ data['GenderDescription'] = this.genderDescription;
+ data['IsDoctorLate'] = this.isDoctorLate;
+ data['IsDoctorResponse'] = this.isDoctorResponse;
+ data['NationalityFlagURL'] = this.nationalityFlagURL;
+ data['NursingStationName'] = this.nursingStationName;
+ data['PriorityDescription'] = this.priorityDescription;
+ data['ReferringClinicDescription'] = this.referringClinicDescription;
+ data['ReferringDoctorName'] = this.referringDoctorName;
+ return data;
+ }
+
+ get patientName {
+ return this.firstName+" "+this.lastName;
+ }
+}
diff --git a/lib/core/model/PatientSearchRequestModel.dart b/lib/core/model/PatientSearchRequestModel.dart
new file mode 100644
index 00000000..437c5885
--- /dev/null
+++ b/lib/core/model/PatientSearchRequestModel.dart
@@ -0,0 +1,60 @@
+class PatientSearchRequestModel {
+ int doctorID;
+ String firstName;
+ String middleName;
+ String lastName;
+ String patientMobileNumber;
+ String patientIdentificationID;
+ int patientID;
+ String from;
+ String to;
+ int searchType;
+ String mobileNo;
+ String identificationNo;
+
+ PatientSearchRequestModel(
+ {this.doctorID =0,
+ this.firstName ="0",
+ this.middleName ="0",
+ this.lastName ="0",
+ this.patientMobileNumber ="0",
+ this.patientIdentificationID ="0",
+ this.patientID =0,
+ this.searchType =1,
+ this.mobileNo="",
+ this.identificationNo="0",
+ this.from ="0",
+ this.to ="0"});
+
+ PatientSearchRequestModel.fromJson(Map json) {
+ doctorID = json['DoctorID'];
+ firstName = json['FirstName'];
+ middleName = json['MiddleName'];
+ lastName = json['LastName'];
+ patientMobileNumber = json['PatientMobileNumber'];
+ patientIdentificationID = json['PatientIdentificationID'];
+ patientID = json['PatientID'];
+ from = json['From'];
+ to = json['To'];
+ searchType = json['SearchType'];
+ mobileNo = json['MobileNo'];
+ identificationNo = json['IdentificationNo'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['DoctorID'] = this.doctorID;
+ data['FirstName'] = this.firstName;
+ data['MiddleName'] = this.middleName;
+ data['LastName'] = this.lastName;
+ data['PatientMobileNumber'] = this.patientMobileNumber;
+ data['PatientIdentificationID'] = this.patientIdentificationID;
+ data['PatientID'] = this.patientID;
+ data['From'] = this.from;
+ data['To'] = this.to;
+ data['SearchType'] = this.searchType;
+ data['MobileNo'] = this.mobileNo;
+ data['IdentificationNo'] = this.identificationNo;
+ return data;
+ }
+}
diff --git a/lib/core/model/Prescriptions/in_patient_prescription_model.dart b/lib/core/model/Prescriptions/in_patient_prescription_model.dart
new file mode 100644
index 00000000..f6e88bf7
--- /dev/null
+++ b/lib/core/model/Prescriptions/in_patient_prescription_model.dart
@@ -0,0 +1,26 @@
+class InPatientPrescriptionRequestModel {
+ String vidaAuthTokenID;
+ dynamic patientMRN;
+ dynamic appNo;
+ dynamic admissionNo;
+
+ InPatientPrescriptionRequestModel(
+ {this.vidaAuthTokenID, this.patientMRN, this.appNo, this.admissionNo});
+
+ InPatientPrescriptionRequestModel.fromJson(Map json) {
+ vidaAuthTokenID = json['VidaAuthTokenID'];
+ patientMRN = json['PatientID'];
+ appNo = json['AppointmentNo'];
+ admissionNo = json['AdmissionNo'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['VidaAuthTokenID'] = this.vidaAuthTokenID;
+ data['PatientID'] = this.patientMRN;
+ data['AppointmentNo'] = this.appNo;
+ data['AdmissionNo'] = this.admissionNo;
+
+ return data;
+ }
+}
diff --git a/lib/core/model/Prescriptions/prescription_in_patient.dart b/lib/core/model/Prescriptions/prescription_in_patient.dart
new file mode 100644
index 00000000..c66bc8a4
--- /dev/null
+++ b/lib/core/model/Prescriptions/prescription_in_patient.dart
@@ -0,0 +1,200 @@
+class PrescriotionInPatient {
+ int admissionNo;
+ int authorizedBy;
+ dynamic bedNo;
+ String comments;
+ int createdBy;
+ String createdByName;
+ dynamic createdByNameN;
+ String createdOn;
+ String direction;
+ int directionID;
+ dynamic directionN;
+ String dose;
+ int editedBy;
+ dynamic iVDiluentLine;
+ int iVDiluentType;
+ dynamic iVDiluentVolume;
+ dynamic iVRate;
+ dynamic iVStability;
+ String itemDescription;
+ int itemID;
+ int lineItemNo;
+ int locationId;
+ int noOfDoses;
+ int orderNo;
+ int patientID;
+ String pharmacyRemarks;
+ String prescriptionDatetime;
+ int prescriptionNo;
+ String processedBy;
+ int projectID;
+ int refillID;
+ String refillType;
+ dynamic refillTypeN;
+ int reviewedPharmacist;
+ dynamic roomId;
+ String route;
+ int routeId;
+ dynamic routeN;
+ dynamic setupID;
+ String startDatetime;
+ int status;
+ String statusDescription;
+ dynamic statusDescriptionN;
+ String stopDatetime;
+ int unitofMeasurement;
+ String unitofMeasurementDescription;
+ dynamic unitofMeasurementDescriptionN;
+
+ PrescriotionInPatient(
+ {this.admissionNo,
+ this.authorizedBy,
+ this.bedNo,
+ this.comments,
+ this.createdBy,
+ this.createdByName,
+ this.createdByNameN,
+ this.createdOn,
+ this.direction,
+ this.directionID,
+ this.directionN,
+ this.dose,
+ this.editedBy,
+ this.iVDiluentLine,
+ this.iVDiluentType,
+ this.iVDiluentVolume,
+ this.iVRate,
+ this.iVStability,
+ this.itemDescription,
+ this.itemID,
+ this.lineItemNo,
+ this.locationId,
+ this.noOfDoses,
+ this.orderNo,
+ this.patientID,
+ this.pharmacyRemarks,
+ this.prescriptionDatetime,
+ this.prescriptionNo,
+ this.processedBy,
+ this.projectID,
+ this.refillID,
+ this.refillType,
+ this.refillTypeN,
+ this.reviewedPharmacist,
+ this.roomId,
+ this.route,
+ this.routeId,
+ this.routeN,
+ this.setupID,
+ this.startDatetime,
+ this.status,
+ this.statusDescription,
+ this.statusDescriptionN,
+ this.stopDatetime,
+ this.unitofMeasurement,
+ this.unitofMeasurementDescription,
+ this.unitofMeasurementDescriptionN});
+
+ PrescriotionInPatient.fromJson(Map json) {
+ admissionNo = json['AdmissionNo'];
+ authorizedBy = json['AuthorizedBy'];
+ bedNo = json['BedNo'];
+ comments = json['Comments'];
+ createdBy = json['CreatedBy'];
+ createdByName = json['CreatedByName'];
+ createdByNameN = json['CreatedByNameN'];
+ createdOn = json['CreatedOn'];
+ direction = json['Direction'];
+ directionID = json['DirectionID'];
+ directionN = json['DirectionN'];
+ dose = json['Dose'];
+ editedBy = json['EditedBy'];
+ iVDiluentLine = json['IVDiluentLine'];
+ iVDiluentType = json['IVDiluentType'];
+ iVDiluentVolume = json['IVDiluentVolume'];
+ iVRate = json['IVRate'];
+ iVStability = json['IVStability'];
+ itemDescription = json['ItemDescription'];
+ itemID = json['ItemID'];
+ lineItemNo = json['LineItemNo'];
+ locationId = json['LocationId'];
+ noOfDoses = json['NoOfDoses'];
+ orderNo = json['OrderNo'];
+ patientID = json['PatientID'];
+ pharmacyRemarks = json['PharmacyRemarks'];
+ prescriptionDatetime = json['PrescriptionDatetime'];
+ prescriptionNo = json['PrescriptionNo'];
+ processedBy = json['ProcessedBy'];
+ projectID = json['ProjectID'];
+ refillID = json['RefillID'];
+ refillType = json['RefillType'];
+ refillTypeN = json['RefillTypeN'];
+ reviewedPharmacist = json['ReviewedPharmacist'];
+ roomId = json['RoomId'];
+ route = json['Route'];
+ routeId = json['RouteId'];
+ routeN = json['RouteN'];
+ setupID = json['SetupID'];
+ startDatetime = json['StartDatetime'];
+ status = json['Status'];
+ statusDescription = json['StatusDescription'];
+ statusDescriptionN = json['StatusDescriptionN'];
+ stopDatetime = json['StopDatetime'];
+ unitofMeasurement = json['UnitofMeasurement'];
+ unitofMeasurementDescription = json['UnitofMeasurementDescription'];
+ unitofMeasurementDescriptionN = json['UnitofMeasurementDescriptionN'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['AdmissionNo'] = this.admissionNo;
+ data['AuthorizedBy'] = this.authorizedBy;
+ data['BedNo'] = this.bedNo;
+ data['Comments'] = this.comments;
+ data['CreatedBy'] = this.createdBy;
+ data['CreatedByName'] = this.createdByName;
+ data['CreatedByNameN'] = this.createdByNameN;
+ data['CreatedOn'] = this.createdOn;
+ data['Direction'] = this.direction;
+ data['DirectionID'] = this.directionID;
+ data['DirectionN'] = this.directionN;
+ data['Dose'] = this.dose;
+ data['EditedBy'] = this.editedBy;
+ data['IVDiluentLine'] = this.iVDiluentLine;
+ data['IVDiluentType'] = this.iVDiluentType;
+ data['IVDiluentVolume'] = this.iVDiluentVolume;
+ data['IVRate'] = this.iVRate;
+ data['IVStability'] = this.iVStability;
+ data['ItemDescription'] = this.itemDescription;
+ data['ItemID'] = this.itemID;
+ data['LineItemNo'] = this.lineItemNo;
+ data['LocationId'] = this.locationId;
+ data['NoOfDoses'] = this.noOfDoses;
+ data['OrderNo'] = this.orderNo;
+ data['PatientID'] = this.patientID;
+ data['PharmacyRemarks'] = this.pharmacyRemarks;
+ data['PrescriptionDatetime'] = this.prescriptionDatetime;
+ data['PrescriptionNo'] = this.prescriptionNo;
+ data['ProcessedBy'] = this.processedBy;
+ data['ProjectID'] = this.projectID;
+ data['RefillID'] = this.refillID;
+ data['RefillType'] = this.refillType;
+ data['RefillTypeN'] = this.refillTypeN;
+ data['ReviewedPharmacist'] = this.reviewedPharmacist;
+ data['RoomId'] = this.roomId;
+ data['Route'] = this.route;
+ data['RouteId'] = this.routeId;
+ data['RouteN'] = this.routeN;
+ data['SetupID'] = this.setupID;
+ data['StartDatetime'] = this.startDatetime;
+ data['Status'] = this.status;
+ data['StatusDescription'] = this.statusDescription;
+ data['StatusDescriptionN'] = this.statusDescriptionN;
+ data['StopDatetime'] = this.stopDatetime;
+ data['UnitofMeasurement'] = this.unitofMeasurement;
+ data['UnitofMeasurementDescription'] = this.unitofMeasurementDescription;
+ data['UnitofMeasurementDescriptionN'] = this.unitofMeasurementDescriptionN;
+ return data;
+ }
+}
diff --git a/lib/core/model/ReferralRequest.dart b/lib/core/model/ReferralRequest.dart
new file mode 100644
index 00000000..b3ad1f03
--- /dev/null
+++ b/lib/core/model/ReferralRequest.dart
@@ -0,0 +1,108 @@
+class ReferralRequest {
+ String roomID;
+ String referralClinic;
+ String referralDoctor;
+ int createdBy;
+ int editedBy;
+ int patientID;
+ int patientTypeID;
+ int referringClinic;
+ int referringDoctor;
+ int projectID;
+ int admissionNo;
+ String referringDoctorRemarks;
+ String priority;
+ String frequency;
+ String extension;
+ int languageID;
+ String stamp;
+ String iPAdress;
+ double versionID;
+ int channel;
+ String tokenID;
+ String sessionID;
+ bool isLoginForDoctorApp;
+ bool patientOutSA;
+
+ ReferralRequest(
+ {this.roomID,
+ this.referralClinic,
+ this.referralDoctor,
+ this.createdBy,
+ this.editedBy,
+ this.patientID,
+ this.patientTypeID,
+ this.referringClinic,
+ this.referringDoctor,
+ this.projectID,
+ this.admissionNo,
+ this.referringDoctorRemarks,
+ this.priority,
+ this.frequency,
+ this.extension,
+ this.languageID,
+ this.stamp,
+ this.iPAdress,
+ this.versionID,
+ this.channel,
+ this.tokenID,
+ this.sessionID,
+ this.isLoginForDoctorApp,
+ this.patientOutSA});
+
+ ReferralRequest.fromJson(Map json) {
+ roomID = json['RoomID'];
+ referralClinic = json['ReferralClinic'];
+ referralDoctor = json['ReferralDoctor'];
+ createdBy = json['CreatedBy'];
+ editedBy = json['EditedBy'];
+ patientID = json['PatientID'];
+ patientTypeID = json['PatientTypeID'];
+ referringClinic = json['ReferringClinic'];
+ referringDoctor = json['ReferringDoctor'];
+ projectID = json['ProjectID'];
+ admissionNo = json['AdmissionNo'];
+ referringDoctorRemarks = json['ReferringDoctorRemarks'];
+ priority = json['Priority'];
+ frequency = json['Frequency'];
+ extension = json['Extension'];
+ languageID = json['LanguageID'];
+ stamp = json['stamp'];
+ iPAdress = json['IPAdress'];
+ versionID = json['VersionID'];
+ channel = json['Channel'];
+ tokenID = json['TokenID'];
+ sessionID = json['SessionID'];
+ isLoginForDoctorApp = json['IsLoginForDoctorApp'];
+ patientOutSA = json['PatientOutSA'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['RoomID'] = this.roomID;
+ data['ReferralClinic'] = this.referralClinic;
+ data['ReferralDoctor'] = this.referralDoctor;
+ data['CreatedBy'] = this.createdBy;
+ data['EditedBy'] = this.editedBy;
+ data['PatientID'] = this.patientID;
+ data['PatientTypeID'] = this.patientTypeID;
+ data['ReferringClinic'] = this.referringClinic;
+ data['ReferringDoctor'] = this.referringDoctor;
+ data['ProjectID'] = this.projectID;
+ data['AdmissionNo'] = this.admissionNo;
+ data['ReferringDoctorRemarks'] = this.referringDoctorRemarks;
+ data['Priority'] = this.priority;
+ data['Frequency'] = this.frequency;
+ data['Extension'] = this.extension;
+ data['LanguageID'] = this.languageID;
+ data['stamp'] = this.stamp;
+ data['IPAdress'] = this.iPAdress;
+ data['VersionID'] = this.versionID;
+ data['Channel'] = this.channel;
+ data['TokenID'] = this.tokenID;
+ data['SessionID'] = this.sessionID;
+ data['IsLoginForDoctorApp'] = this.isLoginForDoctorApp;
+ data['PatientOutSA'] = this.patientOutSA;
+ return data;
+ }
+}
diff --git a/lib/core/model/insurance_approval_in_patient_model.dart b/lib/core/model/insurance_approval_in_patient_model.dart
new file mode 100644
index 00000000..f185a8bf
--- /dev/null
+++ b/lib/core/model/insurance_approval_in_patient_model.dart
@@ -0,0 +1,277 @@
+class InsuranceApprovalInPatientModel {
+ String setupID;
+ int projectID;
+ int approvalNo;
+ int status;
+ String approvalDate;
+ int patientType;
+ int patientID;
+ int companyID;
+ bool subCategoryID;
+ int doctorID;
+ int clinicID;
+ int approvalType;
+ int inpatientApprovalSubType;
+ dynamic isApprovalOnGross;
+ String companyApprovalNo;
+ dynamic progNoteOrderNo;
+ String submitOn;
+ String receiptOn;
+ String expiryDate;
+ int admissionNo;
+ int admissionRequestNo;
+ String approvalStatusDescption;
+ dynamic approvalStatusDescptionN;
+ dynamic remarks;
+ List apporvalDetails;
+ String clinicName;
+ dynamic companyName;
+ String doctorName;
+ String projectName;
+ int totaUnUsedCount;
+ int unUsedCount;
+ String doctorImage;
+
+ InsuranceApprovalInPatientModel(
+ {this.setupID,
+ this.projectID,
+ this.approvalNo,
+ this.status,
+ this.approvalDate,
+ this.patientType,
+ this.patientID,
+ this.companyID,
+ this.subCategoryID,
+ this.doctorID,
+ this.clinicID,
+ this.approvalType,
+ this.inpatientApprovalSubType,
+ this.isApprovalOnGross,
+ this.companyApprovalNo,
+ this.progNoteOrderNo,
+ this.submitOn,
+ this.receiptOn,
+ this.expiryDate,
+ this.admissionNo,
+ this.admissionRequestNo,
+ this.approvalStatusDescption,
+ this.approvalStatusDescptionN,
+ this.remarks,
+ this.apporvalDetails,
+ this.clinicName,
+ this.companyName,
+ this.doctorName,
+ this.projectName,
+ this.totaUnUsedCount,
+ this.unUsedCount,
+ this.doctorImage});
+
+ InsuranceApprovalInPatientModel.fromJson(Map json) {
+ setupID = json['SetupID'];
+ doctorImage = json['DoctorImageURL'];
+ projectID = json['ProjectID'];
+ approvalNo = json['ApprovalNo'];
+ status = json['Status'];
+ approvalDate = json['ApprovalDate'];
+ patientType = json['PatientType'];
+ patientID = json['PatientID'];
+ companyID = json['CompanyID'];
+ subCategoryID = json['SubCategoryID'];
+ doctorID = json['DoctorID'];
+ clinicID = json['ClinicID'];
+ approvalType = json['ApprovalType'];
+ inpatientApprovalSubType = json['InpatientApprovalSubType'];
+ isApprovalOnGross = json['IsApprovalOnGross'];
+ companyApprovalNo = json['CompanyApprovalNo'];
+ progNoteOrderNo = json['ProgNoteOrderNo'];
+ submitOn = json['SubmitOn'];
+ receiptOn = json['ReceiptOn'];
+ expiryDate = json['ExpiryDate'];
+ admissionNo = json['AdmissionNo'];
+ admissionRequestNo = json['AdmissionRequestNo'];
+ approvalStatusDescption = json['ApprovalStatusDescption'];
+ approvalStatusDescptionN = json['ApprovalStatusDescptionN'];
+ remarks = json['Remarks'];
+ if (json['ApporvalDetails'] != null) {
+ apporvalDetails = new List();
+ json['ApporvalDetails'].forEach((v) {
+ apporvalDetails.add(new ApporvalDetails.fromJson(v));
+ });
+ }
+ clinicName = json['ClinicName'];
+ companyName = json['CompanyName'];
+ doctorName = json['DoctorName'];
+ projectName = json['ProjectName'];
+ totaUnUsedCount = json['TotaUnUsedCount'];
+ unUsedCount = json['UnUsedCount'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['SetupID'] = this.setupID;
+ data['DoctorImageURL'] = this.doctorImage;
+ data['ProjectID'] = this.projectID;
+ data['ApprovalNo'] = this.approvalNo;
+ data['Status'] = this.status;
+ data['ApprovalDate'] = this.approvalDate;
+ data['PatientType'] = this.patientType;
+ data['PatientID'] = this.patientID;
+ data['CompanyID'] = this.companyID;
+ data['SubCategoryID'] = this.subCategoryID;
+ data['DoctorID'] = this.doctorID;
+ data['ClinicID'] = this.clinicID;
+ data['ApprovalType'] = this.approvalType;
+ data['InpatientApprovalSubType'] = this.inpatientApprovalSubType;
+ data['IsApprovalOnGross'] = this.isApprovalOnGross;
+ data['CompanyApprovalNo'] = this.companyApprovalNo;
+ data['ProgNoteOrderNo'] = this.progNoteOrderNo;
+ data['SubmitOn'] = this.submitOn;
+ data['ReceiptOn'] = this.receiptOn;
+ data['ExpiryDate'] = this.expiryDate;
+ data['AdmissionNo'] = this.admissionNo;
+ data['AdmissionRequestNo'] = this.admissionRequestNo;
+ data['ApprovalStatusDescption'] = this.approvalStatusDescption;
+ data['ApprovalStatusDescptionN'] = this.approvalStatusDescptionN;
+ data['Remarks'] = this.remarks;
+ if (this.apporvalDetails != null) {
+ data['ApporvalDetails'] =
+ this.apporvalDetails.map((v) => v.toJson()).toList();
+ }
+ data['ClinicName'] = this.clinicName;
+ data['CompanyName'] = this.companyName;
+ data['DoctorName'] = this.doctorName;
+ data['ProjectName'] = this.projectName;
+ data['TotaUnUsedCount'] = this.totaUnUsedCount;
+ data['UnUsedCount'] = this.unUsedCount;
+ return data;
+ }
+}
+
+class ApporvalDetails {
+ Null setupID;
+ Null projectID;
+ int approvalNo;
+ Null lineItemNo;
+ Null orderType;
+ Null procedureID;
+ Null toothNo;
+ Null price;
+ Null approvedAmount;
+ Null unapprovedPatientShare;
+ Null waivedAmount;
+ Null discountType;
+ Null discountValue;
+ Null shareType;
+ Null patientShareTypeValue;
+ Null companyShareTypeValue;
+ Null patientShare;
+ Null companyShare;
+ Null deductableAmount;
+ String disapprovedRemarks;
+ Null progNoteOrderNo;
+ Null progNoteLineItemNo;
+ Null invoiceTransactionType;
+ Null invoiceNo;
+ String procedureName;
+ String procedureNameN;
+ String status;
+ Null isInvoiced;
+ String isInvoicedDesc;
+
+ ApporvalDetails(
+ {this.setupID,
+ this.projectID,
+ this.approvalNo,
+ this.lineItemNo,
+ this.orderType,
+ this.procedureID,
+ this.toothNo,
+ this.price,
+ this.approvedAmount,
+ this.unapprovedPatientShare,
+ this.waivedAmount,
+ this.discountType,
+ this.discountValue,
+ this.shareType,
+ this.patientShareTypeValue,
+ this.companyShareTypeValue,
+ this.patientShare,
+ this.companyShare,
+ this.deductableAmount,
+ this.disapprovedRemarks,
+ this.progNoteOrderNo,
+ this.progNoteLineItemNo,
+ this.invoiceTransactionType,
+ this.invoiceNo,
+ this.procedureName,
+ this.procedureNameN,
+ this.status,
+ this.isInvoiced,
+ this.isInvoicedDesc});
+
+ ApporvalDetails.fromJson(Map json) {
+ setupID = json['SetupID'];
+ projectID = json['ProjectID'];
+ approvalNo = json['ApprovalNo'];
+ lineItemNo = json['LineItemNo'];
+ orderType = json['OrderType'];
+ procedureID = json['ProcedureID'];
+ toothNo = json['ToothNo'];
+ price = json['Price'];
+ approvedAmount = json['ApprovedAmount'];
+ unapprovedPatientShare = json['UnapprovedPatientShare'];
+ waivedAmount = json['WaivedAmount'];
+ discountType = json['DiscountType'];
+ discountValue = json['DiscountValue'];
+ shareType = json['ShareType'];
+ patientShareTypeValue = json['PatientShareTypeValue'];
+ companyShareTypeValue = json['CompanyShareTypeValue'];
+ patientShare = json['PatientShare'];
+ companyShare = json['CompanyShare'];
+ deductableAmount = json['DeductableAmount'];
+ disapprovedRemarks = json['DisapprovedRemarks'];
+ progNoteOrderNo = json['ProgNoteOrderNo'];
+ progNoteLineItemNo = json['ProgNoteLineItemNo'];
+ invoiceTransactionType = json['InvoiceTransactionType'];
+ invoiceNo = json['InvoiceNo'];
+ procedureName = json['ProcedureName'];
+ procedureNameN = json['ProcedureNameN'];
+ status = json['Status'];
+ isInvoiced = json['IsInvoiced'];
+ isInvoicedDesc = json['IsInvoicedDesc'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['SetupID'] = this.setupID;
+ data['ProjectID'] = this.projectID;
+ data['ApprovalNo'] = this.approvalNo;
+ data['LineItemNo'] = this.lineItemNo;
+ data['OrderType'] = this.orderType;
+ data['ProcedureID'] = this.procedureID;
+ data['ToothNo'] = this.toothNo;
+ data['Price'] = this.price;
+ data['ApprovedAmount'] = this.approvedAmount;
+ data['UnapprovedPatientShare'] = this.unapprovedPatientShare;
+ data['WaivedAmount'] = this.waivedAmount;
+ data['DiscountType'] = this.discountType;
+ data['DiscountValue'] = this.discountValue;
+ data['ShareType'] = this.shareType;
+ data['PatientShareTypeValue'] = this.patientShareTypeValue;
+ data['CompanyShareTypeValue'] = this.companyShareTypeValue;
+ data['PatientShare'] = this.patientShare;
+ data['CompanyShare'] = this.companyShare;
+ data['DeductableAmount'] = this.deductableAmount;
+ data['DisapprovedRemarks'] = this.disapprovedRemarks;
+ data['ProgNoteOrderNo'] = this.progNoteOrderNo;
+ data['ProgNoteLineItemNo'] = this.progNoteLineItemNo;
+ data['InvoiceTransactionType'] = this.invoiceTransactionType;
+ data['InvoiceNo'] = this.invoiceNo;
+ data['ProcedureName'] = this.procedureName;
+ data['ProcedureNameN'] = this.procedureNameN;
+ data['Status'] = this.status;
+ data['IsInvoiced'] = this.isInvoiced;
+ data['IsInvoicedDesc'] = this.isInvoicedDesc;
+ return data;
+ }
+}
diff --git a/lib/core/model/labs/lab_result.dart b/lib/core/model/labs/lab_result.dart
index 2deb13f3..1c09696b 100644
--- a/lib/core/model/labs/lab_result.dart
+++ b/lib/core/model/labs/lab_result.dart
@@ -47,10 +47,10 @@ class LabResult {
lineItemNo = json['LineItemNo'];
maleInterpretativeData = json['MaleInterpretativeData'];
notes = json['Notes'];
- packageID = json['PackageID'];
+ packageID = json['PackageID'].toString();
patientID = json['PatientID'];
- projectID = json['ProjectID'];
- referanceRange = json['ReferanceRange'];
+ projectID = json['ProjectID'].toString();
+ referanceRange = json['ReferenceRange'] ?? json['ReferanceRange'];
resultValue = json['ResultValue'];
sampleCollectedOn = json['SampleCollectedOn'];
sampleReceivedOn = json['SampleReceivedOn'];
diff --git a/lib/core/model/labs/patient_lab_orders.dart b/lib/core/model/labs/patient_lab_orders.dart
index 07044b0e..6f989543 100644
--- a/lib/core/model/labs/patient_lab_orders.dart
+++ b/lib/core/model/labs/patient_lab_orders.dart
@@ -72,7 +72,7 @@ class PatientLabOrders {
PatientLabOrders.fromJson(Map json) {
actualDoctorRate = json['ActualDoctorRate'];
- clinicDescription = json['ClinicDescription'];
+ clinicDescription = json['ClinicDescription']?? json['ClinicName'];
clinicDescriptionEnglish = json['ClinicDescriptionEnglish'];
clinicDescriptionN = json['ClinicDescriptionN'];
clinicID = json['ClinicID'];
@@ -85,7 +85,7 @@ class PatientLabOrders {
doctorTitle = json['DoctorTitle'];
gender = json['Gender'];
genderDescription = json['GenderDescription'];
- invoiceNo = json['InvoiceNo'];
+ invoiceNo = json['InvoiceNo'].toString();
isActiveDoctorProfile = json['IsActiveDoctorProfile'];
isDoctorAllowVedioCall = json['IsDoctorAllowVedioCall'];
isExecludeDoctor = json['IsExecludeDoctor'];
@@ -96,9 +96,9 @@ class PatientLabOrders {
nationalityFlagURL = json['NationalityFlagURL'];
noOfPatientsRate = json['NoOfPatientsRate'];
orderDate = DateUtils.convertStringToDate(json['OrderDate']);
- orderNo = json['OrderNo'];
- patientID = json['PatientID'];
- projectID = json['ProjectID'];
+ orderNo = json['OrderNo'].toString();
+ patientID = json['PatientID'].toString();
+ projectID = json['ProjectID'].toString();
projectName = json['ProjectName'];
projectNameN = json['ProjectNameN'];
qR = json['QR'];
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..b48cf0e1 100644
--- a/lib/core/model/labs/request_patient_lab_special_result.dart
+++ b/lib/core/model/labs/request_patient_lab_special_result.dart
@@ -65,7 +65,7 @@ class RequestPatientLabSpecialResult {
data['OrderNo'] = this.orderNo;
data['SetupID'] = this.setupID;
data['ProjectID'] = this.projectID;
- data['ClinicID'] = this.clinicID;
+ data['ClinicID'] = this.clinicID ?? 0;
data['VersionID'] = this.versionID;
data['Channel'] = this.channel;
data['LanguageID'] = this.languageID;
diff --git a/lib/core/model/note/CreateNoteModel.dart b/lib/core/model/note/CreateNoteModel.dart
new file mode 100644
index 00000000..ce076705
--- /dev/null
+++ b/lib/core/model/note/CreateNoteModel.dart
@@ -0,0 +1,88 @@
+class CreateNoteModel {
+ int visitType;
+ int admissionNo;
+ int projectID;
+ int patientTypeID;
+ int patientID;
+ int clinicID;
+ String notes;
+ int createdBy;
+ int editedBy;
+ String nursingRemarks;
+ int languageID;
+ String stamp;
+ String iPAdress;
+ double versionID;
+ int channel;
+ String tokenID;
+ String sessionID;
+ bool isLoginForDoctorApp;
+ bool patientOutSA;
+
+ CreateNoteModel(
+ {this.visitType,
+ this.admissionNo,
+ this.projectID,
+ this.patientTypeID,
+ this.patientID,
+ this.clinicID,
+ this.notes,
+ this.createdBy,
+ this.editedBy,
+ this.nursingRemarks,
+ this.languageID,
+ this.stamp,
+ this.iPAdress,
+ this.versionID,
+ this.channel,
+ this.tokenID,
+ this.sessionID,
+ this.isLoginForDoctorApp,
+ this.patientOutSA});
+
+ CreateNoteModel.fromJson(Map json) {
+ visitType = json['VisitType'];
+ admissionNo = json['AdmissionNo'];
+ projectID = json['ProjectID'];
+ patientTypeID = json['PatientTypeID'];
+ patientID = json['PatientID'];
+ clinicID = json['ClinicID'];
+ notes = json['Notes'];
+ createdBy = json['CreatedBy'];
+ editedBy = json['EditedBy'];
+ nursingRemarks = json['NursingRemarks'];
+ languageID = json['LanguageID'];
+ stamp = json['stamp'];
+ iPAdress = json['IPAdress'];
+ versionID = json['VersionID'];
+ channel = json['Channel'];
+ tokenID = json['TokenID'];
+ sessionID = json['SessionID'];
+ isLoginForDoctorApp = json['IsLoginForDoctorApp'];
+ patientOutSA = json['PatientOutSA'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['VisitType'] = this.visitType;
+ data['AdmissionNo'] = this.admissionNo;
+ data['ProjectID'] = this.projectID;
+ data['PatientTypeID'] = this.patientTypeID;
+ data['PatientID'] = this.patientID;
+ data['ClinicID'] = this.clinicID;
+ data['Notes'] = this.notes;
+ data['CreatedBy'] = this.createdBy;
+ data['EditedBy'] = this.editedBy;
+ data['NursingRemarks'] = this.nursingRemarks;
+ data['LanguageID'] = this.languageID;
+ data['stamp'] = this.stamp;
+ data['IPAdress'] = this.iPAdress;
+ data['VersionID'] = this.versionID;
+ data['Channel'] = this.channel;
+ data['TokenID'] = this.tokenID;
+ data['SessionID'] = this.sessionID;
+ data['IsLoginForDoctorApp'] = this.isLoginForDoctorApp;
+ data['PatientOutSA'] = this.patientOutSA;
+ return data;
+ }
+}
diff --git a/lib/core/model/note/note_model.dart b/lib/core/model/note/note_model.dart
new file mode 100644
index 00000000..797f9b6d
--- /dev/null
+++ b/lib/core/model/note/note_model.dart
@@ -0,0 +1,92 @@
+class NoteModel {
+ String setupID;
+ int projectID;
+ int patientID;
+ int patientType;
+ String admissionNo;
+ int lineItemNo;
+ int visitType;
+ String notes;
+ String assessmentDate;
+ String visitTime;
+ int status;
+ String nursingRemarks;
+ String createdOn;
+ String editedOn;
+ int createdBy;
+ int admissionClinicID;
+ String admissionClinicName;
+ Null doctorClinicName;
+ String doctorName;
+ String visitTypeDesc;
+
+ NoteModel(
+ {this.setupID,
+ this.projectID,
+ this.patientID,
+ this.patientType,
+ this.admissionNo,
+ this.lineItemNo,
+ this.visitType,
+ this.notes,
+ this.assessmentDate,
+ this.visitTime,
+ this.status,
+ this.nursingRemarks,
+ this.createdOn,
+ this.editedOn,
+ this.createdBy,
+ this.admissionClinicID,
+ this.admissionClinicName,
+ this.doctorClinicName,
+ this.doctorName,
+ this.visitTypeDesc});
+
+ NoteModel.fromJson(Map json) {
+ setupID = json['SetupID'];
+ projectID = json['ProjectID'];
+ patientID = json['PatientID'];
+ patientType = json['PatientType'];
+ admissionNo = json['AdmissionNo'];
+ lineItemNo = json['LineItemNo'];
+ visitType = json['VisitType'];
+ notes = json['Notes'];
+ assessmentDate = json['AssessmentDate'];
+ visitTime = json['VisitTime'];
+ status = json['Status'];
+ nursingRemarks = json['NursingRemarks'];
+ createdOn = json['CreatedOn'];
+ editedOn = json['EditedOn'];
+ createdBy = json['CreatedBy'];
+ admissionClinicID = json['AdmissionClinicID'];
+ admissionClinicName = json['AdmissionClinicName'];
+ doctorClinicName = json['DoctorClinicName'];
+ doctorName = json['DoctorName'];
+ visitTypeDesc = json['VisitTypeDesc'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['SetupID'] = this.setupID;
+ data['ProjectID'] = this.projectID;
+ data['PatientID'] = this.patientID;
+ data['PatientType'] = this.patientType;
+ data['AdmissionNo'] = this.admissionNo;
+ data['LineItemNo'] = this.lineItemNo;
+ data['VisitType'] = this.visitType;
+ data['Notes'] = this.notes;
+ data['AssessmentDate'] = this.assessmentDate;
+ data['VisitTime'] = this.visitTime;
+ data['Status'] = this.status;
+ data['NursingRemarks'] = this.nursingRemarks;
+ data['CreatedOn'] = this.createdOn;
+ data['EditedOn'] = this.editedOn;
+ data['CreatedBy'] = this.createdBy;
+ data['AdmissionClinicID'] = this.admissionClinicID;
+ data['AdmissionClinicName'] = this.admissionClinicName;
+ data['DoctorClinicName'] = this.doctorClinicName;
+ data['DoctorName'] = this.doctorName;
+ data['VisitTypeDesc'] = this.visitTypeDesc;
+ return data;
+ }
+}
diff --git a/lib/core/model/note/update_note_model.dart b/lib/core/model/note/update_note_model.dart
new file mode 100644
index 00000000..20fd4b86
--- /dev/null
+++ b/lib/core/model/note/update_note_model.dart
@@ -0,0 +1,80 @@
+class UpdateNoteReqModel {
+ int projectID;
+ int createdBy;
+ int admissionNo;
+ int lineItemNo;
+ String notes;
+ bool verifiedNote;
+ bool cancelledNote;
+ int languageID;
+ String stamp;
+ String iPAdress;
+ double versionID;
+ int channel;
+ String tokenID;
+ String sessionID;
+ bool isLoginForDoctorApp;
+ bool patientOutSA;
+ int patientTypeID;
+
+ UpdateNoteReqModel(
+ {this.projectID,
+ this.createdBy,
+ this.admissionNo,
+ this.lineItemNo,
+ this.notes,
+ this.verifiedNote,
+ this.cancelledNote,
+ this.languageID,
+ this.stamp,
+ this.iPAdress,
+ this.versionID,
+ this.channel,
+ this.tokenID,
+ this.sessionID,
+ this.isLoginForDoctorApp,
+ this.patientOutSA,
+ this.patientTypeID});
+
+ UpdateNoteReqModel.fromJson(Map json) {
+ projectID = json['ProjectID'];
+ createdBy = json['CreatedBy'];
+ admissionNo = json['AdmissionNo'];
+ lineItemNo = json['LineItemNo'];
+ notes = json['Notes'];
+ verifiedNote = json['VerifiedNote'];
+ cancelledNote = json['CancelledNote'];
+ languageID = json['LanguageID'];
+ stamp = json['stamp'];
+ iPAdress = json['IPAdress'];
+ versionID = json['VersionID'];
+ channel = json['Channel'];
+ tokenID = json['TokenID'];
+ sessionID = json['SessionID'];
+ isLoginForDoctorApp = json['IsLoginForDoctorApp'];
+ patientOutSA = json['PatientOutSA'];
+ patientTypeID = json['PatientTypeID'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['ProjectID'] = this.projectID;
+ data['CreatedBy'] = this.createdBy;
+ data['AdmissionNo'] = this.admissionNo;
+ data['LineItemNo'] = this.lineItemNo;
+ data['Notes'] = this.notes;
+ data['VerifiedNote'] = this.verifiedNote;
+ data['CancelledNote'] = this.cancelledNote;
+ data['LanguageID'] = this.languageID;
+ data['stamp'] = this.stamp;
+ data['IPAdress'] = this.iPAdress;
+ data['VersionID'] = this.versionID;
+ data['Channel'] = this.channel;
+ data['TokenID'] = this.tokenID;
+ data['SessionID'] = this.sessionID;
+ data['IsLoginForDoctorApp'] = this.isLoginForDoctorApp;
+ data['PatientOutSA'] = this.patientOutSA;
+ data['PatientTypeID'] = this.patientTypeID;
+ return data;
+ }
+}
diff --git a/lib/core/model/prescription_req_model.dart b/lib/core/model/prescription_req_model.dart
index 3eb71072..a45878d8 100644
--- a/lib/core/model/prescription_req_model.dart
+++ b/lib/core/model/prescription_req_model.dart
@@ -2,13 +2,16 @@ class PrescriptionReqModel {
String vidaAuthTokenID;
dynamic patientMRN;
dynamic appNo;
+ dynamic admissionNo;
- PrescriptionReqModel({this.vidaAuthTokenID, this.patientMRN, this.appNo});
+ PrescriptionReqModel(
+ {this.vidaAuthTokenID, this.patientMRN, this.appNo, this.admissionNo});
PrescriptionReqModel.fromJson(Map json) {
vidaAuthTokenID = json['VidaAuthTokenID'];
patientMRN = json['PatientMRN'];
appNo = json['AppointmentNo'];
+ admissionNo = json['AdmissionNo'];
}
Map toJson() {
@@ -16,6 +19,8 @@ class PrescriptionReqModel {
data['VidaAuthTokenID'] = this.vidaAuthTokenID;
data['PatientMRN'] = this.patientMRN;
data['AppointmentNo'] = this.appNo;
+ data['AdmissionNo'] = this.admissionNo;
+
return data;
}
}
diff --git a/lib/core/model/radiology/final_radiology.dart b/lib/core/model/radiology/final_radiology.dart
index 66433091..fdccf5f5 100644
--- a/lib/core/model/radiology/final_radiology.dart
+++ b/lib/core/model/radiology/final_radiology.dart
@@ -1,47 +1,48 @@
import 'package:doctor_app_flutter/util/date-utils.dart';
class FinalRadiology {
- String setupID;
- int projectID;
- Null patientID;
- int invoiceLineItemNo;
- int invoiceNo;
- int doctorID;
- int clinicID;
+ dynamic setupID;
+ dynamic projectID;
+ dynamic patientID;
+ dynamic invoiceLineItemNo;
+ dynamic invoiceNo;
+ dynamic doctorID;
+ dynamic clinicID;
DateTime orderDate;
- String reportData;
- String imageURL;
- String procedureID;
- int appointmentNo;
- Null dIAPacsURL;
+ DateTime reportDate;
+ dynamic reportData;
+ dynamic imageURL;
+ dynamic procedureID;
+ dynamic appodynamicmentNo;
+ dynamic dIAPacsURL;
bool isRead;
- String readOn;
+ dynamic readOn;
var admissionNo;
bool isInOutPatient;
- int actualDoctorRate;
- String clinicDescription;
- String dIAPACSURL;
- String doctorImageURL;
- String doctorName;
- int doctorRate;
- String doctorTitle;
- int gender;
- String genderDescription;
+ dynamic actualDoctorRate;
+ dynamic clinicDescription;
+ dynamic dIAPACSURL;
+ dynamic doctorImageURL;
+ dynamic doctorName;
+ dynamic doctorRate;
+ dynamic doctorTitle;
+ dynamic gender;
+ dynamic genderDescription;
bool isActiveDoctorProfile;
bool isExecludeDoctor;
- String isInOutPatientDescription;
- String isInOutPatientDescriptionN;
- String nationalityFlagURL;
- int noOfPatientsRate;
- int orderNo;
- String projectName;
- String qR;
- String reportDataHTML;
- String reportDataTextString;
- List speciality;
+ dynamic isInOutPatientDescription;
+ dynamic isInOutPatientDescriptionN;
+ dynamic nationalityFlagURL;
+ dynamic noOfPatientsRate;
+ dynamic orderNo;
+ dynamic projectName;
+ dynamic qR;
+ dynamic reportDataHTML;
+ dynamic reportDataTextdynamic;
+ List speciality;
bool isCVI;
bool isRadMedicalReport;
- bool isLiveCareAppointment;
+ bool isLiveCareAppodynamicment;
FinalRadiology(
{this.setupID,
@@ -52,10 +53,11 @@ class FinalRadiology {
this.doctorID,
this.clinicID,
this.orderDate,
+ this.reportDate,
this.reportData,
this.imageURL,
this.procedureID,
- this.appointmentNo,
+ this.appodynamicmentNo,
this.dIAPacsURL,
this.isRead,
this.readOn,
@@ -80,12 +82,12 @@ class FinalRadiology {
this.projectName,
this.qR,
this.reportDataHTML,
- this.reportDataTextString,
+ this.reportDataTextdynamic,
this.speciality,
this.isCVI,
- this.isRadMedicalReport,this.isLiveCareAppointment});
+ this.isRadMedicalReport,this.isLiveCareAppodynamicment});
- FinalRadiology.fromJson(Map json) {
+ FinalRadiology.fromJson(Map json) {
try {
setupID = json['SetupID'];
projectID = json['ProjectID'];
@@ -95,17 +97,18 @@ class FinalRadiology {
doctorID = json['DoctorID'];
clinicID = json['ClinicID'];
orderDate = DateUtils.convertStringToDate(json['OrderDate']);
+ reportDate = DateUtils.convertStringToDate(json['ReportDate']);
reportData = json['ReportData'];
imageURL = json['ImageURL'];
procedureID = json['ProcedureID'];
- appointmentNo = json['AppointmentNo'];
+ appodynamicmentNo = json['AppodynamicmentNo'];
dIAPacsURL = json['DIAPacsURL'];
isRead = json['IsRead'];
readOn = json['ReadOn'];
admissionNo = json['AdmissionNo'];
isInOutPatient = json['IsInOutPatient'];
actualDoctorRate = json['ActualDoctorRate'];
- clinicDescription = json['ClinicDescription'];
+ clinicDescription = json['ClinicDescription']?? json['ClinicName'];
dIAPACSURL = json['DIA_PACS_URL'];
doctorImageURL = json['DoctorImageURL'];
doctorName = json['DoctorName'];
@@ -122,20 +125,21 @@ class FinalRadiology {
orderNo = json['OrderNo'];
projectName = json['ProjectName'];
qR = json['QR'];
- isLiveCareAppointment = json['IsLiveCareAppointment'];
+ isLiveCareAppodynamicment = json['IsLiveCareAppointment'];
reportDataHTML = json['ReportDataHTML'];
- reportDataTextString = json['ReportDataTextString'];
- // speciality = json['Speciality'].cast();
+ reportDataTextdynamic = json['ReportDataTextdynamic'];
+ // speciality = json['Speciality'].cast();
isCVI = json['isCVI'];
isRadMedicalReport = json['isRadMedicalReport'];
} catch (e) {
print(e);
+
}
}
- Map toJson() {
- final Map data = new Map();
+ Map toJson() {
+ final Map data = new Map();
data['SetupID'] = this.setupID;
data['ProjectID'] = this.projectID;
data['PatientID'] = this.patientID;
@@ -147,7 +151,7 @@ class FinalRadiology {
data['ReportData'] = this.reportData;
data['ImageURL'] = this.imageURL;
data['ProcedureID'] = this.procedureID;
- data['AppointmentNo'] = this.appointmentNo;
+ data['AppodynamicmentNo'] = this.appodynamicmentNo;
data['DIAPacsURL'] = this.dIAPacsURL;
data['IsRead'] = this.isRead;
data['ReadOn'] = this.readOn;
@@ -172,7 +176,7 @@ class FinalRadiology {
data['ProjectName'] = this.projectName;
data['QR'] = this.qR;
data['ReportDataHTML'] = this.reportDataHTML;
- data['ReportDataTextString'] = this.reportDataTextString;
+ data['ReportDataTextdynamic'] = this.reportDataTextdynamic;
data['Speciality'] = this.speciality;
data['isCVI'] = this.isCVI;
data['isRadMedicalReport'] = this.isRadMedicalReport;
@@ -181,7 +185,7 @@ class FinalRadiology {
}
class FinalRadiologyList {
- String filterName = "";
+ dynamic filterName = "";
List finalRadiologyList = List();
FinalRadiologyList({this.filterName, FinalRadiology finalRadiology}) {
diff --git a/lib/core/model/sick_leave_patient_model.dart b/lib/core/model/sick_leave_patient_model.dart
new file mode 100644
index 00000000..3c78f1ff
--- /dev/null
+++ b/lib/core/model/sick_leave_patient_model.dart
@@ -0,0 +1,156 @@
+import 'package:doctor_app_flutter/widgets/shared/StarRating.dart';
+
+class SickLeavePatientModel {
+ String setupID;
+ int projectID;
+ int patientID;
+ int patientType;
+ int clinicID;
+ int doctorID;
+ int requestNo;
+ String requestDate;
+ int sickLeaveDays;
+ int appointmentNo;
+ int admissionNo;
+ int actualDoctorRate;
+ String appointmentDate;
+ String clinicName;
+ String doctorImageURL;
+ String doctorName;
+ int doctorRate;
+ String doctorTitle;
+ int gender;
+ String genderDescription;
+ bool isActiveDoctorProfile;
+ bool isDoctorAllowVedioCall;
+ bool isExecludeDoctor;
+ bool isInOutPatient;
+ String isInOutPatientDescription;
+ String isInOutPatientDescriptionN;
+ bool isLiveCareAppointment;
+ int noOfPatientsRate;
+ dynamic patientName;
+ String projectName;
+ String qR;
+ // List speciality;
+ String strRequestDate;
+ String startDate;
+ String endDate;
+
+ SickLeavePatientModel(
+ {this.setupID,
+ this.projectID,
+ this.patientID,
+ this.patientType,
+ this.clinicID,
+ this.doctorID,
+ this.requestNo,
+ this.requestDate,
+ this.sickLeaveDays,
+ this.appointmentNo,
+ this.admissionNo,
+ this.actualDoctorRate,
+ this.appointmentDate,
+ this.clinicName,
+ this.doctorImageURL,
+ this.doctorName,
+ this.doctorRate,
+ this.doctorTitle,
+ this.gender,
+ this.genderDescription,
+ this.isActiveDoctorProfile,
+ this.isDoctorAllowVedioCall,
+ this.isExecludeDoctor,
+ this.isInOutPatient,
+ this.isInOutPatientDescription,
+ this.isInOutPatientDescriptionN,
+ this.isLiveCareAppointment,
+ this.noOfPatientsRate,
+ this.patientName,
+ this.projectName,
+ this.qR,
+ // this.speciality,
+ this.strRequestDate,
+ this.startDate,
+ this.endDate});
+
+ SickLeavePatientModel.fromJson(Map json) {
+ setupID = json['SetupID'];
+
+ projectID = json['ProjectID'];
+ patientID = json['PatientID'];
+ patientType = json['PatientType'];
+ clinicID = json['ClinicID'];
+ doctorID = json['DoctorID'];
+ requestNo = json['RequestNo'];
+ requestDate = json['RequestDate'];
+ sickLeaveDays = json['SickLeaveDays'];
+ appointmentNo = json['AppointmentNo'];
+ admissionNo = json['AdmissionNo'];
+ actualDoctorRate = json['ActualDoctorRate'];
+ appointmentDate = json['AppointmentDate'];
+ clinicName = json['ClinicName'];
+ doctorImageURL = json['DoctorImageURL'];
+ doctorName = json['DoctorName'];
+ doctorRate = json['DoctorRate'];
+ doctorTitle = json['DoctorTitle'];
+ gender = json['Gender'];
+ genderDescription = json['GenderDescription'];
+ isActiveDoctorProfile = json['IsActiveDoctorProfile'];
+ isDoctorAllowVedioCall = json['IsDoctorAllowVedioCall'];
+ isExecludeDoctor = json['IsExecludeDoctor'];
+ isInOutPatient = json['IsInOutPatient'];
+ isInOutPatientDescription = json['IsInOutPatientDescription'];
+ isInOutPatientDescriptionN = json['IsInOutPatientDescriptionN'];
+ isLiveCareAppointment = json['IsLiveCareAppointment'];
+ noOfPatientsRate = json['NoOfPatientsRate'];
+ patientName = json['PatientName'];
+ projectName = json['ProjectName'];
+ qR = json['QR'];
+ // speciality = json['Speciality'].cast();
+ strRequestDate = json['StrRequestDate'];
+ startDate = json['StartDate'];
+ endDate = json['EndDate'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['SetupID'] = this.setupID;
+
+ data['ProjectID'] = this.projectID;
+ data['PatientID'] = this.patientID;
+ data['PatientType'] = this.patientType;
+ data['ClinicID'] = this.clinicID;
+ data['DoctorID'] = this.doctorID;
+ data['RequestNo'] = this.requestNo;
+ data['RequestDate'] = this.requestDate;
+ data['SickLeaveDays'] = this.sickLeaveDays;
+ data['AppointmentNo'] = this.appointmentNo;
+ data['AdmissionNo'] = this.admissionNo;
+ data['ActualDoctorRate'] = this.actualDoctorRate;
+ data['AppointmentDate'] = this.appointmentDate;
+ data['ClinicName'] = this.clinicName;
+ data['DoctorImageURL'] = this.doctorImageURL;
+ data['DoctorName'] = this.doctorName;
+ data['DoctorRate'] = this.doctorRate;
+ data['DoctorTitle'] = this.doctorTitle;
+ data['Gender'] = this.gender;
+ data['GenderDescription'] = this.genderDescription;
+ data['IsActiveDoctorProfile'] = this.isActiveDoctorProfile;
+ data['IsDoctorAllowVedioCall'] = this.isDoctorAllowVedioCall;
+ data['IsExecludeDoctor'] = this.isExecludeDoctor;
+ data['IsInOutPatient'] = this.isInOutPatient;
+ data['IsInOutPatientDescription'] = this.isInOutPatientDescription;
+ data['IsInOutPatientDescriptionN'] = this.isInOutPatientDescriptionN;
+ data['IsLiveCareAppointment'] = this.isLiveCareAppointment;
+ data['NoOfPatientsRate'] = this.noOfPatientsRate;
+ data['PatientName'] = this.patientName;
+ data['ProjectName'] = this.projectName;
+ data['QR'] = this.qR;
+ // data['Speciality'] = this.speciality;
+ data['StrRequestDate'] = this.strRequestDate;
+ data['StartDate'] = this.startDate;
+ data['EndDate'] = this.endDate;
+ return data;
+ }
+}
diff --git a/lib/core/model/sick_leave_patient_request_model.dart b/lib/core/model/sick_leave_patient_request_model.dart
new file mode 100644
index 00000000..ec588316
--- /dev/null
+++ b/lib/core/model/sick_leave_patient_request_model.dart
@@ -0,0 +1,60 @@
+class SickLeavePatientRequestModel {
+ double versionID;
+ int channel;
+ int languageID;
+ String iPAdress;
+ String generalid;
+ int patientOutSA;
+ int deviceTypeID;
+ int patientType;
+ int patientTypeID;
+ String tokenID;
+ int patientID;
+ String sessionID;
+
+ SickLeavePatientRequestModel(
+ {this.versionID,
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.deviceTypeID,
+ this.patientType,
+ this.patientTypeID,
+ this.tokenID,
+ this.patientID,
+ this.sessionID});
+
+ SickLeavePatientRequestModel.fromJson(Map json) {
+ versionID = json['VersionID'];
+ channel = json['Channel'];
+ languageID = json['LanguageID'];
+ iPAdress = json['IPAdress'];
+ generalid = json['generalid'];
+ patientOutSA = json['PatientOutSA'];
+ deviceTypeID = json['DeviceTypeID'];
+ patientType = json['PatientType'];
+ patientTypeID = json['PatientTypeID'];
+ tokenID = json['TokenID'];
+ patientID = json['PatientID'];
+ sessionID = json['SessionID'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['VersionID'] = this.versionID;
+ data['Channel'] = this.channel;
+ data['LanguageID'] = this.languageID;
+ data['IPAdress'] = this.iPAdress;
+ data['generalid'] = this.generalid;
+ data['PatientOutSA'] = this.patientOutSA;
+ data['DeviceTypeID'] = this.deviceTypeID;
+ data['PatientType'] = this.patientType;
+ data['PatientTypeID'] = this.patientTypeID;
+ data['TokenID'] = this.tokenID;
+ data['PatientID'] = this.patientID;
+ data['SessionID'] = this.sessionID;
+ return data;
+ }
+}
diff --git a/lib/core/provider/robot_provider.dart b/lib/core/provider/robot_provider.dart
new file mode 100644
index 00000000..a01b1318
--- /dev/null
+++ b/lib/core/provider/robot_provider.dart
@@ -0,0 +1,25 @@
+import 'dart:async';
+
+class RobotProvider {
+ static final RobotProvider _singleton = RobotProvider._internal();
+ var value;
+ StreamController