Finish arrived

pull/206/head
Elham Rababah 5 years ago
parent 06a1236c68
commit 61209663f3

@ -49,7 +49,7 @@ class PatientViewModel extends BaseViewModel {
List<dynamic> get referralFrequencyList => List<dynamic> get referralFrequencyList =>
_patientService.referalFrequancyList; _patientService.referalFrequancyList;
Future getPatientList(PatientModel patient, patientType, Future getPatientList( patient, patientType,
{bool isBusyLocal = false}) async { {bool isBusyLocal = false}) async {
if (isBusyLocal) { if (isBusyLocal) {
setState(ViewState.BusyLocal); setState(ViewState.BusyLocal);

@ -107,36 +107,36 @@ class PatiantInformtion {
factory PatiantInformtion.fromJson(Map<String, dynamic> json) => factory PatiantInformtion.fromJson(Map<String, dynamic> json) =>
PatiantInformtion( PatiantInformtion(
projectId: json["ProjectID"], projectId: json["ProjectID"] ?? json["projectID"],
clinicId: json["ClinicID"], clinicId: json["ClinicID"]?? json["clinicID"],
doctorId: json["DoctorID"], doctorId: json["DoctorID"]?? json["doctorID"],
patientId: json["PatientID"], patientId: json["PatientID"]?? json["patientID"],
doctorName: json["DoctorName"], doctorName: json["DoctorName"]?? json["doctorName"],
doctorNameN: json["DoctorNameN"], doctorNameN: json["DoctorNameN"]?? json["doctorNameN"],
firstName: json["FirstName"], firstName: json["FirstName"]?? json["firstName"],
middleName: json["MiddleName"], middleName: json["MiddleName"]?? json["middleName"],
lastName: json["LastName"], lastName: json["LastName"]?? json["lastName"],
firstNameN: json["FirstNameN"], firstNameN: json["FirstNameN"]?? json["firstNameN"],
middleNameN: json["MiddleNameN"], middleNameN: json["MiddleNameN"]?? json["middleNameN"],
lastNameN: json["LastNameN"], lastNameN: json["LastNameN"]?? json["lastNameN"],
gender: json["Gender"], gender: json["Gender"]?? json["gender"],
dateofBirth: json["DateofBirth"], dateofBirth: json["DateofBirth"]?? json["dob"],
nationalityId: json["NationalityID"], nationalityId: json["NationalityID"]?? json["nationalityID"],
mobileNumber: json["MobileNumber"], mobileNumber: json["MobileNumber"]?? json["mobileNumber"],
emailAddress: json["EmailAddress"], emailAddress: json["EmailAddress"]?? json["emailAddress"],
patientIdentificationNo: json["PatientIdentificationNo"], patientIdentificationNo: json["PatientIdentificationNo"]?? json["patientIdentificationNo"],
patientType: json["PatientType"], patientType: json["PatientType"]?? json["patientType"],
admissionNo: json["AdmissionNo"], admissionNo: json["AdmissionNo"]?? json["admissionNo"],
admissionDate: json["AdmissionDate"], admissionDate: json["AdmissionDate"]?? json["admissionDate"],
roomId: json["RoomID"], roomId: json["RoomID"]?? json["roomID"],
bedId: json["BedID"], bedId: json["BedID"]?? json["bedID"],
nursingStationId: json["NursingStationID"], nursingStationId: json["NursingStationID"]?? json["nursingStationID"],
description: json["Description"], description: json["Description"]?? json["description"],
clinicDescription: json["ClinicDescription"], clinicDescription: json["ClinicDescription"]?? json["clinicDescription"],
clinicDescriptionN: json["ClinicDescriptionN"], clinicDescriptionN: json["ClinicDescriptionN"]?? json["clinicDescriptionN"],
nationalityName: json["NationalityName"], nationalityName: json["NationalityName"]?? json["nationalityName"],
nationalityNameN: json["NationalityNameN"], nationalityNameN: json["NationalityNameN"]?? json["nationalityNameN"],
age: json["Age"], age: json["Age"]?? json["age"],
genderDescription: json["GenderDescription"], genderDescription: json["GenderDescription"],
nursingStationName: json["NursingStationName"], nursingStationName: json["NursingStationName"],
appointmentDate: json["AppointmentDate"]?? '', appointmentDate: json["AppointmentDate"]?? '',

@ -282,7 +282,14 @@ class _PatientsScreenState extends State<PatientsScreen> {
_isLoading = false; _isLoading = false;
this.error = error.toString(); this.error = error.toString();
} else { } else {
lItems = res[SERVICES_PATIANT2[val2]]["entityList"];
var localList=[];
res["patientArrivalList"]["entityList"].forEach((v) {
Map<String,dynamic> mergedPatient= {...v,...v["patientDetails"]};
localList.add(mergedPatient);
});
print(localList.toString());
lItems = localList;//res[SERVICES_PATIANT2[val2]]["entityList"];
} }
} else { } else {
lItems = res[SERVICES_PATIANT2[val2]]; lItems = res[SERVICES_PATIANT2[val2]];

Loading…
Cancel
Save