Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/visitdatacheckup #479

Merged
merged 3 commits into from
Nov 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
[isTabularList]="true"
[filterCategory]="'billing'"
[orderBy]="'ENCOUNTER'"
[orderByDirection]="'ASC'"
[orderByDirection]="'DESC'"
(selectPatient)="onSelectPatient($event)"
></app-patient-list>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<app-patient-list
[isTabularList]="true"
[itemsPerPage]="10"
[orderByDirection]="'DESC'"
[currentLocation]="(currentLocation$ | async)?.id"
[orderType]="params?.consultationOrderType"
(selectPatient)="onSelectPatient($event)"
Expand Down Expand Up @@ -151,6 +152,7 @@
[doNotUseLocation]="true"
[isTabularList]="true"
[itemsPerPage]="10"
[orderByDirection]="'DESC'"
[orderType]=""
(selectPatient)="onSelectPatient($event)"
></app-patient-list>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
<app-patient-list
[encounterType]="'e22e39fd-7db2-45e7-80f1-60fa0d5a4378'"
(selectPatient)="onSelectPatient($event)"
[orderByDirection]="'DESC'"
[shouldShowParentLocation]="true"
[isTabularList]="true"
></app-patient-list>
Expand Down Expand Up @@ -95,12 +96,14 @@
<div *ngIf="!params?.settingCurrentLocationStatus">
<div class="w-100 text-centered">
<!-- TODO: Softcode the order uuid -->
<!-- 181820aa-88c9-479b-9077-af92f5364329 -->
<!-- {{ locationsIds$ | async | json }} -->
<app-patient-list
[isDischarge]="true"
[encounterType]="'181820aa-88c9-479b-9077-af92f5364329'"
(selectPatient)="onSelectPatient($event)"
[shouldShowParentLocation]="true"
[orderByDirection]="'DESC'"
[isTabularList]="true"
></app-patient-list>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ export class InpatientHomeComponent implements OnInit {

// console.log("this.currentLocation?.uuid", this.currentLocation);
this.currentLocation = this.location;
console.log("currentLocation ....",this.currentLocation);
this.bedsUnderCurrentWard$ = this.store.select(getAllBedsUnderCurrentWard, {
id: this.currentLocation?.uuid,
tagName: "Bed Location",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ export class PatientRadiologyOrdersListComponent implements OnInit {
this.currentBills,
this.activeVisit
);
console.log("formattedOrders...",this.activeVisit);
}

previewPDFData(pdfData) {
Expand Down Expand Up @@ -213,4 +214,4 @@ export class PatientRadiologyOrdersListComponent implements OnInit {
console.log('Save complete');
}, 2000);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,11 @@
background-color: #2a8fd1 !important;
color: #fff !important;
}
.patient-profile-sticky {
position: sticky;
top: 0;
width: 100%;
padding-top: 20px;
box-shadow: 0px 2px 1px -1px rgb(0 0 0 / 20%),
0px 1px 1px 0px rgb(0 0 0 / 14%), 0px 1px 3px 0px rgb(0 0 0 / 12%);
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
[orderType]="'8189dbdd-3f10-11e4-adec-0800271c1b75'"
[itemsPerPage]="10"
[isTabularList]="true"
[orderByDirection]="'DESC'"
(selectPatient)="onSelectPatient($event)"
></app-patient-list>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
[currentPatient]="dashboardParams?.currentPatient"
></app-new-patient-profile>
</div>

<div class="w-100 patient-other-details-padding">
<div class="d-flex justify-content-between align-items-center pl-3 pr-3">
<div class="d-flex justify-content-left">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export function addBillStatusToOrders(orders, bills, visit) {
const billedItems = flatten(
(
bills?.map((bill) => {
console.log("bills visit.....",visit)
return {
...bill,
items: bill?.items?.map((item) => {
Expand Down