Konflikte gelöst

This commit is contained in:
2024-01-15 11:34:45 +01:00
287 changed files with 34279 additions and 2067 deletions

View File

@@ -23,6 +23,7 @@ using BS.Shared.DataContracts.Compact;
using BS.Shared.DataContracts.Reports;
using BS.Shared.Extensions;
using BS.Shared.Services;
using Dakota.Logic;
using Newtonsoft.Json;
using RestSharp;
using System;
@@ -38,6 +39,7 @@ using System.Web;
using System.Windows;
using BeWo.Data.Utils;
using Utils = BeWo.Service.Core.Utils;
using System.Collections.Specialized;
namespace BeWo.Service.ServiceImplementations
{
@@ -8378,7 +8380,6 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(e);
}
}
public Dictionary<string, string> GetDiagiosisStringsForICD10Codes(List<string> icd10Codes)
{
try
@@ -8501,6 +8502,71 @@ namespace BeWo.Service.ServiceImplementations
DAOFactory.GenericDAO.Insert(seviceRecordHistoryEntry);
}
public string GetDakotaFileFormat(object param)
{
try
{
var test_oid = Convert.ToInt64(param);
var test_invoicebase = DAOFactory.GenericDAO.GetByID<InvoiceBase>(test_oid);
var test_month = test_invoicebase.InvoiceDate.Value.Month;
var manager = new DakotaManager(test_month);
var oids = new List<Int64>();
oids.Add(test_oid);
foreach (var invoicebase_oid in oids)
{
var service = DAOFactory.SearchDAO.GetServiceInvoiceByInvoiceBaseOid(invoicebase_oid);
var invoicebase = DAOFactory.GenericDAO.GetByID<InvoiceBase>(invoicebase_oid);
var orga = invoicebase.CostBearer2SupportConcept.CostBearer.Organisation;
var customer = invoicebase.CostBearer2SupportConcept.SupportConcept.Customer;
var mandator = GetMandatorEntity();
var servicedc = MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(service);
var orgadc = MapperFactory.OrganisationDC_OrganisationMapper.MapToNewDC(orga);
var customerdc = MapperFactory.CustomerDC_Customer.MapToNewDC(customer);
var mandatordc = MapperFactory.MandatorDC_Mandator.MapToNewDC(mandator);
manager.Add(servicedc, orgadc, customerdc, mandatordc);
}
manager.Apply();
manager.Save();
//return manager.DakotaFileDict.First().Value.GetNutzdatendatei();
var nutzdatendatei = manager.DakotaFileDict.First().Value.GetNutzdatendatei();
String url = "http://localhost:3777/Host/GkvAbrechnungView.aspx";
//String url = "https://app8.bewoplaner.de/service/GkvAbrechnungView.aspx";
using (WebClient client = new WebClient())
{
//MessageBox.Show(hostAddress);
var nvc = new NameValueCollection();
nvc.Add("Kundennummer", "7375324044");
nvc.Add("IKDatenannahmestelle", manager.DakotaFileDict.First().Value.GetIKEmpfang());
nvc.Add("IKEmpfang", manager.DakotaFileDict.First().Value.GetIKEmpfang());
nvc.Add("TransferName", manager.DakotaFileDict.First().Value.GetTransferName());
nvc.Add("Nutzdatendatei", nutzdatendatei);
nvc.Add("Auftragsdatei", manager.DakotaFileDict.First().Value.GetAuftragsdatei());
byte[] response = client.UploadValues(url, "POST", nvc);
String responseStr = System.Text.Encoding.ASCII.GetString(response);
}
return nutzdatendatei; return manager.DakotaFileDict.First().Value.GetNutzdatendatei();
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public List<ServiceRecordDC> GetEmployeesServiceRecordsWithStartEndDatePaginated(long pEmployeeOid, DateTime start, DateTime ende, int firstResult, int maxResults, out int rowCount)
{
try