Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fixes for CR-20974 Lab PDF Attachment

Browse Source
ipd-changes-for-vida-plus
haroon amjad 1 month ago
parent 9139039cc8
commit a8975bb8f5
3 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File

8
lib/core/service/patient_medical_file/lab_order/labs_service.dart
Unescape Escape View File

@ -220,17 +220,17 @@ class LabsService extends BaseService {
}, body: _allSpecialLabResultRequestModel.toJson());
}
Future<void> getLabAttachments(PatiantInformtion patient,{required labAccessNumber, required FileName, required FileHash}) async {
Future<void> getLabAttachments(PatiantInformtion patient, {required labAccessNumber, required FileName, required FileHash, required projectID, required setupID}) async {
hasError = false;
Map<String, dynamic> body = Map();
body['FileHash'] = [FileHash??FileName??""];
body['ProjectID'] = projectID;
body['SetupID'] = setupID;
// if(ProjectViewModel.getVidaPlusStatus()){
body['Lang'] = "en"??"";
body['Internationalization'] = false;
// } else {
body['LabAccessionNumber'] = labAccessNumber??"";
body['LabAccessionNumber'] = labAccessNumber ?? "";
// }
await baseAppClient.postPatient(GET_ATTACHMENT, patient: patient, onSuccess: (dynamic response, int statusCode) {
labAttachment.clear();

4
lib/core/viewModel/labs_view_model.dart
Unescape Escape View File

@ -160,10 +160,10 @@ class LabsViewModel extends BaseViewModel {
setState(ViewState.Idle);
}
Future getLabAttachments(PatiantInformtion patient,{ dynamic labAccessNumber, dynamic FileName, dynamic FileHash, UploadedDocument? uploadedDocument}) async {
Future getLabAttachments(PatiantInformtion patient,{dynamic labAccessNumber, dynamic FileName, dynamic FileHash, UploadedDocument? uploadedDocument, dynamic projectID, String? setupID}) async {
setState(ViewState.Busy);
await _labsService.getLabAttachments(patient,labAccessNumber: labAccessNumber, FileName: FileName, FileHash:uploadedDocument?.fileData );
await _labsService.getLabAttachments(patient,labAccessNumber: labAccessNumber, FileName: FileName, FileHash:uploadedDocument?.fileData, projectID: projectID, setupID: setupID);
if (_labsService.hasError) {
error = _labsService.error;
setState(ViewState.Error);

31
lib/screens/patients/profile/lab_result/laboratory_result/lab_result_widget.dart
Unescape Escape View File

@ -189,24 +189,25 @@ class LabResultWidget extends StatelessWidget {
child: InkWell(
onTap: () async {
var labAccessNumber = patientLabResultList[index].LabAccessionNo;
if (patientLabResultList[index].FileNameWithExtensionList?.isNotEmpty == true || patientLabResultList[index].FileNameWithExtensionList?.length == 1) {
await model.getLabAttachments(patient, labAccessNumber: labAccessNumber, FileName: patientLabResultList[index].FileNameWithExtensionList?.first);
model.openPDF();
return;
}
if (patientLabResultList[index].UploadedDocuments?.isNotEmpty == true || patientLabResultList[index].UploadedDocuments?.length == 1) {
await model.getLabAttachments(patient, labAccessNumber: labAccessNumber, uploadedDocument: patientLabResultList[index].UploadedDocuments?.first);
model.openPDF();
return;
}
// if (patientLabResultList[index].FileNameWithExtensionList?.isNotEmpty == true || patientLabResultList[index].FileNameWithExtensionList?.length == 1) {
// await model.getLabAttachments(patient, labAccessNumber: labAccessNumber, FileName: patientLabResultList[index].FileNameWithExtensionList?.first);
// model.openPDF();
// return;
// }
//
// if (patientLabResultList[index].UploadedDocuments?.isNotEmpty == true || patientLabResultList[index].UploadedDocuments?.length == 1) {
// await model.getLabAttachments(patient, labAccessNumber: labAccessNumber, uploadedDocument: patientLabResultList[index].UploadedDocuments?.first);
// model.openPDF();
// return;
// }
showUploadedDocumentsBottomSheet(
context,
documents: patientLabResultList[index].UploadedDocuments,
fileName: patientLabResultList[index].FileNameWithExtensionList,
labAccessNumber: labAccessNumber,
);
projectID: int.parse(patientLabResultList[index].projectID!),
setupID: patientLabResultList[index].setupID);
},
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
@ -360,6 +361,8 @@ class LabResultWidget extends StatelessWidget {
List<UploadedDocument>? documents,
List<String>? fileName,
String? labAccessNumber,
int? projectID,
String? setupID,
}) {
const double kItemHeight = 66.0; // ListTile with contentPadding: 10
final double screenHeight = MediaQuery.of(context).size.height;
@ -439,11 +442,11 @@ class LabResultWidget extends StatelessWidget {
onTap: () async {
Navigator.pop(context);
if (documents?.isNotEmpty == true) {
await model.getLabAttachments(patient, uploadedDocument: documents![index]);
await model.getLabAttachments(patient, uploadedDocument: documents![index], projectID: projectID, setupID: setupID);
model.openPDF();
}
if (fileName?.isNotEmpty == true) {
await model.getLabAttachments(patient, labAccessNumber: labAccessNumber, FileName: fileName![index]);
await model.getLabAttachments(patient, labAccessNumber: labAccessNumber, FileName: fileName![index], projectID: projectID, setupID: setupID);
model.openPDF();
}
},

Write Preview
Loading…
Cancel
Save