fix some issue on progress_note_screen

merge-requests/542/head
Elham Rababah 5 years ago
parent acc3ecdbbe
commit 8d7fef3db9

@ -65,6 +65,8 @@ class PatientViewModel extends BaseViewModel {
if (_patientService.hasError) { if (_patientService.hasError) {
error = _patientService.error; error = _patientService.error;
setState(ViewState.Error); setState(ViewState.Error);
} else{
setState(ViewState.Idle);
} }
return localRes; return localRes;
} }

@ -91,7 +91,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
isUpdate: false, isUpdate: false,
)), )),
); );
},label: 'Add a New Order',), },label: widget.visitType ==3?'Add a New Order Sheet':'Create a New Progress Note',),
Expanded( Expanded(
child: Container( child: Container(
@ -123,20 +123,23 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
Container( Container(
width: MediaQuery.of(context).size.width * 0.65, width: MediaQuery.of(context).size.width * 0.65,
child: Row( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Row(
crossAxisAlignment: CrossAxisAlignment.start,
child: AppText('Created By: ', children: [
fontSize: 12, AppText('Created By: ',
), fontSize: 10,
margin: EdgeInsets.only(top: 3), ),
), Expanded(
Expanded( child: AppText(
child: AppText( notesList[index].doctorName??'',fontWeight: FontWeight.w600,fontSize: 12,),
notesList[index].doctorName??'',fontWeight: FontWeight.w600), ),
],
), ),
AppText(
notesList[index].status == 4?'Canceled':'',fontWeight: FontWeight.w600, color: Colors.red.shade700,fontSize: 12,),
], ],
), ),
), ),
@ -186,47 +189,6 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
fontSize: 10, fontSize: 10,
), ),
), ),
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => UpdateNoteOrder(
note: notesList[index],
patientModel: model,
patient: patient,
visitType: widget.visitType,
isUpdate: true,
)),
);
},
child: Icon(
DoctorApp.edit,
size: 18,
)),
SizedBox(width: 10,),
InkWell(
onTap: () async {
GifLoaderDialogUtils.showMyDialog(context);
UpdateNoteReqModel reqModel = UpdateNoteReqModel(
admissionNo: int.parse(patient.admissionNo),
cancelledNote: true,
lineItemNo: 30,
createdBy: notesList[index].createdBy,
notes: notesList[index].notes,
verifiedNote: false,
patientTypeID: patient.patientType,
patientOutSA: false,
);
await model.updatePatientProgressNote(reqModel);
GifLoaderDialogUtils.hideDialog(context);
},
child: Icon(
FontAwesomeIcons.trash,
size: 18,
))
], ],
), ),
], ],

@ -36,10 +36,10 @@ class UpdateNoteOrder extends StatefulWidget {
class _UpdateNoteOrderState extends State<UpdateNoteOrder> { class _UpdateNoteOrderState extends State<UpdateNoteOrder> {
int selectedType; int selectedType;
bool isSubmitted = false;
TextEditingController progressNoteController = TextEditingController(); TextEditingController progressNoteController = TextEditingController();
setSelectedType(int val) { setSelectedType(int val) {
setState(() { setState(() {
selectedType = val; selectedType = val;
@ -51,73 +51,85 @@ class _UpdateNoteOrderState extends State<UpdateNoteOrder> {
if (widget.note != null) { if (widget.note != null) {
progressNoteController.text = widget.note.notes; progressNoteController.text = widget.note.notes;
} }
return BaseView<PatientViewModel>(
builder: (BuildContext context, PatientViewModel model, Widget child) =>
AppScaffold(
isShowAppBar: false,
backgroundColor: Theme
.of(context)
.scaffoldBackgroundColor,
body: SingleChildScrollView(
child: Container(
height: MediaQuery
.of(context)
.size
.height * 1.0,
child: Padding(
padding: EdgeInsets.all(0.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
BottomSheetTitle(title: 'Add Progress Note',),
SizedBox(
height: 10.0,
),
Center(
child: FractionallySizedBox(
widthFactor: 0.9,
child: Column(
children: [
AppTextFieldCustom(
hintText: TranslationBase.of(context).addProgressNote,
controller: progressNoteController,
maxLines: 25,
minLines: 7,
hasBorder: true,
// validationError:complaintsController.text.isEmpty ,
),
],
),
),
),
], return AppScaffold(
isShowAppBar: false,
backgroundColor: Theme
.of(context)
.scaffoldBackgroundColor,
body: SingleChildScrollView(
child: Container(
height: MediaQuery
.of(context)
.size
.height * 1.0,
child: Padding(
padding: EdgeInsets.all(0.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
BottomSheetTitle(title: widget.visitType == 3
? 'Add Order Sheet'
: 'Add Progress Note',),
SizedBox(
height: 10.0,
),
Center(
child: FractionallySizedBox(
widthFactor: 0.9,
child: Column(
children: [
AppTextFieldCustom(
hintText: widget.visitType == 3
? 'Add Order Sheet'
: 'Add Progress Note',
//TranslationBase.of(context).addProgressNote,
controller: progressNoteController,
maxLines: 25,
minLines: 10,
hasBorder: true,
validationError:progressNoteController.text.isEmpty&&isSubmitted?TranslationBase.of(context).emptyMessage:null ,
),
],
),
), ),
), ),
),
],
), ),
bottomSheet: Container( ),
margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5), ),
child: Wrap( ),
alignment: WrapAlignment.center, bottomSheet: Container(
children: <Widget>[ margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5),
AppButton( child: Wrap(
title: 'Add Progress Note', alignment: WrapAlignment.center,
children: <Widget>[
AppButton(
title: widget.visitType == 3
? 'Add Order Sheet'
: 'Add Progress Note',
color: Color(0xff359846), color: Color(0xff359846),
// disabled: progressNoteController.text.isEmpty, // disabled: progressNoteController.text.isEmpty,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
onPressed: () async { onPressed: () async {
GifLoaderDialogUtils.showMyDialog(context); setState(() {
Map profile = await sharedPref.getObj(DOCTOR_PROFILE); isSubmitted = true;
});
if (progressNoteController.text.isNotEmpty) {
GifLoaderDialogUtils.showMyDialog(context);
Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); DoctorProfileModel doctorProfile = DoctorProfileModel
.fromJson(profile);
if (widget.isUpdate) { if (widget.isUpdate) {
UpdateNoteReqModel reqModel = UpdateNoteReqModel( UpdateNoteReqModel reqModel = UpdateNoteReqModel(
admissionNo: int.parse(widget.patient.admissionNo), admissionNo: int.parse(widget.patient
.admissionNo),
cancelledNote: false, cancelledNote: false,
lineItemNo: 30, lineItemNo: 30,
createdBy: widget.note.createdBy, createdBy: widget.note.createdBy,
@ -128,47 +140,186 @@ class _UpdateNoteOrderState extends State<UpdateNoteOrder> {
patientTypeID: widget.patient.patientType, patientTypeID: widget.patient.patientType,
patientOutSA: false, patientOutSA: false,
); );
await model.updatePatientProgressNote(reqModel); await widget.patientModel.updatePatientProgressNote(reqModel);
} else { } else {
CreateNoteModel reqModel = CreateNoteModel( CreateNoteModel reqModel = CreateNoteModel(
admissionNo: int.parse(widget.patient.admissionNo), admissionNo: int.parse(widget.patient
createdBy: doctorProfile.doctorID, .admissionNo),
visitType: widget.visitType, createdBy: doctorProfile.doctorID,
patientID: widget.patient.patientId, visitType: widget.visitType,
nursingRemarks: ' ', patientID: widget.patient.patientId,
patientTypeID: widget.patient.patientType, nursingRemarks: ' ',
patientOutSA: false, patientTypeID: widget.patient.patientType,
patientOutSA: false,
notes: progressNoteController.text
);
await model.createPatientProgressNote(reqModel);
}
if (model.state == ViewState.ErrorLocal) { notes: progressNoteController.text
Helpers.showErrorToast("Error"); );
} else {
ProgressNoteRequest progressNoteRequest = await widget.patientModel.createPatientProgressNote(reqModel);
ProgressNoteRequest( }
visitType: widget.visitType,
// if equal 5 then this will return progress note if (widget.patientModel.state == ViewState.ErrorLocal) {
admissionNo: int.parse(widget.patient.admissionNo), Helpers.showErrorToast(
projectID: widget.patient.projectId, Helpers.generateContactAdminMsg());
patientTypeID: widget.patient.patientType, } else {
languageID: 2); ProgressNoteRequest progressNoteRequest =
await widget.patientModel.getPatientProgressNote( ProgressNoteRequest(
progressNoteRequest.toJson()); visitType: widget.visitType,
} // if equal 5 then this will return progress note
admissionNo: int.parse(widget.patient
GifLoaderDialogUtils.hideDialog(context); .admissionNo),
Navigator.of(context).pop(); projectID: widget.patient.projectId,
}, patientTypeID: widget.patient.patientType,
), languageID: 2);
], await widget.patientModel.getPatientProgressNote(
), progressNoteRequest.toJson());
}
GifLoaderDialogUtils.hideDialog(context);
Navigator.of(context).pop();
}
}
), ),
), ],
),
),
); );
// return BaseView<PatientViewModel>(
// builder: (BuildContext context, PatientViewModel model, Widget child) =>
// AppScaffold(
// isShowAppBar: false,
// backgroundColor: Theme
// .of(context)
// .scaffoldBackgroundColor,
// body: SingleChildScrollView(
// child: Container(
// height: MediaQuery
// .of(context)
// .size
// .height * 1.0,
// child: Padding(
// padding: EdgeInsets.all(0.0),
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// BottomSheetTitle(title: widget.visitType == 3
// ? 'Add Order Sheet'
// : 'Add Progress Note',),
// SizedBox(
// height: 10.0,
// ),
//
// Center(
// child: FractionallySizedBox(
// widthFactor: 0.9,
// child: Column(
// children: [
// AppTextFieldCustom(
// hintText: widget.visitType == 3
// ? 'Add Order Sheet'
// : 'Add Progress Note',
// //TranslationBase.of(context).addProgressNote,
// controller: progressNoteController,
// maxLines: 25,
// minLines: 10,
// hasBorder: true,
// validationError:progressNoteController.text.isEmpty&&isSubmitted?TranslationBase.of(context).emptyMessage:null ,
//
// ),
// ],
// ),
// ),
// ),
//
// ],
// ),
// ),
// ),
// ),
// bottomSheet: Container(
// margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5),
// child: Wrap(
// alignment: WrapAlignment.center,
// children: <Widget>[
// AppButton(
// title: widget.visitType == 3
// ? 'Add Order Sheet'
// : 'Add Progress Note',
// color: Color(0xff359846),
// // disabled: progressNoteController.text.isEmpty,
// fontWeight: FontWeight.w700,
// onPressed: () async {
// setState(() {
// isSubmitted = true;
// });
// if (progressNoteController.text.isNotEmpty) {
// GifLoaderDialogUtils.showMyDialog(context);
// Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
//
// DoctorProfileModel doctorProfile = DoctorProfileModel
// .fromJson(profile);
//
//
// if (widget.isUpdate) {
// UpdateNoteReqModel reqModel = UpdateNoteReqModel(
// admissionNo: int.parse(widget.patient
// .admissionNo),
// cancelledNote: false,
// lineItemNo: 30,
// createdBy: widget.note.createdBy,
// notes: progressNoteController.text
//
// ,
// verifiedNote: false,
//
// patientTypeID: widget.patient.patientType,
// patientOutSA: false,
// );
// await model.updatePatientProgressNote(reqModel);
// } else {
// CreateNoteModel reqModel = CreateNoteModel(
// admissionNo: int.parse(widget.patient
// .admissionNo),
// createdBy: doctorProfile.doctorID,
// visitType: widget.visitType,
// patientID: widget.patient.patientId,
// nursingRemarks: ' ',
// patientTypeID: widget.patient.patientType,
// patientOutSA: false,
//
// notes: progressNoteController.text
// );
//
// await model.createPatientProgressNote(reqModel);
// }
//
// if (model.state == ViewState.ErrorLocal) {
// Helpers.showErrorToast(
// Helpers.generateContactAdminMsg());
// } else {
// ProgressNoteRequest progressNoteRequest =
// ProgressNoteRequest(
// visitType: widget.visitType,
// // if equal 5 then this will return progress note
// admissionNo: int.parse(widget.patient
// .admissionNo),
// projectID: widget.patient.projectId,
// patientTypeID: widget.patient.patientType,
// languageID: 2);
// await widget.patientModel.getPatientProgressNote(
// progressNoteRequest.toJson());
// }
//
// GifLoaderDialogUtils.hideDialog(context);
// Navigator.of(context).pop();
// }
// }
// ),
// ],
// ),
// ),
// ),
// );
} }
} }

@ -1,10 +1,13 @@
import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart';
import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/SOAP/GeneralGetReqForSOAP.dart';
import 'package:doctor_app_flutter/models/SOAP/PostEpisodeReqModel.dart'; import 'package:doctor_app_flutter/models/SOAP/PostEpisodeReqModel.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/models/patient/patient_model.dart';
import 'package:doctor_app_flutter/models/patient/topten_users_res_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/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/helpers.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-header-new-design.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design_in_patient.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design_in_patient.dart';
@ -13,7 +16,6 @@ import 'package:doctor_app_flutter/widgets/patients/profile/profile_medical_info
import 'package:doctor_app_flutter/widgets/patients/profile/profile_medical_info_widget_search.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/profile_medical_info_widget_search.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -39,22 +41,62 @@ class PatientProfileScreen extends StatelessWidget {
isFromSearch = routeArgs['isSearch']; isFromSearch = routeArgs['isSearch'];
} }
return BaseView<SOAPViewModel>( return BaseView<PatientViewModel>(
onModelReady: (model) async { onModelReady: (patientViewModel) async {
GeneralGetReqForSOAP generalGetReqForSOAP = GeneralGetReqForSOAP( PatientModel patientReq = PatientModel(
patientMRN: patient.patientMRN ?? patient.patientId, ProjectID: 0,
doctorID: '', ClinicID: 0,
editedBy: ''); DoctorID: 0,
await model.getPatientAllergy(generalGetReqForSOAP); FirstName: "0",
if (model.allergiesList.length == 0) { MiddleName: "0",
await model.getMasterLookup(MasterKeysService.Allergies); LastName: "0",
} PatientMobileNumber: "0",
if (model.allergySeverityList.length == 0) { PatientIdentificationID: "0",
await model.getMasterLookup(MasterKeysService.AllergySeverity); PatientID: patient.patientId,
} From: "0",
To: "0",
LanguageID: 2,
stamp: "2020-03-02T13:56:39.170Z",
IPAdress: "11.11.11.11",
VersionID: 1.2,
Channel: 9,
TokenID: "@dm!n",
SessionID: "5G0yXn0Jnq",
IsLoginForDoctorApp: true,
PatientOutSA: false);
if(patient.patientType ==1) {
patientViewModel.getPatientList(patientReq, "1", isBusyLocal: false).then((response) {
if (response['MessageStatus'] == 1) {
if (response['List_MyInPatient'] != null) {
List<PatiantInformtion> patientList =
ModelResponse.fromJson(response['List_MyInPatient'])
.list;
patient.admissionNo = patientList[0].admissionNo;
patient.admissionDate = patientList[0].admissionDate;
} else {
DrAppToastMsg.showErrorToast('No patient');
}
}
}).catchError((error) {
// setState(() {
// isLoading = false;
// });
Helpers.showErrorToast(error.message);
//DrAppToastMsg.showErrorToast(error);
});
}
}, },
builder: (_, model, w) => AppScaffold( builder: (_, patientViewModel, w) => AppScaffold(
baseViewModel: model, baseViewModel: patientViewModel,
appBarTitle: TranslationBase.of(context).patientProfile, appBarTitle: TranslationBase.of(context).patientProfile,
isShowAppBar: false, isShowAppBar: false,
body: Container( body: Container(
@ -67,9 +109,9 @@ class PatientProfileScreen extends StatelessWidget {
children: [ children: [
!isFromSearch && patientType == "1" !isFromSearch && patientType == "1"
? PatientProfileHeaderNewDesignInPatient( ? PatientProfileHeaderNewDesignInPatient(
patient, patientType, arrivalType) patient, patientType, arrivalType)
: PatientProfileHeaderNewDesign( : PatientProfileHeaderNewDesign(
patient, patientType, arrivalType), patient, patientType, arrivalType),
Expanded( Expanded(
child: Padding( child: Padding(
padding: const EdgeInsets.all(16.0), padding: const EdgeInsets.all(16.0),
@ -78,8 +120,8 @@ class PatientProfileScreen extends StatelessWidget {
children: [ children: [
isFromSearch isFromSearch
? ProfileMedicalInfoWidgetSearch( ? ProfileMedicalInfoWidgetSearch(
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
from: from, from: from,
to: to, to: to,
@ -109,7 +151,10 @@ class PatientProfileScreen extends StatelessWidget {
), ),
if (int.parse(patientType) == 7 || if (int.parse(patientType) == 7 ||
int.parse(patientType) == 6) int.parse(patientType) == 6)
Positioned( BaseView<SOAPViewModel>(
onModelReady: (model) async {
},
builder: (_, model, w) => Positioned(
top: 175, top: 175,
left: 20, left: 20,
right: 20, right: 20,
@ -179,7 +224,7 @@ class PatientProfileScreen extends StatelessWidget {
}), }),
], ],
), ),
), )),
], ],
), ),
), ),
@ -210,499 +255,3 @@ class AvatarWidget extends StatelessWidget {
} }
} }
/* Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
decoration: BoxDecoration(boxShadow: <BoxShadow>[
BoxShadow(
color: Colors.grey.shade300,
blurRadius: 10.0,
spreadRadius: 0,
offset: Offset(0, 10)),
], color: Colors.white),
child: Column(children: <Widget>[
Padding(
padding: const EdgeInsets.all(8.0),
child: Row(
children: <Widget>[
AvatarWidget(
Icon(
patient.genderDescription == "Male"
? DoctorApp.male
: DoctorApp.female_icon,
size: 70,
color: Colors.white,
),
),
SizedBox(
width: 20,
),
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
AppText(
patient.firstName +
' ' +
patient.lastName,
color: Colors.black,
fontWeight: FontWeight.bold,
),
Row(
children: [
AppText(
TranslationBase.of(context)
.fileNo,
color: Colors.black,
fontWeight: FontWeight.bold,
),
SizedBox(
width: 4,
),
AppText(
patient.patientId.toString(),
color: Colors.black,
fontWeight: FontWeight.normal,
),
],
),
model.patientAllergiesList
.isNotEmpty &&
model.getAllergicNames(
projectViewModel
.isArabic) !=
''
? Container(
width: MediaQuery.of(context)
.size
.width *
0.65,
child: Padding(
padding: const EdgeInsets
.symmetric(vertical: 8),
child: AppText(
TranslationBase.of(
context)
.allergicTO +
" : " +
model.getAllergicNames(
projectViewModel
.isArabic),
color: Color(0xFFB9382C),
fontWeight:
FontWeight.bold,
),
),
)
: AppText(''),
],
)
],
),
),
Container(
width: double.infinity,
height: 1,
color: Color(0xffCCCCCC),
),
Container(
height: 11 * SizeConfig.textMultiplier,
child: Row(
children: [
Expanded(
child: Padding(
padding: const EdgeInsets.fromLTRB(
16.0, 8.0, 8.0, 8.0),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).age,
fontWeight: FontWeight.bold,
fontSize: 2 *
SizeConfig.textMultiplier,
),
SizedBox(
height: 4,
),
AppText(
"${DateUtils.convertDateFromServerFormat(patient.dateofBirth, 'dd-MM-yyyy')} / ${DateUtils.getAgeByBirthday(patient.dateofBirth, context)}",
fontWeight: FontWeight.normal,
fontSize: 1.6 *
SizeConfig.textMultiplier,
),
],
),
),
),
Container(
width: 1,
color: Color(0xffCCCCCC),
),
Expanded(
child: Padding(
padding: const EdgeInsets.fromLTRB(
16.0, 8.0, 8.0, 8.0),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context)
.nationality,
fontWeight: FontWeight.bold,
fontSize: 2 *
SizeConfig.textMultiplier,
),
SizedBox(
height: 4,
),
AppText(
patient.nationalityName ??
patient.nationality,
fontWeight: FontWeight.normal,
fontSize: 1.7 *
SizeConfig.textMultiplier,
),
],
),
),
),
Container(
width: 1,
color: Color(0xffCCCCCC),
),
Expanded(
child: Padding(
padding: const EdgeInsets.fromLTRB(
16.0, 8.0, 8.0, 8.0),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context)
.gender,
fontWeight: FontWeight.bold,
fontSize: 2 *
SizeConfig.textMultiplier,
),
SizedBox(
height: 4,
),
AppText(
patient.gender.toString() == '1'
? 'Male'
: 'Female',
fontWeight: FontWeight.normal,
fontSize: 1.8 *
SizeConfig.textMultiplier,
),
],
),
),
),
],
),
),
Container(
width: double.infinity,
height: 1,
color: Color(0xffCCCCCC),
),
]),
),
if (patient.admissionNo != null)
Container(
margin: EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context)
.admissionDetail,
color: Colors.black,
fontWeight: FontWeight.bold,
fontSize: 1.8 * SizeConfig.textMultiplier,
),
SizedBox(
height: 4,
),
Container(
decoration: BoxDecoration(
color: Colors.white,
shape: BoxShape.rectangle,
borderRadius: BorderRadius.circular(8),
border:
Border.fromBorderSide(BorderSide(
color: Color(0xffBBBBBB),
width: 1,
)),
),
child: Column(
children: [
Padding(
padding: EdgeInsets.all(16),
child: Column(
children: [
Row(
children: [
Container(
width: 14 *
SizeConfig
.textMultiplier,
child: AppText(
TranslationBase.of(
context)
.dateTime,
color: Colors.black,
fontWeight:
FontWeight.bold,
fontSize: 1.6 *
SizeConfig
.textMultiplier,
),
),
Expanded(
child: AppText(
patient.createdOn !=
null
? "${DateUtils.convertDateFromServerFormat(patient.createdOn, 'EEEE dd, MMMM yyyy hh:mm a')}"
: "",
color: Colors.black,
fontWeight:
FontWeight.normal,
fontSize: 1.6 *
SizeConfig
.textMultiplier,
),
),
],
),
SizedBox(
height: 4,
),
Row(
children: [
Container(
width: 14 *
SizeConfig
.textMultiplier,
child: AppText(
TranslationBase.of(
context)
.admissionNo,
color: Colors.black,
fontWeight:
FontWeight.bold,
fontSize: 1.6 *
SizeConfig
.textMultiplier,
),
),
AppText(
patient.admissionNo !=
null
? patient.admissionNo
: '',
color: Colors.black,
fontWeight:
FontWeight.normal,
fontSize: 1.6 *
SizeConfig
.textMultiplier,
),
],
),
SizedBox(
height: 4,
),
Row(
children: [
Container(
width: 14 *
SizeConfig
.textMultiplier,
child: AppText(
TranslationBase.of(
context)
.losNo,
color: Colors.black,
fontWeight:
FontWeight.bold,
fontSize: 1.6 *
SizeConfig
.textMultiplier,
),
),
AppText(
patient.createdOn != null
? DateUtils
.differenceBetweenServerDateAndCurrent(
patient
.createdOn,
context)
: "",
color: Colors.black,
fontWeight:
FontWeight.normal,
fontSize: 1.6 *
SizeConfig
.textMultiplier,
),
],
),
],
),
),
const Divider(
color: Color(0xffCCCCCC),
height: 5,
thickness: 1,
indent: 0,
endIndent: 0,
),
Container(
height:
10 * SizeConfig.textMultiplier,
child: Row(
children: [
Expanded(
child: Padding(
padding: const EdgeInsets
.fromLTRB(
16.0, 8.0, 8.0, 8.0),
child: Column(
crossAxisAlignment:
CrossAxisAlignment
.start,
children: [
AppText(
TranslationBase.of(
context)
.area,
fontWeight:
FontWeight.bold,
fontSize: 1.6 *
SizeConfig
.textMultiplier,
),
SizedBox(
height: 4,
),
AppText(
patient
.clinicDescription,
fontWeight:
FontWeight.normal,
fontSize: 1.6 *
SizeConfig
.textMultiplier,
),
],
),
),
),
Container(
width: 1,
color: Color(0xffCCCCCC),
),
Expanded(
child: Padding(
padding: const EdgeInsets
.fromLTRB(
16.0, 8.0, 8.0, 8.0),
child: Column(
crossAxisAlignment:
CrossAxisAlignment
.start,
mainAxisAlignment:
MainAxisAlignment
.spaceEvenly,
children: [
Expanded(
child: Row(
crossAxisAlignment:
CrossAxisAlignment
.start,
children: [
AppText(
TranslationBase.of(
context)
.room,
fontWeight:
FontWeight
.bold,
fontSize: 1.6 *
SizeConfig
.textMultiplier,
),
SizedBox(
width: 4,
),
Expanded(
child: AppText(
"${patient.nursingStationName}\n${patient.roomId}",
fontWeight:
FontWeight
.normal,
fontSize: 1.4 *
SizeConfig
.textMultiplier,
),
),
],
),
),
SizedBox(
height: 4,
),
Expanded(
child: Row(
crossAxisAlignment:
CrossAxisAlignment
.start,
children: [
AppText(
TranslationBase.of(
context)
.bed,
fontWeight:
FontWeight
.bold,
fontSize: 1.6 *
SizeConfig
.textMultiplier,
),
SizedBox(
width: 4,
),
AppText(
"${patient.bedId}",
fontWeight:
FontWeight
.normal,
fontSize: 1.6 *
SizeConfig
.textMultiplier,
),
],
),
),
],
),
),
),
],
),
)
],
),
)
],
),
),
],
),*/

@ -252,12 +252,12 @@ class PatientCard extends StatelessWidget {
), ),
children: <TextSpan>[ children: <TextSpan>[
new TextSpan( new TextSpan(
text: TranslationBase.of(context) text: patientInfo.admissionDate ==null?"":TranslationBase.of(context)
.admissionDate + .admissionDate +
" : ", " : ",
style: TextStyle(fontSize: 14)), style: TextStyle(fontSize: 14)),
new TextSpan( new TextSpan(
text: text:patientInfo.admissionDate ==null?"":
"${DateUtils.convertDateFromServerFormat(patientInfo.admissionDate.toString(), 'yyyy-MM-dd')}", "${DateUtils.convertDateFromServerFormat(patientInfo.admissionDate.toString(), 'yyyy-MM-dd')}",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,

@ -182,8 +182,8 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: ORDER_NOTE, route: ORDER_NOTE,
nameLine1: 'Order',//TranslationBase.of(context).progress, nameLine1:"Order", //"Text",
nameLine2: TranslationBase.of(context).note, nameLine2: "Sheet",
icon: 'patient/Progress_notes.png'), icon: 'patient/Progress_notes.png'),
], ],
), ),

@ -96,8 +96,8 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget {
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: ORDER_NOTE, route: ORDER_NOTE,
nameLine1: "Text", nameLine1:"Order", //"Text",
nameLine2: TranslationBase.of(context).orders, nameLine2: "Sheet",//TranslationBase.of(context).orders,
icon: 'patient/Progress_notes.png'), icon: 'patient/Progress_notes.png'),
PatientProfileButton( PatientProfileButton(
key: key, key: key,

@ -145,8 +145,8 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: ORDER_NOTE, route: ORDER_NOTE,
nameLine1: 'Order',//TranslationBase.of(context).progress, nameLine1:"Order", //"Text",
nameLine2: TranslationBase.of(context).note, nameLine2: "Sheet",
icon: 'patient/Progress_notes.png'), icon: 'patient/Progress_notes.png'),
if (patientType == "1") if (patientType == "1")

Loading…
Cancel
Save