Merge branch 'fixes' into 'development'

Fixes

See merge request Cloud_Solution/doctor_app_flutter!756
merge-requests/758/merge
Mohammad Aljammal 5 years ago
commit a5988c2885

@ -1,9 +1,9 @@
// TODO : it have to be changed. // TODO = it have to be changed.
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
class PatiantInformtion { class PatiantInformtion {
final PatiantInformtion patientDetails; PatiantInformtion patientDetails;
int genderInt; int genderInt;
dynamic age; dynamic age;
String appointmentDate; String appointmentDate;
@ -79,178 +79,268 @@ class PatiantInformtion {
int vcId; int vcId;
String voipToken; String voipToken;
PatiantInformtion( PatiantInformtion({this.patientDetails,
{this.patientDetails, this.projectId,
this.projectId, this.clinicId,
this.clinicId, this.doctorId,
this.doctorId, this.patientId,
this.patientId, this.doctorName,
this.doctorName, this.doctorNameN,
this.doctorNameN, this.firstName,
this.firstName, this.middleName,
this.middleName, this.lastName,
this.lastName, this.firstNameN,
this.firstNameN, this.middleNameN,
this.middleNameN, this.lastNameN,
this.lastNameN, this.gender,
this.gender, this.dateofBirth,
this.dateofBirth, this.nationalityId,
this.nationalityId, this.mobileNumber,
this.mobileNumber, this.emailAddress,
this.emailAddress, this.patientIdentificationNo,
this.patientIdentificationNo, this.patientType,
this.patientType, this.admissionNo,
this.admissionNo, this.admissionDate,
this.admissionDate, this.createdOn,
this.createdOn, this.roomId,
this.roomId, this.bedId,
this.bedId, this.nursingStationId,
this.nursingStationId, this.description,
this.description, this.clinicDescription,
this.clinicDescription, this.clinicDescriptionN,
this.clinicDescriptionN, this.nationalityName,
this.nationalityName, this.nationalityNameN,
this.nationalityNameN, this.age,
this.age, this.genderDescription,
this.genderDescription, this.nursingStationName,
this.nursingStationName, this.appointmentDate,
this.appointmentDate, this.startTime,
this.startTime, this.appointmentNo,
this.appointmentNo, this.arrivalTime,
this.arrivalTime, this.arrivalTimeD,
this.arrivalTimeD, this.callStatus,
this.callStatus, this.callStatusDisc,
this.callStatusDisc, this.callTypeID,
this.callTypeID, this.clientRequestID,
this.clientRequestID, this.clinicName,
this.clinicName, this.consoltationEnd,
this.consoltationEnd, this.consultationNotes,
this.consultationNotes, this.appointmentType,
this.appointmentType, this.appointmentTypeId,
this.appointmentTypeId, this.arrivedOn,
this.arrivedOn, this.clinicGroupId,
this.clinicGroupId, this.companyName,
this.companyName, this.dischargeStatus,
this.dischargeStatus, this.doctorDetails,
this.doctorDetails, this.endTime,
this.endTime, this.episodeNo,
this.episodeNo, this.fallRiskScore,
this.fallRiskScore, this.genderInt,
this.genderInt, this.isSigned,
this.isSigned, this.medicationOrders,
this.medicationOrders, this.nationality,
this.nationality, this.patientMRN,
this.patientMRN, this.visitType,
this.visitType, this.fullName,
this.fullName, this.fullNameN,
this.fullNameN, this.nationalityFlagURL,
this.nationalityFlagURL, this.patientStatusType,
this.patientStatusType, this.patientStatus,
this.patientStatus, this.visitTypeId,
this.visitTypeId, this.startTimes,
this.startTimes, this.dischargeDate,
this.dischargeDate, this.status,
this.status, this.vcId,
this.vcId, this.voipToken,
this.voipToken, this.admissionDateWithDateTimeForm,
this.admissionDateWithDateTimeForm,
this.appointmentDateWithDateTimeForm}); this.appointmentDateWithDateTimeForm});
factory PatiantInformtion.fromJson(Map<String, dynamic> json) => PatiantInformtion(
patientDetails: json['patientDetails'] != null ? new PatiantInformtion.fromJson(json['patientDetails']) : null, PatiantInformtion.fromJson(Map<String, dynamic> json) {
projectId: json["ProjectID"] ?? json["projectID"], {
clinicId: json["ClinicID"] ?? json["clinicID"], patientDetails = json['patientDetails'] != null
doctorId: json["DoctorID"] ?? json["doctorID"], ? new PatiantInformtion.fromJson(json['patientDetails'])
patientId: json["PatientID"] != null : null;
projectId = json["ProjectID"] ?? json["projectID"];
clinicId = json["ClinicID"] ?? json["clinicID"];
doctorId = json["DoctorID"] ?? json["doctorID"];
patientId = json["PatientID"] != null
? json["PatientID"] is String ? json["PatientID"] is String
? int.parse(json["PatientID"]) ? int.parse(json["PatientID"])
: json["PatientID"] : json["PatientID"]
: json["patientID"] ?? json['patientMRN'] ?? json['PatientMRN'], : json["patientID"] ?? json['patientMRN'] ?? json['PatientMRN'];
doctorName: json["DoctorName"] ?? json["doctorName"], doctorName = json["DoctorName"] ?? json["doctorName"];
doctorNameN: json["DoctorNameN"] ?? json["doctorNameN"], doctorNameN = json["DoctorNameN"] ?? json["doctorNameN"];
firstName: json["FirstName"] ?? json["firstName"], firstName = json["FirstName"] ?? json["firstName"];
middleName: json["MiddleName"] ?? json["middleName"], middleName = json["MiddleName"] ?? json["middleName"];
lastName: json["LastName"] ?? json["lastName"], lastName = json["LastName"] ?? json["lastName"];
firstNameN: json["FirstNameN"] ?? json["firstNameN"], firstNameN = json["FirstNameN"] ?? json["firstNameN"];
middleNameN: json["MiddleNameN"] ?? json["middleNameN"], middleNameN = json["MiddleNameN"] ?? json["middleNameN"];
lastNameN: json["LastNameN"] ?? json["lastNameN"], lastNameN = json["LastNameN"] ?? json["lastNameN"];
gender: json["Gender"] != null gender = json["Gender"] != null
? json["Gender"] is String ? json["Gender"] is String
? int.parse(json["Gender"]) ? int.parse(json["Gender"])
: json["Gender"] : json["Gender"]
: json["gender"], : json["gender"];
fullName: json["fullName"] ?? json["fullName"] ?? json["PatientName"], fullName = json["fullName"] ?? json["fullName"] ?? json["PatientName"];
fullNameN: json["fullNameN"] ?? json["fullNameN"] ?? json["PatientName"], fullNameN =
dateofBirth: json["DateofBirth"] ?? json["dob"] ?? json['DateOfBirth'], json["fullNameN"] ?? json["fullNameN"] ?? json["PatientName"];
nationalityId: json["NationalityID"] ?? json["nationalityID"], dateofBirth = json["DateofBirth"] ?? json["dob"] ?? json['DateOfBirth'];
mobileNumber: json["MobileNumber"] ?? json["mobileNumber"], nationalityId = json["NationalityID"] ?? json["nationalityID"];
emailAddress: json["EmailAddress"] ?? json["emailAddress"], mobileNumber = json["MobileNumber"] ?? json["mobileNumber"];
patientIdentificationNo: json["PatientIdentificationNo"] ?? json["patientIdentificationNo"], emailAddress = json["EmailAddress"] ?? json["emailAddress"];
patientIdentificationNo =
json["PatientIdentificationNo"] ?? json["patientIdentificationNo"];
//TODO make 7 dynamic when the backend retrun it in patient arrival //TODO make 7 dynamic when the backend retrun it in patient arrival
patientType: json["PatientType"] ?? json["patientType"] ?? 1, patientType = json["PatientType"] ?? json["patientType"] ?? 1;
admissionNo: json["AdmissionNo"] ?? json["admissionNo"], admissionNo = json["AdmissionNo"] ?? json["admissionNo"];
admissionDate: json["AdmissionDate"] ?? json["admissionDate"], admissionDate = json["AdmissionDate"] ?? json["admissionDate"];
createdOn: json["CreatedOn"] ?? json["CreatedOn"], createdOn = json["CreatedOn"] ?? json["CreatedOn"];
roomId: json["RoomID"] ?? json["roomID"], roomId = json["RoomID"] ?? json["roomID"];
bedId: json["BedID"] ?? json["bedID"], bedId = json["BedID"] ?? json["bedID"];
nursingStationId: json["NursingStationID"] ?? json["nursingStationID"], nursingStationId = json["NursingStationID"] ?? json["nursingStationID"];
description: json["Description"] ?? json["description"], description = json["Description"] ?? json["description"];
clinicDescription: json["ClinicDescription"] ?? json["clinicDescription"], clinicDescription =
clinicDescriptionN: json["ClinicDescriptionN"] ?? json["clinicDescriptionN"], json["ClinicDescription"] ?? json["clinicDescription"];
nationalityName: json["NationalityName"] ?? json["nationalityName"] ?? json['NationalityName'], clinicDescriptionN =
nationalityNameN: json["NationalityNameN"] ?? json["nationalityNameN"] ?? json['NationalityNameN'], json["ClinicDescriptionN"] ?? json["clinicDescriptionN"];
age: json["Age"] ?? json["age"], nationalityName = json["NationalityName"] ??
genderDescription: json["GenderDescription"], json["nationalityName"] ??
nursingStationName: json["NursingStationName"], json['NationalityName'];
appointmentDate: json["AppointmentDate"] ?? '', nationalityNameN = json["NationalityNameN"] ??
startTime: json["startTime"] ?? json['StartTime'], json["nationalityNameN"] ??
appointmentNo: json['appointmentNo'] ?? json['AppointmentNo'], json['NationalityNameN'];
appointmentType: json['appointmentType'], age = json["Age"] ?? json["age"];
appointmentTypeId: json['appointmentTypeId'] ?? json['appointmentTypeid'], genderDescription = json["GenderDescription"];
arrivedOn: json['ArrivedOn'] ?? json['arrivedOn'] ?? json['ArrivedOn'], nursingStationName = json["NursingStationName"];
clinicGroupId: json['clinicGroupId'], appointmentDate = json["AppointmentDate"] ?? '';
companyName: json['companyName'], startTime = json["startTime"] ?? json['StartTime'];
dischargeStatus: json['dischargeStatus'], appointmentNo = json['appointmentNo'] ?? json['AppointmentNo'];
doctorDetails: json['doctorDetails'], appointmentType = json['appointmentType'];
endTime: json['endTime'], appointmentTypeId =
episodeNo: json['episodeNo'] ?? json['EpisodeID'] ?? json['EpisodeNo'], json['appointmentTypeId'] ?? json['appointmentTypeid'];
fallRiskScore: json['fallRiskScore'], arrivedOn = json['ArrivedOn'] ?? json['arrivedOn'] ?? json['ArrivedOn'];
isSigned: json['isSigned'], clinicGroupId = json['clinicGroupId'];
medicationOrders: json['medicationOrders'], companyName = json['companyName'];
nationality: json['nationality'] ?? json['NationalityNameN'], dischargeStatus = json['dischargeStatus'];
patientMRN: json['patientMRN'] ?? doctorDetails = json['doctorDetails'];
endTime = json['endTime'];
episodeNo = json['episodeNo'] ?? json['EpisodeID'] ?? json['EpisodeNo'];
fallRiskScore = json['fallRiskScore'];
isSigned = json['isSigned'];
medicationOrders = json['medicationOrders'];
nationality = json['nationality'] ?? json['NationalityNameN'];
patientMRN = json['patientMRN'] ??
json['PatientMRN'] ?? json['PatientMRN'] ??
(json["PatientID"] != null (json["PatientID"] != null
? int?.parse(json["PatientID"].toString()) ? int?.parse(json["PatientID"].toString())
: json["patientID"] != null : json["patientID"] != null ? int?.parse(
? int?.parse(json["patientID"].toString()) json["patientID"].toString()) : json["patientId"] != null ? int
: json["patientId"] != null ?.parse(json["patientId"].toString()) : '');
? int?.parse(json["patientId"].toString()) visitType = json['visitType'] ?? json['visitType'] ?? json['visitType'];
: ''), nationalityFlagURL =
visitType: json['visitType'] ?? json['visitType'] ?? json['visitType'], json['NationalityFlagURL'] ?? json['NationalityFlagURL'];
nationalityFlagURL: json['NationalityFlagURL'] ?? json['NationalityFlagURL'], patientStatusType =
patientStatusType: json['patientStatusType'] ?? json['PatientStatusType'], json['patientStatusType'] ?? json['PatientStatusType'];
visitTypeId: json['visitTypeId'] ?? json['visitTypeId'] ?? json['visitTypeid'], visitTypeId =
startTimes: json['StartTime'] ?? json['StartTime'], json['visitTypeId'] ?? json['visitTypeId'] ?? json['visitTypeid'];
dischargeDate: json['DischargeDate'], startTimes = json['StartTime'] ?? json['StartTime'];
status: json['Status'], dischargeDate = json['DischargeDate'];
vcId: json['VC_ID'], status = json['Status'];
arrivalTime: json['ArrivalTime'], vcId = json['VC_ID'];
arrivalTimeD: json['ArrivalTimeD'],
callStatus: json['CallStatus'], arrivalTime = json['ArrivalTime'];
callStatusDisc: json['CallStatusDisc'], arrivalTimeD = json['ArrivalTimeD'];
callTypeID: json['CallTypeID'], callStatus = json['CallStatus'];
clientRequestID: json['ClientRequestID'], callStatusDisc = json['CallStatusDisc'];
clinicName: json['ClinicName'], callTypeID = json['CallTypeID'];
consoltationEnd: json['ConsoltationEnd'], clientRequestID = json['ClientRequestID'];
consultationNotes: json['ConsultationNotes'], clinicName = json['ClinicName'];
patientStatus: json['PatientStatus'], consoltationEnd = json['ConsoltationEnd'];
voipToken: json['VoipToken'], consultationNotes = json['ConsultationNotes'];
admissionDateWithDateTimeForm: json["AdmissionDate"] != null patientStatus = json['PatientStatus'];
voipToken = json['VoipToken'];
admissionDateWithDateTimeForm = json["AdmissionDate"] != null
? AppDateUtils.convertStringToDate(json["AdmissionDate"]) ? AppDateUtils.convertStringToDate(json["AdmissionDate"])
: json["admissionDate"] != null : json["admissionDate"] != null ? AppDateUtils.convertStringToDate(
? AppDateUtils.convertStringToDate(json["admissionDate"]) json["admissionDate"]) : null;
: null,
appointmentDateWithDateTimeForm: appointmentDateWithDateTimeForm =
json["AppointmentDate"] != null ? AppDateUtils.convertStringToDate(json["AppointmentDate"]) : null); json["AppointmentDate"] != null ? AppDateUtils.convertStringToDate(
} json["AppointmentDate"]) : null;
}
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['patientDetails'] = this.patientDetails;
data["ProjectID"] = this.projectId;
data["projectID"] = this.projectId;
data["ClinicID"] = this.clinicId;
data["clinicID"] = this.clinicId;
data["DoctorID"] = this.doctorId;
data["doctorID"] = this.doctorId;
data["PatientID"] = this.patientId;
data["patientID"] = this.patientId;
data['patientMRN'] = this.patientMRN;
data['PatientMRN'] = this.patientMRN;
data['episodeNo'] = this.episodeNo;
data['EpisodeID'] = this.episodeNo;
data['EpisodeNo'] = this.episodeNo;
data["DoctorName"] = this.doctorName;
data["doctorName"] = this.doctorName;
data["DoctorNameN"] = this.doctorNameN;
data["doctorNameN"] = this.doctorNameN;
data["FirstName"] = this.firstName;
data["firstName"] = this.firstName;
data["MiddleName"] = this.middleName;
data["middleName"] = this.middleName;
data["LastName"] = this.lastName;
data["lastName"] = this.lastName;
data["FirstNameN"] = this.firstNameN;
data["firstNameN"] = this.firstNameN;
data["MiddleNameN"] = this.middleNameN;
data["middleNameN"] = this.middleNameN;
data["LastNameN"] = this.lastNameN;
data["lastNameN"] = this.lastNameN;
data["fullName"] = this.fullName;
data["fullName"] = this.fullName;
data["PatientName"] = this.fullName;
data["Gender"] = this.gender;
data["gender"] = this.gender;
data['Age'] = this.age;
data['AppointmentDate'] = this.appointmentDate.isNotEmpty?this.appointmentDate:null;
data['AppointmentNo'] = this.appointmentNo;
data['ArrivalTime'] = this.arrivalTime;
data['ArrivalTimeD'] = this.arrivalTimeD;
data['CallStatus'] = this.callStatus;
data['CallStatusDisc'] = this.callStatusDisc;
data['CallTypeID'] = this.callTypeID;
data['ClientRequestID'] = this.clientRequestID;
data['ClinicName'] = this.clinicName;
data['ConsoltationEnd'] = this.consoltationEnd;
data['ConsultationNotes'] = this.consultationNotes;
data['CreatedOn'] = this.createdOn;
data['DoctorName'] = this.doctorName;
data['Gender'] = this.gender;
data['MobileNumber'] = this.mobileNumber;
data['PatientID'] = this.patientId;
data['PatientStatus'] = this.patientStatus;
data['ProjectID'] = this.projectId;
data['VC_ID'] = this.vcId;
data['VoipToken'] = this.voipToken;
data["DateofBirth"] = this.dateofBirth;
data["dob"] = this.dateofBirth;
data['DateOfBirth'] = this.dateofBirth;
return data;
}
}

@ -4,6 +4,7 @@ import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/viewModel/LiveCarePatientViewModel.dart'; import 'package:doctor_app_flutter/core/viewModel/LiveCarePatientViewModel.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/patient_card/PatientCard.dart'; import 'package:doctor_app_flutter/widgets/patients/patient_card/PatientCard.dart';
@ -141,7 +142,7 @@ class _LiveCarePatientScreenState extends State<LiveCarePatientScreen> {
return Padding( return Padding(
padding: EdgeInsets.all(8.0), padding: EdgeInsets.all(8.0),
child: PatientCard( child: PatientCard(
patientInfo: model.filterData[index], patientInfo: PatiantInformtion.fromJson(model.filterData[index].toJson()),
patientType: "0", patientType: "0",
arrivalType: "0", arrivalType: "0",
isFromSearch: false, isFromSearch: false,
@ -150,7 +151,7 @@ class _LiveCarePatientScreenState extends State<LiveCarePatientScreen> {
onTap: () { onTap: () {
// TODO change the parameter to daynamic // TODO change the parameter to daynamic
Navigator.of(context).pushNamed(PATIENTS_PROFILE, arguments: { Navigator.of(context).pushNamed(PATIENTS_PROFILE, arguments: {
"patient": model.filterData[index], "patient": PatiantInformtion.fromJson(model.filterData[index].toJson()),
"patientType": "0", "patientType": "0",
"isSearch": false, "isSearch": false,
"isInpatient": false, "isInpatient": false,

@ -26,7 +26,7 @@ class InPatientPage extends StatefulWidget {
class _InPatientPageState extends State<InPatientPage> { class _InPatientPageState extends State<InPatientPage> {
TextEditingController _searchController = TextEditingController(); TextEditingController _searchController = TextEditingController();
bool isSortDes = true; bool isSortDes = false;
@override @override
void dispose() { void dispose() {

Loading…
Cancel
Save