ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Organisation GkvAusblenden

Browse Source
This commit is contained in:
Rene Evertz
2024-11-15 15:13:07 +01:00
parent 4380cd7878
commit 682c8aba8a
10 changed files with 811 additions and 874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml
View File

@@ -298,7 +298,7 @@
Opened="popup_Opened"
Placement="MousePoint"
StaysOpen="False">
<localSearchView:OrganisationSearchView x:Name="gkvsearchview" SearchMode="OnlyValid" />
<localSearchView:OrganisationSearchView x:Name="gkvsearchview" SearchMode="OnlyValidGkvOrganisations" />
</Popup>
</Grid>
</GroupBox>

2
BeWo/View/Search/OrganisationSearchView.cs
View File

@@ -32,7 +32,7 @@ namespace BeWo.View.Search
pCallBack(r);
});
}
else if (this.SearchMode == SearchMode.OnlyValid)
else if (this.SearchMode == SearchMode.OnlyValidGkvOrganisations)
{
ServiceFacade.DoCustomerServiceAsync(
s => s.GetAllGkvValidOrganisationsCompact(),

2
BeWo/View/Search/SearchMode.cs
View File

@@ -8,6 +8,6 @@
ActiveCostbearer2SupportConcepts,
OnlyToOrganisationRelatedPersons,
OnlyTeamMember,
OnlyValid
OnlyValidGkvOrganisations
}
}

1649
BeWo/ViewModel/OrganisationVM.cs
View File

File diff suppressed because it is too large Load Diff

1
Data/Entities/Organisation.cs
View File

@@ -371,5 +371,6 @@ namespace BeWo.Data.Entities
}
public virtual GkvVerfahrensstufe Verfahrensstufe { get; set; }
public virtual bool GkvAusblenden { get; set; }
}
}

19
Data/Mappings/Organisation.hbm.xml
View File

@@ -16,15 +16,16 @@
<property column="UdpUser" type="String" name="UdpUser" length="256" />
<property column="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="IsActive" />
<property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
<property column="IKKrankenkasse" type="String" name="IKKrankenkasse" length="256" />
<property column="IKKostentrager" type="String" name="IKKostentrager" length="256" />
<property column="IKDatenannahmestelle" type="String" name="IKDatenannahmestelle" length="256" />
<property column="BezDatenannahmestelle" type="String" name="BezDatenannahmestelle" length="256" />
<property column="Leistungserbringergruppe" type="String" name="Leistungserbringergruppe" length="256" />
<property column="Verfahrensstufe" type="BS.Shared.GkvVerfahrensstufe, BS.Shared" name="Verfahrensstufe"/>
<property column="BusinessPartnerId" type="String" name="BusinessPartnerId" length="256" />
<many-to-one name="Address" column="AddressOid" class="BeWo.Data.Entities.Address, BeWo.Data" cascade="all" fetch="join"/>
<property column="IKKrankenkasse" type="String" name="IKKrankenkasse" length="256" />
<property column="IKKostentrager" type="String" name="IKKostentrager" length="256" />
<property column="IKDatenannahmestelle" type="String" name="IKDatenannahmestelle" length="256" />
<property column="BezDatenannahmestelle" type="String" name="BezDatenannahmestelle" length="256" />
<property column="Leistungserbringergruppe" type="String" name="Leistungserbringergruppe" length="256" />
<property column="Verfahrensstufe" type="BS.Shared.GkvVerfahrensstufe, BS.Shared" name="Verfahrensstufe"/>
<property column="BusinessPartnerId" type="String" name="BusinessPartnerId" length="256" />
<property name="GkvAusblenden" />
<many-to-one name="Address" column="AddressOid" class="BeWo.Data.Entities.Address, BeWo.Data" cascade="all" fetch="join"/>
<many-to-one name="InvoiceAddress" column="InvoiceAddressOid" class="BeWo.Data.Entities.Address, BeWo.Data" cascade="all" fetch="join"/>
<many-to-one name="BankAccount" column="BankAccountOid" class="BeWo.Data.Entities.BankAccount, BeWo.Data" cascade="all" />
<many-to-one name="CostBearer" column="CostBearerOid" cascade="all-delete-orphan" class="BeWo.Data.Entities.CostBearer, BeWo.Data" fetch="join"/>

2
Model/Changes_2024_11_15 Organisation Gkv Ausblenden.txt Normal file
View File

@@ -0,0 +1,2 @@
ALTER TABLE `organisation`
ADD COLUMN `GkvAusblenden` TINYINT NULL DEFAULT NULL AFTER `BusinessPartnerId`;

2
Service/DCEntityMapper/OrganisationDC_Organisation.cs
View File

@@ -34,6 +34,7 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.BezDatenannahmestelle = pEntity.BezDatenannahmestelle;
pDataContract.Leistungserbringergruppe = pEntity.Leistungserbringergruppe;
pDataContract.Verfahrensstufe = pEntity.Verfahrensstufe;
pDataContract.GkvAusblenden = pEntity.GkvAusblenden;
pDataContract.BusinessPartnerId = pEntity.BusinessPartnerId;
@@ -113,6 +114,7 @@ namespace BeWo.Service.DCEntityMapper
pEntity.BezDatenannahmestelle = pDataContract.BezDatenannahmestelle;
pEntity.Leistungserbringergruppe = pDataContract.Leistungserbringergruppe;
pEntity.Verfahrensstufe = pDataContract.Verfahrensstufe;
pEntity.GkvAusblenden = pDataContract.GkvAusblenden;
pEntity.BusinessPartnerId = pDataContract.BusinessPartnerId;

3
Service/ServiceImplementations/CustomerServiceImp.cs
View File

@@ -859,7 +859,8 @@ namespace BeWo.Service.ServiceImplementations
{
IList<Organisation> list = DAOFactory.GenericDAO.GetAllActiveAndArchived<Organisation>();
list = list.Where(x => Validator.IsOrganisationInformationValid(x.IKDatenannahmestelle, x.IKKostentrager, x.IKKrankenkasse, x.BezDatenannahmestelle)).ToList();
list = list.Where(x => !x.GkvAusblenden &&
Validator.IsOrganisationInformationValid(x.IKDatenannahmestelle, x.IKKostentrager, x.IKKrankenkasse, x.BezDatenannahmestelle)).ToList();
return CreateCompactOrganisations(list);
}

3
Shared/DataContracts/OrganisationDC.cs
View File

@@ -189,5 +189,8 @@ namespace BS.Shared.DataContracts
[DataMember]
public GkvVerfahrensstufe Verfahrensstufe { get; set; }
[DataMember]
public bool GkvAusblenden { get; set; }
}
}