merge-requests/289/head
hussam al-habibeh 5 years ago
parent 9b5899d4e6
commit 29de472c66

@ -169,6 +169,7 @@ class Consulations {
List<LstPhysicalExam> lstPhysicalExam; List<LstPhysicalExam> lstPhysicalExam;
List<LstProcedure> lstProcedure; List<LstProcedure> lstProcedure;
List<LstMedicalHistory> lstMedicalHistory; List<LstMedicalHistory> lstMedicalHistory;
List<LstCheifComplaint> lstCheifComplaint;
Consulations( Consulations(
{this.admissionNo, {this.admissionNo,
@ -194,7 +195,8 @@ class Consulations {
this.lstAssessments, this.lstAssessments,
this.lstPhysicalExam, this.lstPhysicalExam,
this.lstProcedure, this.lstProcedure,
this.lstMedicalHistory}); this.lstMedicalHistory,
this.lstCheifComplaint});
Consulations.fromJson(Map<String, dynamic> json) { Consulations.fromJson(Map<String, dynamic> json) {
admissionNo = json['AdmissionNo']; admissionNo = json['AdmissionNo'];
@ -223,6 +225,12 @@ class Consulations {
lstAssessments.add(new LstAssessments.fromJson(v)); lstAssessments.add(new LstAssessments.fromJson(v));
}); });
} }
if (json['lstCheifComplaint'] != null) {
lstCheifComplaint = new List<LstCheifComplaint>();
json['lstCheifComplaint'].forEach((v) {
lstCheifComplaint.add(new LstCheifComplaint.fromJson(v));
});
}
if (json['lstPhysicalExam'] != null) { if (json['lstPhysicalExam'] != null) {
lstPhysicalExam = new List<LstPhysicalExam>(); lstPhysicalExam = new List<LstPhysicalExam>();
json['lstPhysicalExam'].forEach((v) { json['lstPhysicalExam'].forEach((v) {
@ -269,6 +277,10 @@ class Consulations {
data['lstAssessments'] = data['lstAssessments'] =
this.lstAssessments.map((v) => v.toJson()).toList(); this.lstAssessments.map((v) => v.toJson()).toList();
} }
if (this.lstCheifComplaint != null) {
data['lstCheifComplaint'] =
this.lstCheifComplaint.map((v) => v.toJson()).toList();
}
if (this.lstPhysicalExam != null) { if (this.lstPhysicalExam != null) {
data['lstPhysicalExam'] = data['lstPhysicalExam'] =
this.lstPhysicalExam.map((v) => v.toJson()).toList(); this.lstPhysicalExam.map((v) => v.toJson()).toList();
@ -284,6 +296,67 @@ class Consulations {
} }
} }
class LstCheifComplaint {
int appointmentNo;
String cCDate;
String chiefComplaint;
String currentMedication;
int episodeID;
String hOPI;
int patientID;
String patientType;
int projectID;
String projectName;
String setupID;
String dispalyName;
LstCheifComplaint(
{this.appointmentNo,
this.cCDate,
this.chiefComplaint,
this.currentMedication,
this.episodeID,
this.hOPI,
this.patientID,
this.patientType,
this.projectID,
this.projectName,
this.setupID,
this.dispalyName});
LstCheifComplaint.fromJson(Map<String, dynamic> json) {
appointmentNo = json['AppointmentNo'];
cCDate = json['CCDate'];
chiefComplaint = json['ChiefComplaint'];
currentMedication = json['CurrentMedication'];
episodeID = json['EpisodeID'];
hOPI = json['HOPI'];
patientID = json['PatientID'];
patientType = json['PatientType'];
projectID = json['ProjectID'];
projectName = json['ProjectName'];
setupID = json['SetupID'];
dispalyName = json['dispalyName'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['AppointmentNo'] = this.appointmentNo;
data['CCDate'] = this.cCDate;
data['ChiefComplaint'] = this.chiefComplaint;
data['CurrentMedication'] = this.currentMedication;
data['EpisodeID'] = this.episodeID;
data['HOPI'] = this.hOPI;
data['PatientID'] = this.patientID;
data['PatientType'] = this.patientType;
data['ProjectID'] = this.projectID;
data['ProjectName'] = this.projectName;
data['SetupID'] = this.setupID;
data['dispalyName'] = this.dispalyName;
return data;
}
}
class LstAssessments { class LstAssessments {
int appointmentNo; int appointmentNo;
String condition; String condition;

@ -188,7 +188,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.consulations .consulations
.length != .length !=
0) 0)
AppText( Expanded(
child: AppText(
model model
.medicalFileList[0] .medicalFileList[0]
.entityList[0] .entityList[0]
@ -199,6 +200,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.toUpperCase(), .toUpperCase(),
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
),
], ],
), ),
if (model.medicalFileList.length != 0) if (model.medicalFileList.length != 0)
@ -315,7 +317,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.timelines[encounterNumber] .timelines[encounterNumber]
.timeLineEvents[0] .timeLineEvents[0]
.consulations[0] .consulations[0]
.lstMedicalHistory .lstCheifComplaint
.length, .length,
itemBuilder: itemBuilder:
(BuildContext ctxt, int index) { (BuildContext ctxt, int index) {
@ -338,9 +340,9 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
encounterNumber] encounterNumber]
.timeLineEvents[0] .timeLineEvents[0]
.consulations[0] .consulations[0]
.lstMedicalHistory[ .lstCheifComplaint[
index] index]
.history .hOPI
.trim(), .trim(),
), ),
), ),
@ -795,7 +797,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.consulations[0] .consulations[0]
.lstPhysicalExam[ .lstPhysicalExam[
index] index]
.examType), .examDesc),
], ],
), ),
Row( Row(

@ -946,7 +946,7 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
: null, : null,
child: TextField( child: TextField(
decoration: textFieldSelectorDecoration( decoration: textFieldSelectorDecoration(
TranslationBase.of(context).route, 'Route',
route != null route != null
? route['name'] ? route['name']
: null, : null,
@ -1181,6 +1181,13 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
}); });
} }
// String getName(String num) {
// dynamic x = routeList.where((i) {
// return i['id'] == int.parse(num);
// }).first();
// return x.toString();
// }
updatePrescription( updatePrescription(
{PrescriptionViewModel model, {PrescriptionViewModel model,
int drugId, int drugId,

Loading…
Cancel
Save