diff --git a/contracts/models.py b/contracts/models.py index ba02ecebfb..614abffc9f 100644 --- a/contracts/models.py +++ b/contracts/models.py @@ -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 = "Название прайса" diff --git a/laboratory/settings.py b/laboratory/settings.py index ed9e97a15f..452b3a0dd5 100644 --- a/laboratory/settings.py +++ b/laboratory/settings.py @@ -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 = {