|
|
|
|
@ -2,6 +2,7 @@ import 'package:doctor_app_flutter/core/model/note/note_model.dart';
|
|
|
|
|
import 'package:doctor_app_flutter/core/model/note/update_note_model.dart';
|
|
|
|
|
import 'package:doctor_app_flutter/core/service/AnalyticsService.dart';
|
|
|
|
|
import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart';
|
|
|
|
|
import 'package:doctor_app_flutter/core/viewModel/operation_report_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/icons_app/doctor_app_icons.dart';
|
|
|
|
|
@ -9,6 +10,7 @@ import 'package:doctor_app_flutter/locator.dart';
|
|
|
|
|
import 'package:doctor_app_flutter/models/patient/progress_note_request.dart';
|
|
|
|
|
import 'package:doctor_app_flutter/screens/base/base_view.dart';
|
|
|
|
|
import 'package:doctor_app_flutter/screens/patients/profile/note/update_note.dart';
|
|
|
|
|
import 'package:doctor_app_flutter/screens/patients/profile/operation_report/update_operation_report.dart';
|
|
|
|
|
import 'package:doctor_app_flutter/util/date-utils.dart';
|
|
|
|
|
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
|
|
|
|
|
import 'package:doctor_app_flutter/widgets/patients/profile/add-order/addNewOrder.dart';
|
|
|
|
|
@ -78,8 +80,8 @@ class _ProgressNoteState extends State<OperationReportScreen> {
|
|
|
|
|
String arrivalType = routeArgs['arrivalType'];
|
|
|
|
|
if (routeArgs.containsKey('isDischargedPatient'))
|
|
|
|
|
isDischargedPatient = routeArgs['isDischargedPatient'];
|
|
|
|
|
return BaseView<PatientViewModel>(
|
|
|
|
|
onModelReady: (model) => getProgressNoteList(context, model),
|
|
|
|
|
return BaseView<OperationReportViewModel>(
|
|
|
|
|
onModelReady: (model) => model.getOperationReport(patient.patientMRN),
|
|
|
|
|
builder: (_, model, w) => AppScaffold(
|
|
|
|
|
baseViewModel: model,
|
|
|
|
|
backgroundColor: Theme.of(context).scaffoldBackgroundColor,
|
|
|
|
|
@ -88,8 +90,8 @@ class _ProgressNoteState extends State<OperationReportScreen> {
|
|
|
|
|
patient,
|
|
|
|
|
isInpatient: true,
|
|
|
|
|
),
|
|
|
|
|
body: model.patientProgressNoteList == null ||
|
|
|
|
|
model.patientProgressNoteList.length == 0
|
|
|
|
|
body: model.operationReportList == null ||
|
|
|
|
|
model.operationReportList.length == 0
|
|
|
|
|
? DrAppEmbeddedError(
|
|
|
|
|
error: TranslationBase.of(context).errorNoProgressNote)
|
|
|
|
|
: Container(
|
|
|
|
|
@ -100,13 +102,13 @@ class _ProgressNoteState extends State<OperationReportScreen> {
|
|
|
|
|
AddNewOrder(
|
|
|
|
|
onTap: () async {
|
|
|
|
|
await locator<AnalyticsService>().logEvent(
|
|
|
|
|
eventCategory: "Progress Note Screen",
|
|
|
|
|
eventAction: "Update Progress Note",
|
|
|
|
|
eventCategory: "Operation Report Screen",
|
|
|
|
|
eventAction: "Update Operation Report ",
|
|
|
|
|
);
|
|
|
|
|
Navigator.push(
|
|
|
|
|
context,
|
|
|
|
|
MaterialPageRoute(
|
|
|
|
|
builder: (context) => UpdateNoteOrder(
|
|
|
|
|
builder: (context) => UpdateOperatiomReport(
|
|
|
|
|
patientModel: model,
|
|
|
|
|
patient: patient,
|
|
|
|
|
visitType: widget.visitType,
|
|
|
|
|
@ -123,27 +125,25 @@ class _ProgressNoteState extends State<OperationReportScreen> {
|
|
|
|
|
Expanded(
|
|
|
|
|
child: Container(
|
|
|
|
|
child: ListView.builder(
|
|
|
|
|
itemCount: model.patientProgressNoteList.length,
|
|
|
|
|
itemCount: model.operationReportList.length,
|
|
|
|
|
itemBuilder: (BuildContext ctxt, int index) {
|
|
|
|
|
return FractionallySizedBox(
|
|
|
|
|
widthFactor: 0.95,
|
|
|
|
|
child: CardWithBgWidget(
|
|
|
|
|
hasBorder: false,
|
|
|
|
|
bgColor: model.patientProgressNoteList[index]
|
|
|
|
|
bgColor: model.operationReportList[index]
|
|
|
|
|
.status ==
|
|
|
|
|
1 &&
|
|
|
|
|
authenticationViewModel
|
|
|
|
|
.doctorProfile.doctorID !=
|
|
|
|
|
model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
index]
|
|
|
|
|
model.operationReportList[index]
|
|
|
|
|
.createdBy
|
|
|
|
|
? Color(0xFFCC9B14)
|
|
|
|
|
: model.patientProgressNoteList[index]
|
|
|
|
|
: model.operationReportList[index]
|
|
|
|
|
.status ==
|
|
|
|
|
4
|
|
|
|
|
? Colors.red.shade700
|
|
|
|
|
: model.patientProgressNoteList[index]
|
|
|
|
|
: model.operationReportList[index]
|
|
|
|
|
.status ==
|
|
|
|
|
2
|
|
|
|
|
? Colors.green[600]
|
|
|
|
|
@ -154,15 +154,13 @@ class _ProgressNoteState extends State<OperationReportScreen> {
|
|
|
|
|
crossAxisAlignment:
|
|
|
|
|
CrossAxisAlignment.start,
|
|
|
|
|
children: [
|
|
|
|
|
if (model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
index]
|
|
|
|
|
if (model.operationReportList[index]
|
|
|
|
|
.status ==
|
|
|
|
|
1 &&
|
|
|
|
|
authenticationViewModel
|
|
|
|
|
.doctorProfile.doctorID !=
|
|
|
|
|
model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
.operationReportList[
|
|
|
|
|
index]
|
|
|
|
|
.createdBy)
|
|
|
|
|
AppText(
|
|
|
|
|
@ -172,9 +170,7 @@ class _ProgressNoteState extends State<OperationReportScreen> {
|
|
|
|
|
color: Color(0xFFCC9B14),
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
),
|
|
|
|
|
if (model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
index]
|
|
|
|
|
if (model.operationReportList[index]
|
|
|
|
|
.status ==
|
|
|
|
|
4)
|
|
|
|
|
AppText(
|
|
|
|
|
@ -184,9 +180,7 @@ class _ProgressNoteState extends State<OperationReportScreen> {
|
|
|
|
|
color: Colors.red.shade700,
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
),
|
|
|
|
|
if (model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
index]
|
|
|
|
|
if (model.operationReportList[index]
|
|
|
|
|
.status ==
|
|
|
|
|
2)
|
|
|
|
|
AppText(
|
|
|
|
|
@ -196,16 +190,16 @@ class _ProgressNoteState extends State<OperationReportScreen> {
|
|
|
|
|
color: Colors.green[600],
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
),
|
|
|
|
|
if (model.patientProgressNoteList[index].status != 2 &&
|
|
|
|
|
model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
index]
|
|
|
|
|
if (model.operationReportList[index]
|
|
|
|
|
.status !=
|
|
|
|
|
2 &&
|
|
|
|
|
model.operationReportList[index]
|
|
|
|
|
.status !=
|
|
|
|
|
4 &&
|
|
|
|
|
authenticationViewModel
|
|
|
|
|
.doctorProfile.doctorID ==
|
|
|
|
|
model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
.operationReportList[
|
|
|
|
|
index]
|
|
|
|
|
.createdBy)
|
|
|
|
|
Row(
|
|
|
|
|
@ -213,25 +207,25 @@ class _ProgressNoteState extends State<OperationReportScreen> {
|
|
|
|
|
CrossAxisAlignment.start,
|
|
|
|
|
children: [
|
|
|
|
|
InkWell(
|
|
|
|
|
onTap: () {
|
|
|
|
|
Navigator.push(
|
|
|
|
|
context,
|
|
|
|
|
MaterialPageRoute(
|
|
|
|
|
builder: (context) =>
|
|
|
|
|
UpdateNoteOrder(
|
|
|
|
|
note: model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
index],
|
|
|
|
|
patientModel:
|
|
|
|
|
model,
|
|
|
|
|
patient:
|
|
|
|
|
patient,
|
|
|
|
|
visitType: widget
|
|
|
|
|
.visitType,
|
|
|
|
|
isUpdate: true,
|
|
|
|
|
)),
|
|
|
|
|
);
|
|
|
|
|
},
|
|
|
|
|
// onTap: () {
|
|
|
|
|
// Navigator.push(
|
|
|
|
|
// context,
|
|
|
|
|
// MaterialPageRoute(
|
|
|
|
|
// builder: (context) =>
|
|
|
|
|
// UpdateNoteOrder(
|
|
|
|
|
// note: model
|
|
|
|
|
// .operationReportList[
|
|
|
|
|
// index],
|
|
|
|
|
// patientModel:
|
|
|
|
|
// model,
|
|
|
|
|
// patient:
|
|
|
|
|
// patient,
|
|
|
|
|
// visitType: widget
|
|
|
|
|
// .visitType,
|
|
|
|
|
// isUpdate: true,
|
|
|
|
|
// )),
|
|
|
|
|
// );
|
|
|
|
|
// },
|
|
|
|
|
child: Container(
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
color: Colors.grey[600],
|
|
|
|
|
@ -266,168 +260,168 @@ class _ProgressNoteState extends State<OperationReportScreen> {
|
|
|
|
|
SizedBox(
|
|
|
|
|
width: 10,
|
|
|
|
|
),
|
|
|
|
|
InkWell(
|
|
|
|
|
onTap: () async {
|
|
|
|
|
showMyDialog(
|
|
|
|
|
context: context,
|
|
|
|
|
actionName: "verify",
|
|
|
|
|
confirmFun: () async {
|
|
|
|
|
GifLoaderDialogUtils
|
|
|
|
|
.showMyDialog(
|
|
|
|
|
context);
|
|
|
|
|
UpdateNoteReqModel
|
|
|
|
|
reqModel =
|
|
|
|
|
UpdateNoteReqModel(
|
|
|
|
|
admissionNo: int
|
|
|
|
|
.parse(patient
|
|
|
|
|
.admissionNo),
|
|
|
|
|
cancelledNote:
|
|
|
|
|
false,
|
|
|
|
|
lineItemNo: model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
index]
|
|
|
|
|
.lineItemNo,
|
|
|
|
|
createdBy: model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
index]
|
|
|
|
|
.createdBy,
|
|
|
|
|
notes: model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
index]
|
|
|
|
|
.notes,
|
|
|
|
|
verifiedNote: true,
|
|
|
|
|
patientTypeID:
|
|
|
|
|
patient
|
|
|
|
|
.patientType,
|
|
|
|
|
patientOutSA: false,
|
|
|
|
|
);
|
|
|
|
|
await model
|
|
|
|
|
.updatePatientProgressNote(
|
|
|
|
|
reqModel);
|
|
|
|
|
await getProgressNoteList(
|
|
|
|
|
context, model,
|
|
|
|
|
isLocalBusy:
|
|
|
|
|
true);
|
|
|
|
|
GifLoaderDialogUtils
|
|
|
|
|
.hideDialog(
|
|
|
|
|
context);
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
child: Container(
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
color: Colors.green[600],
|
|
|
|
|
borderRadius:
|
|
|
|
|
BorderRadius.circular(
|
|
|
|
|
10),
|
|
|
|
|
),
|
|
|
|
|
// color:Colors.red[600],
|
|
|
|
|
|
|
|
|
|
child: Row(
|
|
|
|
|
children: [
|
|
|
|
|
Icon(
|
|
|
|
|
FontAwesomeIcons
|
|
|
|
|
.check,
|
|
|
|
|
size: 12,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
width: 2,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(
|
|
|
|
|
context)
|
|
|
|
|
.noteVerify,
|
|
|
|
|
fontSize: 10,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
padding: EdgeInsets.all(6),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
// InkWell(
|
|
|
|
|
// onTap: () async {
|
|
|
|
|
// showMyDialog(
|
|
|
|
|
// context: context,
|
|
|
|
|
// actionName: "verify",
|
|
|
|
|
// confirmFun: () async {
|
|
|
|
|
// GifLoaderDialogUtils
|
|
|
|
|
// .showMyDialog(
|
|
|
|
|
// context);
|
|
|
|
|
// UpdateNoteReqModel
|
|
|
|
|
// reqModel =
|
|
|
|
|
// UpdateNoteReqModel(
|
|
|
|
|
// admissionNo: int
|
|
|
|
|
// .parse(patient
|
|
|
|
|
// .admissionNo),
|
|
|
|
|
// cancelledNote:
|
|
|
|
|
// false,
|
|
|
|
|
// lineItemNo: model
|
|
|
|
|
// .patientProgressNoteList[
|
|
|
|
|
// index]
|
|
|
|
|
// .lineItemNo,
|
|
|
|
|
// createdBy: model
|
|
|
|
|
// .patientProgressNoteList[
|
|
|
|
|
// index]
|
|
|
|
|
// .createdBy,
|
|
|
|
|
// notes: model
|
|
|
|
|
// .patientProgressNoteList[
|
|
|
|
|
// index]
|
|
|
|
|
// .notes,
|
|
|
|
|
// verifiedNote: true,
|
|
|
|
|
// patientTypeID:
|
|
|
|
|
// patient
|
|
|
|
|
// .patientType,
|
|
|
|
|
// patientOutSA: false,
|
|
|
|
|
// );
|
|
|
|
|
// await model
|
|
|
|
|
// .updatePatientProgressNote(
|
|
|
|
|
// reqModel);
|
|
|
|
|
// await getProgressNoteList(
|
|
|
|
|
// context, model,
|
|
|
|
|
// isLocalBusy:
|
|
|
|
|
// true);
|
|
|
|
|
// GifLoaderDialogUtils
|
|
|
|
|
// .hideDialog(
|
|
|
|
|
// context);
|
|
|
|
|
// });
|
|
|
|
|
// },
|
|
|
|
|
// child: Container(
|
|
|
|
|
// decoration: BoxDecoration(
|
|
|
|
|
// color: Colors.green[600],
|
|
|
|
|
// borderRadius:
|
|
|
|
|
// BorderRadius.circular(
|
|
|
|
|
// 10),
|
|
|
|
|
// ),
|
|
|
|
|
// // color:Colors.red[600],
|
|
|
|
|
//
|
|
|
|
|
// child: Row(
|
|
|
|
|
// children: [
|
|
|
|
|
// Icon(
|
|
|
|
|
// FontAwesomeIcons
|
|
|
|
|
// .check,
|
|
|
|
|
// size: 12,
|
|
|
|
|
// color: Colors.white,
|
|
|
|
|
// ),
|
|
|
|
|
// SizedBox(
|
|
|
|
|
// width: 2,
|
|
|
|
|
// ),
|
|
|
|
|
// AppText(
|
|
|
|
|
// TranslationBase.of(
|
|
|
|
|
// context)
|
|
|
|
|
// .noteVerify,
|
|
|
|
|
// fontSize: 10,
|
|
|
|
|
// color: Colors.white,
|
|
|
|
|
// ),
|
|
|
|
|
// ],
|
|
|
|
|
// ),
|
|
|
|
|
// padding: EdgeInsets.all(6),
|
|
|
|
|
// ),
|
|
|
|
|
// ),
|
|
|
|
|
SizedBox(
|
|
|
|
|
width: 10,
|
|
|
|
|
),
|
|
|
|
|
InkWell(
|
|
|
|
|
onTap: () async {
|
|
|
|
|
showMyDialog(
|
|
|
|
|
context: context,
|
|
|
|
|
actionName:
|
|
|
|
|
TranslationBase.of(
|
|
|
|
|
context)
|
|
|
|
|
.cancel,
|
|
|
|
|
confirmFun: () async {
|
|
|
|
|
GifLoaderDialogUtils
|
|
|
|
|
.showMyDialog(
|
|
|
|
|
context,
|
|
|
|
|
);
|
|
|
|
|
UpdateNoteReqModel
|
|
|
|
|
reqModel =
|
|
|
|
|
UpdateNoteReqModel(
|
|
|
|
|
admissionNo: int
|
|
|
|
|
.parse(patient
|
|
|
|
|
.admissionNo),
|
|
|
|
|
cancelledNote: true,
|
|
|
|
|
lineItemNo: model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
index]
|
|
|
|
|
.lineItemNo,
|
|
|
|
|
createdBy: model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
index]
|
|
|
|
|
.createdBy,
|
|
|
|
|
notes: model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
index]
|
|
|
|
|
.notes,
|
|
|
|
|
verifiedNote: false,
|
|
|
|
|
patientTypeID:
|
|
|
|
|
patient
|
|
|
|
|
.patientType,
|
|
|
|
|
patientOutSA: false,
|
|
|
|
|
);
|
|
|
|
|
await model
|
|
|
|
|
.updatePatientProgressNote(
|
|
|
|
|
reqModel);
|
|
|
|
|
await getProgressNoteList(
|
|
|
|
|
context, model,
|
|
|
|
|
isLocalBusy:
|
|
|
|
|
true);
|
|
|
|
|
GifLoaderDialogUtils
|
|
|
|
|
.hideDialog(
|
|
|
|
|
context);
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
child: Container(
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
color: Colors.red[600],
|
|
|
|
|
borderRadius:
|
|
|
|
|
BorderRadius.circular(
|
|
|
|
|
10),
|
|
|
|
|
),
|
|
|
|
|
// color:Colors.red[600],
|
|
|
|
|
|
|
|
|
|
child: Row(
|
|
|
|
|
children: [
|
|
|
|
|
Icon(
|
|
|
|
|
FontAwesomeIcons
|
|
|
|
|
.trash,
|
|
|
|
|
size: 12,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
width: 2,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
'Cancel',
|
|
|
|
|
fontSize: 10,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
padding: EdgeInsets.all(6),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
// InkWell(
|
|
|
|
|
// onTap: () async {
|
|
|
|
|
// showMyDialog(
|
|
|
|
|
// context: context,
|
|
|
|
|
// actionName:
|
|
|
|
|
// TranslationBase.of(
|
|
|
|
|
// context)
|
|
|
|
|
// .cancel,
|
|
|
|
|
// confirmFun: () async {
|
|
|
|
|
// GifLoaderDialogUtils
|
|
|
|
|
// .showMyDialog(
|
|
|
|
|
// context,
|
|
|
|
|
// );
|
|
|
|
|
// UpdateNoteReqModel
|
|
|
|
|
// reqModel =
|
|
|
|
|
// UpdateNoteReqModel(
|
|
|
|
|
// admissionNo: int
|
|
|
|
|
// .parse(patient
|
|
|
|
|
// .admissionNo),
|
|
|
|
|
// cancelledNote: true,
|
|
|
|
|
// lineItemNo: model
|
|
|
|
|
// .patientProgressNoteList[
|
|
|
|
|
// index]
|
|
|
|
|
// .lineItemNo,
|
|
|
|
|
// createdBy: model
|
|
|
|
|
// .patientProgressNoteList[
|
|
|
|
|
// index]
|
|
|
|
|
// .createdBy,
|
|
|
|
|
// notes: model
|
|
|
|
|
// .patientProgressNoteList[
|
|
|
|
|
// index]
|
|
|
|
|
// .notes,
|
|
|
|
|
// verifiedNote: false,
|
|
|
|
|
// patientTypeID:
|
|
|
|
|
// patient
|
|
|
|
|
// .patientType,
|
|
|
|
|
// patientOutSA: false,
|
|
|
|
|
// );
|
|
|
|
|
// await model
|
|
|
|
|
// .updatePatientProgressNote(
|
|
|
|
|
// reqModel);
|
|
|
|
|
// await getProgressNoteList(
|
|
|
|
|
// context, model,
|
|
|
|
|
// isLocalBusy:
|
|
|
|
|
// true);
|
|
|
|
|
// GifLoaderDialogUtils
|
|
|
|
|
// .hideDialog(
|
|
|
|
|
// context);
|
|
|
|
|
// });
|
|
|
|
|
// },
|
|
|
|
|
// child: Container(
|
|
|
|
|
// decoration: BoxDecoration(
|
|
|
|
|
// color: Colors.red[600],
|
|
|
|
|
// borderRadius:
|
|
|
|
|
// BorderRadius.circular(
|
|
|
|
|
// 10),
|
|
|
|
|
// ),
|
|
|
|
|
// // color:Colors.red[600],
|
|
|
|
|
//
|
|
|
|
|
// child: Row(
|
|
|
|
|
// children: [
|
|
|
|
|
// Icon(
|
|
|
|
|
// FontAwesomeIcons
|
|
|
|
|
// .trash,
|
|
|
|
|
// size: 12,
|
|
|
|
|
// color: Colors.white,
|
|
|
|
|
// ),
|
|
|
|
|
// SizedBox(
|
|
|
|
|
// width: 2,
|
|
|
|
|
// ),
|
|
|
|
|
// AppText(
|
|
|
|
|
// 'Cancel',
|
|
|
|
|
// fontSize: 10,
|
|
|
|
|
// color: Colors.white,
|
|
|
|
|
// ),
|
|
|
|
|
// ],
|
|
|
|
|
// ),
|
|
|
|
|
// padding: EdgeInsets.all(6),
|
|
|
|
|
// ),
|
|
|
|
|
// ),
|
|
|
|
|
SizedBox(
|
|
|
|
|
width: 10,
|
|
|
|
|
)
|
|
|
|
|
@ -465,7 +459,7 @@ class _ProgressNoteState extends State<OperationReportScreen> {
|
|
|
|
|
Expanded(
|
|
|
|
|
child: AppText(
|
|
|
|
|
model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
.operationReportList[
|
|
|
|
|
index]
|
|
|
|
|
.doctorName ??
|
|
|
|
|
'',
|
|
|
|
|
@ -483,14 +477,14 @@ class _ProgressNoteState extends State<OperationReportScreen> {
|
|
|
|
|
children: [
|
|
|
|
|
AppText(
|
|
|
|
|
model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
.operationReportList[
|
|
|
|
|
index]
|
|
|
|
|
.createdOn !=
|
|
|
|
|
null
|
|
|
|
|
? AppDateUtils.getDayMonthYearDateFormatted(
|
|
|
|
|
AppDateUtils
|
|
|
|
|
.getDateTimeFromServerFormat(model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
.operationReportList[
|
|
|
|
|
index]
|
|
|
|
|
.createdOn),
|
|
|
|
|
isArabic:
|
|
|
|
|
@ -508,14 +502,14 @@ class _ProgressNoteState extends State<OperationReportScreen> {
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
.operationReportList[
|
|
|
|
|
index]
|
|
|
|
|
.createdOn !=
|
|
|
|
|
null
|
|
|
|
|
? AppDateUtils.getHour(
|
|
|
|
|
AppDateUtils
|
|
|
|
|
.getDateTimeFromServerFormat(model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
.operationReportList[
|
|
|
|
|
index]
|
|
|
|
|
.createdOn))
|
|
|
|
|
: AppDateUtils.getHour(
|
|
|
|
|
@ -539,7 +533,7 @@ class _ProgressNoteState extends State<OperationReportScreen> {
|
|
|
|
|
Expanded(
|
|
|
|
|
child: AppText(
|
|
|
|
|
model
|
|
|
|
|
.patientProgressNoteList[
|
|
|
|
|
.operationReportList[
|
|
|
|
|
index]
|
|
|
|
|
.notes,
|
|
|
|
|
fontSize: 10,
|
|
|
|
|
|