Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
commit
909940a6d9
@ -0,0 +1,28 @@
|
|||||||
|
class PostEpisodeReqModel {
|
||||||
|
int appointmentNo;
|
||||||
|
int patientMRN;
|
||||||
|
int doctorID;
|
||||||
|
String vidaAuthTokenID;
|
||||||
|
|
||||||
|
PostEpisodeReqModel(
|
||||||
|
{this.appointmentNo,
|
||||||
|
this.patientMRN,
|
||||||
|
this.doctorID,
|
||||||
|
this.vidaAuthTokenID});
|
||||||
|
|
||||||
|
PostEpisodeReqModel.fromJson(Map<String, dynamic> json) {
|
||||||
|
appointmentNo = json['AppointmentNo'];
|
||||||
|
patientMRN = json['PatientMRN'];
|
||||||
|
doctorID = json['DoctorID'];
|
||||||
|
vidaAuthTokenID = json['VidaAuthTokenID'];
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() {
|
||||||
|
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||||
|
data['AppointmentNo'] = this.appointmentNo;
|
||||||
|
data['PatientMRN'] = this.patientMRN;
|
||||||
|
data['DoctorID'] = this.doctorID;
|
||||||
|
data['VidaAuthTokenID'] = this.vidaAuthTokenID;
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
|
||||||
|
|
||||||
|
class MySelectedHistory {
|
||||||
|
MasterKeyModel selectedHistory;
|
||||||
|
String remark;
|
||||||
|
bool isChecked;
|
||||||
|
|
||||||
|
MySelectedHistory(
|
||||||
|
{ this.selectedHistory, this.remark, this.isChecked});
|
||||||
|
|
||||||
|
MySelectedHistory.fromJson(Map<String, dynamic> json) {
|
||||||
|
|
||||||
|
selectedHistory = json['selectedHistory'] != null
|
||||||
|
? new MasterKeyModel.fromJson(json['selectedHistory'])
|
||||||
|
: null;
|
||||||
|
remark = json['remark'];
|
||||||
|
remark = json['isChecked'];
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() {
|
||||||
|
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||||
|
|
||||||
|
if (this.selectedHistory != null) {
|
||||||
|
data['selectedHistory'] = this.selectedHistory.toJson();
|
||||||
|
}
|
||||||
|
data['remark'] = this.remark;
|
||||||
|
data['isChecked'] = this.remark;
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,110 @@
|
|||||||
|
class OrderProcedure {
|
||||||
|
|
||||||
|
String achiCode;
|
||||||
|
String appointmentDate;
|
||||||
|
int appointmentNo;
|
||||||
|
int categoryID;
|
||||||
|
String clinicDescription;
|
||||||
|
String cptCode;
|
||||||
|
int createdBy;
|
||||||
|
String createdOn;
|
||||||
|
String doctorName;
|
||||||
|
bool isApprovalCreated;
|
||||||
|
bool isApprovalRequired;
|
||||||
|
bool isCovered;
|
||||||
|
bool isInvoiced;
|
||||||
|
bool isReferralInvoiced;
|
||||||
|
bool isUncoveredByDoctor;
|
||||||
|
int lineItemNo;
|
||||||
|
String orderDate;
|
||||||
|
int orderNo;
|
||||||
|
int orderType;
|
||||||
|
String procedureId;
|
||||||
|
String procedureName;
|
||||||
|
String remarks;
|
||||||
|
String status;
|
||||||
|
String template;
|
||||||
|
|
||||||
|
OrderProcedure(
|
||||||
|
{this.achiCode,
|
||||||
|
this.appointmentDate,
|
||||||
|
this.appointmentNo,
|
||||||
|
this.categoryID,
|
||||||
|
this.clinicDescription,
|
||||||
|
this.cptCode,
|
||||||
|
this.createdBy,
|
||||||
|
this.createdOn,
|
||||||
|
this.doctorName,
|
||||||
|
this.isApprovalCreated,
|
||||||
|
this.isApprovalRequired,
|
||||||
|
this.isCovered,
|
||||||
|
this.isInvoiced,
|
||||||
|
this.isReferralInvoiced,
|
||||||
|
this.isUncoveredByDoctor,
|
||||||
|
this.lineItemNo,
|
||||||
|
this.orderDate,
|
||||||
|
this.orderNo,
|
||||||
|
this.orderType,
|
||||||
|
this.procedureId,
|
||||||
|
this.procedureName,
|
||||||
|
this.remarks,
|
||||||
|
this.status,
|
||||||
|
this.template});
|
||||||
|
|
||||||
|
OrderProcedure.fromJson(Map<String, dynamic> json) {
|
||||||
|
achiCode = json['achiCode'];
|
||||||
|
appointmentDate = json['appointmentDate'];
|
||||||
|
appointmentNo = json['appointmentNo'];
|
||||||
|
categoryID = json['categoryID'];
|
||||||
|
clinicDescription = json['clinicDescription'];
|
||||||
|
cptCode = json['cptCode'];
|
||||||
|
createdBy = json['createdBy'];
|
||||||
|
createdOn = json['createdOn'];
|
||||||
|
doctorName = json['doctorName'];
|
||||||
|
isApprovalCreated = json['isApprovalCreated'];
|
||||||
|
isApprovalRequired = json['isApprovalRequired'];
|
||||||
|
isCovered = json['isCovered'];
|
||||||
|
isInvoiced = json['isInvoiced'];
|
||||||
|
isReferralInvoiced = json['isReferralInvoiced'];
|
||||||
|
isUncoveredByDoctor = json['isUncoveredByDoctor'];
|
||||||
|
lineItemNo = json['lineItemNo'];
|
||||||
|
orderDate = json['orderDate'];
|
||||||
|
orderNo = json['orderNo'];
|
||||||
|
orderType = json['orderType'];
|
||||||
|
procedureId = json['procedureId'];
|
||||||
|
procedureName = json['procedureName'];
|
||||||
|
remarks = json['remarks'];
|
||||||
|
status = json['status'];
|
||||||
|
template = json['template'];
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() {
|
||||||
|
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||||
|
data['achiCode'] = this.achiCode;
|
||||||
|
data['appointmentDate'] = this.appointmentDate;
|
||||||
|
data['appointmentNo'] = this.appointmentNo;
|
||||||
|
data['categoryID'] = this.categoryID;
|
||||||
|
data['clinicDescription'] = this.clinicDescription;
|
||||||
|
data['cptCode'] = this.cptCode;
|
||||||
|
data['createdBy'] = this.createdBy;
|
||||||
|
data['createdOn'] = this.createdOn;
|
||||||
|
data['doctorName'] = this.doctorName;
|
||||||
|
data['isApprovalCreated'] = this.isApprovalCreated;
|
||||||
|
data['isApprovalRequired'] = this.isApprovalRequired;
|
||||||
|
data['isCovered'] = this.isCovered;
|
||||||
|
data['isInvoiced'] = this.isInvoiced;
|
||||||
|
data['isReferralInvoiced'] = this.isReferralInvoiced;
|
||||||
|
data['isUncoveredByDoctor'] = this.isUncoveredByDoctor;
|
||||||
|
data['lineItemNo'] = this.lineItemNo;
|
||||||
|
data['orderDate'] = this.orderDate;
|
||||||
|
data['orderNo'] = this.orderNo;
|
||||||
|
data['orderType'] = this.orderType;
|
||||||
|
data['procedureId'] = this.procedureId;
|
||||||
|
data['procedureName'] = this.procedureName;
|
||||||
|
data['remarks'] = this.remarks;
|
||||||
|
data['status'] = this.status;
|
||||||
|
data['template'] = this.template;
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,92 +1,109 @@
|
|||||||
|
import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.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/SOAP/GeneralGetReqForSOAP.dart';
|
||||||
import 'package:doctor_app_flutter/models/patient/patiant_info_model.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/util/translations_delegate_base.dart';
|
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
|
||||||
import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_widget.dart';
|
import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_widget.dart';
|
||||||
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
|
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
|
||||||
|
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
class PatientPageHeaderWidget extends StatelessWidget {
|
class PatientPageHeaderWidget extends StatelessWidget {
|
||||||
|
|
||||||
final PatiantInformtion patient;
|
final PatiantInformtion patient;
|
||||||
|
|
||||||
PatientPageHeaderWidget(this.patient);
|
PatientPageHeaderWidget(this.patient);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Container(
|
return BaseView<SOAPViewModel>(
|
||||||
child: Column(
|
onModelReady: (model) async {
|
||||||
mainAxisAlignment: MainAxisAlignment.start,
|
GeneralGetReqForSOAP generalGetReqForSOAP = GeneralGetReqForSOAP(
|
||||||
children: [
|
patientMRN: patient.patientMRN,
|
||||||
Padding(
|
episodeId: patient.episodeNo,
|
||||||
padding: const EdgeInsets.all(8.0),
|
appointmentNo: patient.appointmentNo,
|
||||||
child: Row(
|
doctorID: '',
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
editedBy: '');
|
||||||
mainAxisSize: MainAxisSize.min,
|
await model.getPatientAllergy(generalGetReqForSOAP);
|
||||||
children: <Widget>[
|
|
||||||
AvatarWidget(
|
},
|
||||||
Icon(
|
builder: (_, model, w) => Container(
|
||||||
patient.genderDescription == "Male"
|
child: Column(
|
||||||
? DoctorApp.male
|
mainAxisAlignment: MainAxisAlignment.start,
|
||||||
: DoctorApp.female_icon,
|
children: [
|
||||||
size: 70,
|
Padding(
|
||||||
color: Colors.white,
|
padding: const EdgeInsets.all(8.0),
|
||||||
),
|
child: Row(
|
||||||
),
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
SizedBox(
|
mainAxisSize: MainAxisSize.min,
|
||||||
width: 20,
|
children: <Widget>[
|
||||||
),
|
AvatarWidget(
|
||||||
Expanded(
|
Icon(
|
||||||
child: Column(
|
patient.genderDescription == "Male"
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
? DoctorApp.male
|
||||||
mainAxisAlignment: MainAxisAlignment.start,
|
: DoctorApp.female_icon,
|
||||||
children: [
|
size: 70,
|
||||||
SizedBox(
|
color: Colors.white,
|
||||||
height: 5,
|
|
||||||
),
|
|
||||||
AppText(
|
|
||||||
patient.firstName + ' ' + patient.lastName,
|
|
||||||
color: Colors.black,
|
|
||||||
fontWeight: FontWeight.bold,
|
|
||||||
),
|
|
||||||
Row(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
AppText(
|
|
||||||
TranslationBase.of(context).age,
|
|
||||||
color: Colors.black,
|
|
||||||
fontWeight: FontWeight.bold,
|
|
||||||
),
|
|
||||||
SizedBox(
|
|
||||||
width: 20,
|
|
||||||
),
|
),
|
||||||
AppText(
|
),
|
||||||
patient.age.toString(),
|
SizedBox(
|
||||||
color: Colors.black,
|
width: 20,
|
||||||
fontWeight: FontWeight.normal,
|
),
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
mainAxisAlignment: MainAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
SizedBox(
|
||||||
|
height: 5,
|
||||||
|
),
|
||||||
|
AppText(
|
||||||
|
patient.firstName + ' ' + patient.lastName,
|
||||||
|
color: Colors.black,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
),
|
||||||
|
Row(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
AppText(
|
||||||
|
TranslationBase.of(context).age,
|
||||||
|
color: Colors.black,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
width: 20,
|
||||||
|
),
|
||||||
|
AppText(
|
||||||
|
patient.age.toString(),
|
||||||
|
color: Colors.black,
|
||||||
|
fontWeight: FontWeight.normal,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
NetworkBaseView(
|
||||||
|
baseViewModel: model,
|
||||||
|
child: model.patientAllergiesList.isNotEmpty ?AppText(
|
||||||
|
"ALLERGIC TO: "+model.getAllergicNames(),
|
||||||
|
color: Color(0xFFB9382C),
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
) : AppText(''),
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
],
|
)
|
||||||
),
|
],
|
||||||
AppText(
|
),
|
||||||
"ALLERGIC TO: FOOD, ASPIRIN, EGG WHITE",
|
),
|
||||||
color: Color(0xFFB9382C),
|
Container(
|
||||||
fontWeight: FontWeight.bold,
|
width: double.infinity,
|
||||||
),
|
height: 1,
|
||||||
],
|
color: Color(0xffCCCCCC),
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
width: 20,
|
||||||
),
|
),
|
||||||
)
|
],
|
||||||
],
|
),
|
||||||
),
|
));
|
||||||
),
|
|
||||||
Container(
|
|
||||||
width: double.infinity,
|
|
||||||
height: 1,
|
|
||||||
color: Color(0xffCCCCCC),
|
|
||||||
),
|
|
||||||
SizedBox(
|
|
||||||
width: 20,
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,33 @@
|
|||||||
|
|
||||||
|
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
|
||||||
|
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
// ignore: must_be_immutable
|
||||||
|
class CustomValidationError extends StatelessWidget {
|
||||||
|
String error;
|
||||||
|
CustomValidationError({
|
||||||
|
Key key, this.error,
|
||||||
|
}) : super(key: key);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
if(error == null )
|
||||||
|
error = TranslationBase
|
||||||
|
.of(context)
|
||||||
|
.emptyMessage;
|
||||||
|
return Column(
|
||||||
|
children: [
|
||||||
|
SizedBox(
|
||||||
|
height: 2,
|
||||||
|
),
|
||||||
|
Container(
|
||||||
|
margin: EdgeInsets.symmetric(horizontal: 3),
|
||||||
|
child: AppText(error, color: Theme
|
||||||
|
.of(context)
|
||||||
|
.errorColor, fontSize: 14,),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue