Merge branch 'get_operation_report' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_operation_report

 Conflicts:
	lib/core/service/operation_report_servive.dart
	lib/core/viewModel/operation_report_view_model.dart
	lib/screens/patients/profile/operation_report/update_operation_report.dart
merge-requests/862/head
Elham Rababh 4 years ago
commit 231614e914

@ -2,10 +2,31 @@ import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/core/service/base/base_service.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart';
import 'package:doctor_app_flutter/models/operation_report/create_update_operation_report_request_model.dart'; import 'package:doctor_app_flutter/models/operation_report/create_update_operation_report_request_model.dart';
import 'package:doctor_app_flutter/models/operation_report/get_operation_report_model.dart'; import 'package:doctor_app_flutter/models/operation_report/get_operation_report_model.dart';
import 'package:doctor_app_flutter/models/operation_report/get_operation_report_request_model.dart';
class OperationReportService extends BaseService { class OperationReportService extends BaseService {
List<GetOperationReportModel> get operationReportList => List(); List<GetOperationReportModel> get operationReportList => List();
Future getOperationReport(
{GetOperationReportRequestModel getOperationReportRequestModel,
int patientId}) async {
getOperationReportRequestModel =
GetOperationReportRequestModel(patientID: patientId);
hasError = false;
await baseAppClient.post(GET_OPERATION_REPORT,
onSuccess: (dynamic response, int statusCode) {
print("Success");
operationReportList.clear();
response['List_OTReservationDetails'].forEach((v) {
operationReportList.add(GetOperationReportModel.fromJson(v));
});
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: getOperationReportRequestModel.toJson());
}
Future updateOperationReport(CreateUpdateOperationReportRequestModel createUpdateOperationReport) async { Future updateOperationReport(CreateUpdateOperationReportRequestModel createUpdateOperationReport) async {
await baseAppClient.post(UPDATE_OPERATION_REPORT, await baseAppClient.post(UPDATE_OPERATION_REPORT,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {

@ -1,17 +1,32 @@
import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/service/operation_report_servive.dart'; import 'package:doctor_app_flutter/core/service/operation_report_servive.dart';
import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart';
import 'package:doctor_app_flutter/models/operation_report/create_update_operation_report_request_model.dart'; import 'package:doctor_app_flutter/locator.dart';
import '../../locator.dart';
class OperationReportViewModel extends BaseViewModel { class OperationReportViewModel extends BaseViewModel {
bool hasError = false;
OperationReportService _operationReportService = OperationReportService _operationReportService =
locator<OperationReportService>(); locator<OperationReportService>();
get operationReportList => _operationReportService.operationReportList;
Future getOperationReport(int patientId) async {
hasError = false;
setState(ViewState.Busy);
await _operationReportService.getOperationReport(patientId: patientId);
if (_operationReportService.hasError) {
error = _operationReportService.error;
setState(ViewState.ErrorLocal);
} else {
setState(ViewState.Idle);
}
}
Future updateOperationReport( Future updateOperationReport(
CreateUpdateOperationReportRequestModel CreateUpdateOperationReportRequestModel
createUpdateOperationReport) async { createUpdateOperationReport) async {
setState(ViewState.BusyLocal); setState(ViewState.BusyLocal);
if (_operationReportService.hasError) { if (_operationReportService.hasError) {
error = _operationReportService.error; error = _operationReportService.error;

@ -1,8 +1,10 @@
import 'package:doctor_app_flutter/core/service/authentication_service.dart'; import 'package:doctor_app_flutter/core/service/authentication_service.dart';
import 'package:doctor_app_flutter/core/service/home/scan_qr_service.dart'; import 'package:doctor_app_flutter/core/service/home/scan_qr_service.dart';
import 'package:doctor_app_flutter/core/service/operation_report_servive.dart';
import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/hospitals_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/hospitals_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/medical_file_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/medical_file_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/patient_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/prescription_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/prescription_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart'; import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart';
@ -100,6 +102,7 @@ void setupLocator() {
locator.registerLazySingleton(() => SpecialClinicsService()); locator.registerLazySingleton(() => SpecialClinicsService());
locator.registerLazySingleton(() => VideoCallService()); locator.registerLazySingleton(() => VideoCallService());
locator.registerLazySingleton(() => AnalyticsService()); locator.registerLazySingleton(() => AnalyticsService());
locator.registerLazySingleton(() => OperationReportService());
/// View Model /// View Model
locator.registerFactory(() => DoctorReplayViewModel()); locator.registerFactory(() => DoctorReplayViewModel());
@ -128,4 +131,5 @@ void setupLocator() {
locator.registerFactory(() => LiveCarePatientViewModel()); locator.registerFactory(() => LiveCarePatientViewModel());
locator.registerFactory(() => PatientMedicalReportViewModel()); locator.registerFactory(() => PatientMedicalReportViewModel());
locator.registerFactory(() => ScanQrViewModel()); locator.registerFactory(() => ScanQrViewModel());
locator.registerFactory(() => OperationReportViewModel());
} }

@ -10,6 +10,7 @@ import 'package:doctor_app_flutter/screens/patients/profile/medical_report/AddVe
import 'package:doctor_app_flutter/screens/patients/profile/medical_report/MedicalReportDetailPage.dart'; import 'package:doctor_app_flutter/screens/patients/profile/medical_report/MedicalReportDetailPage.dart';
import 'package:doctor_app_flutter/screens/patients/profile/medical_report/MedicalReportPage.dart'; import 'package:doctor_app_flutter/screens/patients/profile/medical_report/MedicalReportPage.dart';
import 'package:doctor_app_flutter/screens/patients/profile/note/progress_note_screen.dart'; import 'package:doctor_app_flutter/screens/patients/profile/note/progress_note_screen.dart';
import 'package:doctor_app_flutter/screens/patients/profile/operation_report/operation_report.dart';
import 'package:doctor_app_flutter/screens/patients/profile/prescriptions/in_patient_prescription_details_screen.dart'; import 'package:doctor_app_flutter/screens/patients/profile/prescriptions/in_patient_prescription_details_screen.dart';
import 'package:doctor_app_flutter/screens/patients/profile/radiology/radiology_home_page.dart'; import 'package:doctor_app_flutter/screens/patients/profile/radiology/radiology_home_page.dart';
import 'package:doctor_app_flutter/screens/patients/profile/referral/refer-patient-screen-in-patient.dart'; import 'package:doctor_app_flutter/screens/patients/profile/referral/refer-patient-screen-in-patient.dart';
@ -47,7 +48,8 @@ const String ORDER_NOTE = 'patients/order-note';
const String MY_REFERRAL_DETAIL = 'my_referral_detail'; const String MY_REFERRAL_DETAIL = 'my_referral_detail';
const String REFER_PATIENT_TO_DOCTOR = 'patients/refer-to-doctor'; const String REFER_PATIENT_TO_DOCTOR = 'patients/refer-to-doctor';
const String REFER_IN_PATIENT_TO_DOCTOR = 'patients/refer-in-patient-to-doctor'; const String REFER_IN_PATIENT_TO_DOCTOR = 'patients/refer-in-patient-to-doctor';
const String PATIENT_INSURANCE_APPROVALS_NEW = 'patients/patient_insurance_approvals_new'; const String PATIENT_INSURANCE_APPROVALS_NEW =
'patients/patient_insurance_approvals_new';
const String VITAL_SIGN_DETAILS = 'patients/vital-sign-details'; const String VITAL_SIGN_DETAILS = 'patients/vital-sign-details';
const String CREATE_EPISODE = 'patients/create-episode'; const String CREATE_EPISODE = 'patients/create-episode';
const String UPDATE_EPISODE = 'patients/update-episode'; const String UPDATE_EPISODE = 'patients/update-episode';
@ -66,6 +68,7 @@ const String ORDER_PROCEDURE = 'procedure/procedure';
const String ADD_SICKLEAVE = 'add-sickleave'; const String ADD_SICKLEAVE = 'add-sickleave';
const String RADIOLOGY_PATIENT = 'radiology-patient'; const String RADIOLOGY_PATIENT = 'radiology-patient';
const String ALL_SPECIAL_LAB_RESULT = 'all-special_lab'; const String ALL_SPECIAL_LAB_RESULT = 'all-special_lab';
const String GET_OPERATION_REPORT = 'operation-report';
//todo: change the routing way. //todo: change the routing way.
var routes = { var routes = {
@ -109,4 +112,5 @@ var routes = {
// PATIENT_UCAF_DETAIL: (_) => UcafDetailScreen(), // PATIENT_UCAF_DETAIL: (_) => UcafDetailScreen(),
PATIENT_ECG: (_) => ECGPage(), PATIENT_ECG: (_) => ECGPage(),
ALL_SPECIAL_LAB_RESULT: (_) => AllLabSpecialResult(), ALL_SPECIAL_LAB_RESULT: (_) => AllLabSpecialResult(),
GET_OPERATION_REPORT: (_) => OperationReportScreen(),
}; };

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

@ -35,36 +35,69 @@ class ProfileGridForInPatient extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final List<PatientProfileCardModel> cardsList = [ final List<PatientProfileCardModel> cardsList = [
PatientProfileCardModel(TranslationBase.of(context).vital, TranslationBase.of(context).signs, VITAL_SIGN_DETAILS, PatientProfileCardModel(
TranslationBase.of(context).vital,
TranslationBase.of(context).signs,
VITAL_SIGN_DETAILS,
'patient/vital_signs.png', 'patient/vital_signs.png',
isInPatient: isInpatient), isInPatient: isInpatient),
PatientProfileCardModel( PatientProfileCardModel(
TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, 'patient/lab_results.png', TranslationBase.of(context).lab,
TranslationBase.of(context).result,
LAB_RESULT,
'patient/lab_results.png',
isInPatient: isInpatient), isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).lab, TranslationBase.of(context).special, PatientProfileCardModel(
ALL_SPECIAL_LAB_RESULT, 'patient/lab_results.png', TranslationBase.of(context).lab,
TranslationBase.of(context).special,
ALL_SPECIAL_LAB_RESULT,
'patient/lab_results.png',
isInPatient: isInpatient), isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).radiology, TranslationBase.of(context).result, PatientProfileCardModel(
RADIOLOGY_PATIENT, 'patient/health_summary.png', TranslationBase.of(context).radiology,
TranslationBase.of(context).result,
RADIOLOGY_PATIENT,
'patient/health_summary.png',
isInPatient: isInpatient), isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).patient, TranslationBase.of(context).prescription, PatientProfileCardModel(
ORDER_PRESCRIPTION_NEW, 'patient/order_prescription.png', TranslationBase.of(context).patient,
TranslationBase.of(context).prescription,
ORDER_PRESCRIPTION_NEW,
'patient/order_prescription.png',
isInPatient: isInpatient), isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).progress, TranslationBase.of(context).note, PROGRESS_NOTE, PatientProfileCardModel(
TranslationBase.of(context).progress,
TranslationBase.of(context).note,
PROGRESS_NOTE,
'patient/Progress_notes.png', 'patient/Progress_notes.png',
isInPatient: isInpatient, isDischargedPatient: isDischargedPatient), isInPatient: isInpatient,
PatientProfileCardModel(TranslationBase.of(context).order, TranslationBase.of(context).sheet, ORDER_NOTE, isDischargedPatient: isDischargedPatient),
PatientProfileCardModel(
TranslationBase.of(context).order,
TranslationBase.of(context).sheet,
ORDER_NOTE,
'patient/Progress_notes.png', 'patient/Progress_notes.png',
isInPatient: isInpatient, isDischargedPatient: isDischargedPatient), isInPatient: isInpatient,
PatientProfileCardModel(TranslationBase.of(context).orders, TranslationBase.of(context).procedures, isDischargedPatient: isDischargedPatient),
ORDER_PROCEDURE, 'patient/Order_Procedures.png', PatientProfileCardModel(
TranslationBase.of(context).orders,
TranslationBase.of(context).procedures,
ORDER_PROCEDURE,
'patient/Order_Procedures.png',
isInPatient: isInpatient), isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).health, TranslationBase.of(context).summary, HEALTH_SUMMARY, PatientProfileCardModel(
TranslationBase.of(context).health,
TranslationBase.of(context).summary,
HEALTH_SUMMARY,
'patient/health_summary.png', 'patient/health_summary.png',
isInPatient: isInpatient), isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).medical, TranslationBase.of(context).report, PatientProfileCardModel(
PATIENT_MEDICAL_REPORT, 'patient/health_summary.png', TranslationBase.of(context).medical,
isInPatient: isInpatient, isDisable: false), TranslationBase.of(context).report,
PATIENT_MEDICAL_REPORT,
'patient/health_summary.png',
isInPatient: isInpatient,
isDisable: false),
PatientProfileCardModel( PatientProfileCardModel(
TranslationBase.of(context).referral, TranslationBase.of(context).referral,
TranslationBase.of(context).patient, TranslationBase.of(context).patient,
@ -73,12 +106,19 @@ class ProfileGridForInPatient extends StatelessWidget {
isInPatient: isInpatient, isInPatient: isInpatient,
isDisable: isDischargedPatient || isFromSearch, isDisable: isDischargedPatient || isFromSearch,
), ),
PatientProfileCardModel(TranslationBase.of(context).insurance, TranslationBase.of(context).approvals, PatientProfileCardModel(
PATIENT_INSURANCE_APPROVALS_NEW, 'patient/vital_signs.png', TranslationBase.of(context).insurance,
TranslationBase.of(context).approvals,
PATIENT_INSURANCE_APPROVALS_NEW,
'patient/vital_signs.png',
isInPatient: isInpatient), isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).discharge, TranslationBase.of(context).report, null, PatientProfileCardModel(
TranslationBase.of(context).discharge,
TranslationBase.of(context).report,
null,
'patient/patient_sick_leave.png', 'patient/patient_sick_leave.png',
isInPatient: isInpatient, isDisable: true), isInPatient: isInpatient,
isDisable: true),
PatientProfileCardModel( PatientProfileCardModel(
TranslationBase.of(context).patientSick, TranslationBase.of(context).patientSick,
TranslationBase.of(context).leave, TranslationBase.of(context).leave,
@ -86,6 +126,13 @@ class ProfileGridForInPatient extends StatelessWidget {
'patient/patient_sick_leave.png', 'patient/patient_sick_leave.png',
isInPatient: isInpatient, isInPatient: isInpatient,
), ),
PatientProfileCardModel(
"Operation",
"Report",
GET_OPERATION_REPORT,
'patient/patient_sick_leave.png',
isInPatient: isInpatient,
),
]; ];
return Padding( return Padding(

Loading…
Cancel
Save