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.

Sign up for GitHub

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

Дата мед. осмотра - печать #3222

Merged
merged 2 commits into from
Nov 19, 2023
Merged

Дата мед. осмотра - печать #3222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
175978e
fix order by
Wellheor1 Nov 17, 2023
75de029
Merge branch 'develop' into time-to-medexam
urchinpro Nov 19, 2023
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
3 changes: 2 additions & 1 deletion contracts/sql_func.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def get_examination_data(company_id, date_start, date_end):
INNER JOIN public.directory_researches
ON public.users_assignmentresearches.research_id = public.directory_researches.id
WHERE date BETWEEN %(date_start)s AND %(date_end)s and contracts_medicalexamination.company_id = %(company_id)s
ORDER BY contracts_medicalexamination.card_id
""",
params={"date_start": date_start, "date_end": date_end, "company_id": company_id},
)
Expand All @@ -58,4 +59,4 @@ def get_research_coast_by_prce(price_id):
params={"price_id": price_id},
)
rows = namedtuplefetchall(cursor)
return rows
return rows
2 changes: 1 addition & 1 deletion l2-frontend/src/construct/ConstructCompany.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ export default {
const card = exam.card_id;
const selectCard = this.selectedCards;
return selectCard.includes(card);
}).map((exam) => ({ card_id: exam.card_id, research: exam.research_id }));
}).map((exam) => ({ card_id: exam.card_id, date: exam.date, research: exam.research_id }));
await this.$api('print-medical-examination-data', {
cards: printData,
exclude: this.excludedResearches,
Expand Down