diff --git a/ui/src/app/shared/components/patient-clinical-notes-summary/patient-clinical-notes-summary.component.ts b/ui/src/app/shared/components/patient-clinical-notes-summary/patient-clinical-notes-summary.component.ts index fd2a047a9..0891a911b 100644 --- a/ui/src/app/shared/components/patient-clinical-notes-summary/patient-clinical-notes-summary.component.ts +++ b/ui/src/app/shared/components/patient-clinical-notes-summary/patient-clinical-notes-summary.component.ts @@ -19,8 +19,21 @@ export class PatientClinicalNotesSummaryComponent implements OnInit { constructor(private store: Store) {} ngOnInit(): void { - this.observations$ = !this.forHistory - ? this.store.pipe(select(getGroupedObservationByConcept)) - : of(groupObservationByConcept(this.patientVisit?.observations)); + if (!this.forHistory) { + this.observations$ = this.store.pipe(select(getGroupedObservationByConcept)); + } else { + const groupedObservations = groupObservationByConcept( + this.patientVisit?.observations + ); + const notes = this.patientVisit?.visit?.notes || ["No notes available"]; + const services = this.patientVisit?.visit?.services || ["No services available"]; + + this.observations$ = of({ + ...groupedObservations, + visitNotes: notes, + serviceRecords: services, + }); + } } + } diff --git a/ui/src/app/shared/components/patient-history-data/patient-history-data.component.ts b/ui/src/app/shared/components/patient-history-data/patient-history-data.component.ts index 399ae7477..115426010 100644 --- a/ui/src/app/shared/components/patient-history-data/patient-history-data.component.ts +++ b/ui/src/app/shared/components/patient-history-data/patient-history-data.component.ts @@ -609,6 +609,7 @@ ${this.visitHistory?.visitStopDateTime?.date} at ${this.visitHistory?.visitStopD frameDoc.document.write(``); + // -------------------Procedure orders------------- if ( this.visitHistory?.visitOrderedData?.find( @@ -630,8 +631,12 @@ ${this.visitHistory?.visitStopDateTime?.date} at ${this.visitHistory?.visitStopD `); } - this.visitHistory?.visitOrderedData?.forEach((visitData) => { - if (visitData?.category === "PROCEDURE_ORDER") { + + // Visit note..... + + + this.visitHistory?.visitOrderedData?.forEach((visitData) => { + if (visitData?.category === "OBSERVATIONS") { frameDoc.document.write(` ${visitData?.concept?.display} @@ -668,6 +673,48 @@ ${this.visitHistory?.visitStopDateTime?.date} at ${this.visitHistory?.visitStopD : "-" } +`); + } + }); + + //end of visit note + + this.visitHistory?.visitOrderedData?.forEach((visitData) => { + if (visitData?.category === "PROCEDURE_ORDER") { + frameDoc.document.write(` + + ${visitData?.concept?.display} + + ${visitData?.provider} on + ${visitData?.date} ${visitData?.time} + + `); + //................Handle Empty or Undefined Data............... + + if (visitData?.results?.length > 0) { + visitData.results.forEach((result) => { + if (!result?.value?.links?.uri) { + frameDoc.document.write(` ${result?.concept?.display || 'N/A'} - + ${result?.value?.display || result?.value || 'N/A'},   `); + } + }); + } else { + frameDoc.document.write(` Not Attended `); + } + + //....................End of Handling Data.................. + frameDoc.document.write(``); + frameDoc.document.write(` + ${ + visitData?.results[0]?.provider?.display?.split("-")[1] + ? visitData?.results[0]?.provider?.display?.split("-")[1] + "on" + : "-" + } ${ + visitData?.results[0]?.obsDatetime + ? formatDateToString(new Date(visitData?.results[0]?.obsDatetime)) + : "-" + } + `); } }); @@ -694,15 +741,21 @@ ${this.visitHistory?.visitStopDateTime?.date} at ${this.visitHistory?.visitStopD `); - visitData?.obs?.forEach((ob) => { - frameDoc.document.write(` ${ob?.concept?.display} - ${ob?.value?.display ? ob?.value?.display : ob?.value} - `); + // .............Snippet to process observation.............. + if (visitData?.obs?.length > 0) { + visitData.obs.forEach((ob) => { + frameDoc.document.write(`${ob?.concept?.display || 'N/A'} + ${ob?.value?.display || ob?.value || 'N/A'} + `); }); + } else { + frameDoc.document.write(`No Observations Found`); } - }); - } + frameDoc.document.write(``); + } + }); + } // this.visitHistory?.visitOrderedData?.forEach((visitData) => { // if (visitData?.category === "OBSERVATIONS") { // frameDoc.document.write(``); - if (this.visitHistory?.diagnoses?.PROVISIONAL?.length) { + //......Checking both provisional & confirmed are rendered............. + + if (Array.isArray(this.visitHistory?.diagnoses?.PROVISIONAL) && this.visitHistory?.diagnoses?.PROVISIONAL.length) { frameDoc.document.write(`

Provisional Diagnoses

`); @@ -738,6 +792,8 @@ ${this.visitHistory?.visitStopDateTime?.date} at ${this.visitHistory?.visitStopD }); } +// ......End of Rendering............. + frameDoc.document.write(`
diff --git a/ui/src/app/shared/components/patient-history/patient-history.component.html b/ui/src/app/shared/components/patient-history/patient-history.component.html index 038a13630..8c7afbdf5 100644 --- a/ui/src/app/shared/components/patient-history/patient-history.component.html +++ b/ui/src/app/shared/components/patient-history/patient-history.component.html @@ -13,9 +13,12 @@ provider: provider$ | async } as params" > +
+ +
@@ -26,16 +29,18 @@ to {{ visit?.visit?.stopDatetime | date: "dd-MM-yyyy HH:mm:ss" }} - (On going visit) + (On-going visit) - + +
+ Visit Notes: +

{{ visit?.notes || "No notes available" }}

+
+ + - - + - +

Saved Form Data: {{ savedFormData | json }}

 - +
- +
- - -
+ +

{{ diff --git a/ui/src/app/shared/components/patient-history/patient-history.component.ts b/ui/src/app/shared/components/patient-history/patient-history.component.ts index f84a1cbc6..a2d93f618 100644 --- a/ui/src/app/shared/components/patient-history/patient-history.component.ts +++ b/ui/src/app/shared/components/patient-history/patient-history.component.ts @@ -48,7 +48,6 @@ export class PatientHistoryComponent implements OnInit { @Input() patient: any; @Input() location: any; saving: boolean = false; - formData: any; visits$: Observable; customForms$: Observable; @@ -59,23 +58,11 @@ export class PatientHistoryComponent implements OnInit { allForms$: Observable; loadingData: boolean = false; facilityDetails$: Observable; - currentUser$: Observable<{ - userPrivileges: any; - links?: { rel?: string; uri?: string }[]; - uuid?: string; - display?: string; - username?: string; - systemId?: string; - userProperties?: object; - - // person?: PersonGetRef; - // privileges?: PrivilegeGetRef[]; - // roles?: RoleGetRef[]; - provider?: { uuid?: string; display?: string }; - }>; + currentUser$: Observable; provider$: Observable; doctorsIPDRoundForm$: Observable; + constructor( private visitsService: VisitsService, private store: Store, @@ -84,19 +71,30 @@ export class PatientHistoryComponent implements OnInit { ) {} ngOnInit(): void { + this.initForm(); this.loadData(); } + private initForm(): void { + // Initialize the form with necessary fields and validators + this.form = new FormGroup({ + fieldName: new FormControl('', Validators.required), // example field + }); + } + private loadData(): void { this.loadingData = true; this.customForms$ = this.store.select(getAllForms); this.facilityDetails$ = this.store.select(getParentLocation); this.currentUser$ = this.store.select(getCurrentUserDetails); this.provider$ = this.store.select(getProviderDetails); + + // Fetch system settings for prescription types this.generalPrescriptionOrderType$ = this.systemSettingsService.getSystemSettingsByKey( "iCare.clinic.genericPrescription.orderType" ); + this.prescriptionArrangementFields$ = this.systemSettingsService .getSystemSettingsByKey("iCare.clinic.prescription.arrangement") .pipe( @@ -122,6 +120,7 @@ export class PatientHistoryComponent implements OnInit { }; }) ); + this.specificDrugConceptUuid$ = this.systemSettingsService .getSystemSettingsByKey( "iCare.clinic.genericPrescription.specificDrugConceptUuid" @@ -142,16 +141,17 @@ export class PatientHistoryComponent implements OnInit { } }) ); + this.visits$ = this.visitsService .getAllPatientVisits(this.patient?.uuid, true) .pipe( map((response) => { this.loadingData = false; - console.log('Fetched visits:',response); + console.log('Fetched visits:', response); // Debugging if (!response?.error) { return response?.map((visit) => { let obs = []; - visit?.visit?.encounters.forEach((encounter) => { + visit?.visit?.encounters?.forEach((encounter) => { (encounter?.obs || []).forEach((observation) => { obs = [ ...obs, @@ -166,14 +166,13 @@ export class PatientHistoryComponent implements OnInit { ]; }); }); - // Add service records - const serviceRecords = visit?.visit?.services || []; // Example service records return { visit: visit?.visit, - notes: visit?.visit?.notes || "No notes available", //Add visit notes + notes: visit?.visit?.notes || "No notes available", // Add visit notes obs: obs, + serviceRecords: serviceRecords, orders: [ - ...visit?.visit?.encounters.map((encounter) => { + ...visit?.visit?.encounters?.map((encounter) => { return (encounter?.orders || []).map((order) => { return { ...order, @@ -190,25 +189,8 @@ export class PatientHistoryComponent implements OnInit { } }) ); - - // this.getIPDRoundDoctorsForm(); } - // getIPDRoundDoctorsForm(): void { - // this.systemSettingsService - // .getSystemSettingsByKey("iCare.forms.doctorsIPDRound.uuid") - // .subscribe((doctorsIPDRoundFormUuid: string) => { - // if (doctorsIPDRoundFormUuid) { - // this.store.dispatch( - // loadCustomOpenMRSForm({ formUuid: doctorsIPDRoundFormUuid }) - // ); - // this.doctorsIPDRoundForm$ = this.store.select( - // getCustomOpenMRSFormById(doctorsIPDRoundFormUuid) - // ); - // } - // }); - // } - onDoctorsIPDRoundCommentsFormUpdate(formValue: FormValue): void { console.log(formValue.getValues()); this.formData = formValue.getValues(); @@ -222,7 +204,8 @@ export class PatientHistoryComponent implements OnInit { value: this.formData[key]?.value, }; }); - let encounterObject = { + + const encounterObject = { patient: this.patient?.uuid, encounterType: form?.encounterType?.uuid, location: this.location?.uuid, @@ -243,7 +226,7 @@ export class PatientHistoryComponent implements OnInit { .saveEncounterWithObsDetails(encounterObject) .subscribe((res) => { if (res) { - this.loadData(); + this.loadData(); // Reload data after saving } }); }