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

План операций - уволенные #4568

Merged
merged 2 commits into from
Dec 16, 2024
Merged

План операций - уволенные #4568

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
e8ac2d7
fix vue warn
Wellheor1 Dec 16, 2024
31cbf6b
Не выводить уволенных
Wellheor1 Dec 16, 2024
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
4 changes: 3 additions & 1 deletion api/sql_func.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,9 @@ def users_by_group(title_groups, hosp_id):
FROM users_doctorprofile
LEFT JOIN
t_podrazdeleniye ON users_doctorprofile.podrazdeleniye_id = t_podrazdeleniye.id
WHERE user_id in (SELECT user_id FROM t_users_id) and hospital_id = %(hosp_id)s)
WHERE user_id in (SELECT user_id FROM t_users_id) and hospital_id = %(hosp_id)s
and users_doctorprofile.dismissed = false
)

SELECT doc_id, fio, podrazdeleniye_id, title_podr, short_title, position_id FROM t_users
ORDER BY podrazdeleniye_id, fio DESC
Expand Down
2 changes: 1 addition & 1 deletion l2-frontend/src/pages/PlanOperations/components/Filters.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default {
required: true,
},
hirurgs: {
type: Object,
type: [Array, Object],
required: true,
},
departments: {
Expand Down
Loading