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

fix show in direction and cards only active_status price #4579

Merged
merged 2 commits into from
Dec 17, 2024
Merged

fix show in direction and cards only active_status price #4579

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
3282805
fix show in direction and cards only active_status price
urchinpro Dec 17, 2024
c923ff0
by patient send email result
urchinpro Dec 17, 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: 2 additions & 2 deletions contracts/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ def get_hospital_price_by_date(hospital_id, date_start, date_end, is_subcontract

@staticmethod
def get_hospital_many_prices_by_date(hospital_id, date_start, date_end, is_subcontract=False):
return PriceName.objects.filter(hospital_id=hospital_id, date_start__lte=date_start, date_end__gte=date_end, subcontract=is_subcontract)
return PriceName.objects.filter(hospital_id=hospital_id, date_start__lte=date_start, date_end__gte=date_end, subcontract=is_subcontract, active_status=True)

@staticmethod
def get_hospital_extrenal_price_by_date(external_hospital_id, date_start, date_end, external_performer=True):
return PriceName.objects.filter(hospital_id=external_hospital_id, date_start__lte=date_start, date_end__gte=date_end, external_performer=external_performer)
return PriceName.objects.filter(hospital_id=external_hospital_id, date_start__lte=date_start, date_end__gte=date_end, external_performer=external_performer, active_status=True)

class Meta:
verbose_name = "Название прайса"
Expand Down
1 change: 1 addition & 0 deletions laboratory/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,7 @@ def __getitem__(self, item):
USERS_PK_SHOW_FACT_ADDRESSES_025U = []
CDA_TITLES_FIELDS_PRIMARY_RESEARCH = []
CDA_TITLES_FIELDS_EXTRACT_RESEARCH = []
SEND_EMAIL_RESULT_TO_CORPORATION_BY_PATIENT = False

TYPE_NUMBER_SYSTEM = []
FTP_SETUP_TO_SEND_HL7_BY_RESEARCHES = {
Expand Down
Loading