Merge Patients (#166)

* Merge patient UI
* Database functionality and UI for both databases
* Update report templates

HaemophilusWeb/Controllers/HomeController.cs

@@ -22,6 +22,8 @@ public ActionResult Index()
             },
             new List<Change>
             {
+                new Change(new DateTime(2024, 08, 10), "Update Kopfzeile Befundvorlagen", ChangeType.Feature, DatabaseType.None),
+                new Change(new DateTime(2024, 08, 8), "Maske zum Zusammenfügen von Patienten", ChangeType.Feature, DatabaseType.None),
                 new Change(new DateTime(2024, 06, 30), "Stämme: Update Regel 43", ChangeType.Feature, DatabaseType.Meningococci),
                 new Change(new DateTime(2024, 06, 20, 8, 30, 0), "Deutlich schnellere Exporte", ChangeType.Bug, DatabaseType.None),
                 new Change(new DateTime(2024, 06, 20, 8, 0, 0), "Erweiterung der Exporte um Demis ID", ChangeType.Feature, DatabaseType.None),

HaemophilusWeb/Controllers/MeningoPatientSendingController.cs

@@ -97,6 +97,28 @@ private void ValidatePatientBirthdateGreaterOrEqualReceivingDate(PatientSendingV
 
         protected override string IsolateControllerName => "MeningoIsolate";
 
+        protected override IEnumerable<MeningoSending> SendingsByPatient(int patientId)
+        {
+            var queryResult = NotDeletedSendings()
+                .Include(s => s.Patient)
+                .Include(s => s.Isolate)
+                .Where(s => s.MeningoPatientId == patientId);
+            return queryResult;
+        }
+
+        protected override void MergePatients(int patientIdToKeep, int patientIdToDelete)
+        {
+            var sendingsToMigrate = SendingsByPatient(patientIdToDelete);
+            foreach (var sending in sendingsToMigrate)
+            {
+                sending.MeningoPatientId = patientIdToKeep;
+            }
+
+            var patientToDelete = PatientDbSet().Find(patientIdToDelete);
+            PatientDbSet().Remove(patientToDelete);
+            db.SaveChanges();
+        }
+
         protected override IEnumerable<MeningoSending> SendingsMatchingExportQuery(FromToQuery query, ExportType exportType)
         {
             var queryResult = NotDeletedSendings()

HaemophilusWeb/Controllers/PatientSendingController.cs

@@ -83,6 +83,28 @@ protected override void CreateAndEditPreparationsExtensions(PatientSendingViewMo
 
         protected override string IsolateControllerName => "Isolate";
 
+        protected override IEnumerable<Sending> SendingsByPatient(int patientId)
+        {
+            var queryResult = NotDeletedSendings()
+                .Include(s => s.Patient)
+                .Include(s => s.Isolate)
+                .Where(s => s.PatientId == patientId);
+            return queryResult;
+        }
+
+        protected override void MergePatients(int patientIdToKeep, int patientIdToDelete)
+        {
+            var sendingsToMigrate = SendingsByPatient(patientIdToDelete);
+            foreach (var sending in sendingsToMigrate)
+            {
+                sending.PatientId = patientIdToKeep;
+            }
+
+            var patientToDelete = PatientDbSet().Find(patientIdToDelete);
+            PatientDbSet().Remove(patientToDelete);
+            db.SaveChanges();
+        }
+
         protected override IEnumerable<Sending> SendingsMatchingExportQuery(FromToQuery query, ExportType exportType)
         {
             var samplingLocations = exportType == ExportType.Rki || exportType == ExportType.Iris

HaemophilusWeb/Controllers/PatientSendingControllerBase.cs

@@ -7,6 +7,7 @@
 using System.Web.Mvc;
 using DataTables.Mvc;
 using FluentValidation;
+using HaemophilusWeb.Migrations;
 using HaemophilusWeb.Models;
 using HaemophilusWeb.Tools;
 using HaemophilusWeb.Utils;
@@ -85,6 +86,10 @@ protected IQueryable<TSending> NotDeletedSendings()
             return SendingDbSet().Where(s => !s.Deleted);
         }
 
+        protected abstract IEnumerable<TSending> SendingsByPatient(int patientId);
+
+        protected abstract void MergePatients(int patientIdToKeep, int patientIdToDelete);
+
         protected abstract IEnumerable<TSending> SendingsMatchingExportQuery(FromToQuery query, ExportType additionalFilters);
 
         protected abstract ExportDefinition<TSending> CreateRkiExportDefinition();
@@ -114,6 +119,13 @@ protected TSending LoadSendingFromSendingController(int? id)
             return sending;
         }
 
+        protected TPatient LoadPatientFromPatientController(int? id)
+        {
+            var patientResult = patientController.Edit(id) as ViewResult;
+            var patient = (TPatient) patientResult.Model;
+            return patient;
+        }
+
         [HttpPost]
         [Authorize(Roles = DefaultRoles.User)]
         public ActionResult Edit(TViewModel patientSending)
@@ -290,6 +302,61 @@ public ActionResult LaboratoryExport(FromToQuery query)
             return ExportToExcel(query, sendings, CreateLaboratoryExportDefinition(), "Labor");
         }
 
+        [Authorize(Roles = DefaultRoles.User)]
+        public ActionResult MergePatient(MergePatientRequest mergeRequest)
+        {
+            if (!ModelState.IsValid)
+            {
+                return View(mergeRequest);
+            }
+
+            var sendingsOne = SendingsByPatient(mergeRequest.PatientOneId).ToList();
+            if (!sendingsOne.Any())
+            {
+                ModelState.AddModelError(nameof(MergePatientRequest.PatientOneId), "Unbekannter Patient");
+            }
+            var sendingsTwo = SendingsByPatient(mergeRequest.PatientTwoId).ToList();
+            if (!sendingsTwo.Any())
+            {
+                ModelState.AddModelError(nameof(MergePatientRequest.PatientTwoId), "Unbekannter Patient");
+            }
+
+            if (!ModelState.IsValid)
+            {
+                return View(mergeRequest);
+            }
+
+            var confirmation = new MergePatientConfirmation
+            {
+                PatientOne =  sendingsOne.First().Patient.ToReportFormatLong(),
+                PatientOneId = mergeRequest.PatientOneId,
+                PatientOneSendings = sendingsOne.Select(s => s.ToReportFormat()).ToList(),
+                PatientTwo =  sendingsTwo.First().Patient.ToReportFormatLong(),
+                PatientTwoId = mergeRequest.PatientOneId,
+                PatientTwoSendings = sendingsTwo.Select(s => s.ToReportFormat()).ToList(),
+                MainPatient = mergeRequest.MainPatient,
+                Confirmation = true
+            };
+
+            if (!mergeRequest.Confirmation)
+            {
+                return View("MergePatientConfirmation", confirmation);
+            }
+
+            if (mergeRequest.MainPatient == MainPatientSelector.PatientOne)
+            {
+                MergePatients(mergeRequest.PatientOneId, mergeRequest.PatientTwoId);
+            }
+            else
+            {
+                MergePatients(mergeRequest.PatientTwoId, mergeRequest.PatientOneId);
+            }
+
+            return View("MergePatientSuccess", confirmation);
+
+        }
+
+
         [HttpPost]
         [Authorize(Roles = DefaultRoles.User)]
         public JsonResult DataTableAjax([ModelBinder(typeof(DataTablesBinder))] IDataTablesRequest requestParameters)

HaemophilusWeb/HaemophilusWeb.csproj

@@ -600,11 +600,14 @@
     <Compile Include="Validators\EucastClinicalBreakpointValidator.cs" />
     <Compile Include="Validators\HealthOfficeValidator.cs" />
     <Compile Include="Validators\MeningoPatientValidator.cs" />
+    <Compile Include="Validators\MergePatientRequestValidator.cs" />
     <Compile Include="Validators\PatientValidator.cs" />
     <Compile Include="Validators\MeningoSendingValidator.cs" />
     <Compile Include="Validators\SendingValidator.cs" />
     <Compile Include="ViewModels\EpsilometerTestReportModel.cs" />
     <Compile Include="ViewModels\EpsilometerTestViewModel.cs" />
+    <Compile Include="ViewModels\MergePatientConfirmation.cs" />
+    <Compile Include="ViewModels\MergePatientRequest.cs" />
     <Compile Include="ViewModels\IsolateViewModel.cs" />
     <Compile Include="ViewModels\MeningoIsolateViewModel.cs" />
     <Compile Include="ViewModels\PatientSendingViewModel.cs" />
@@ -1049,6 +1052,12 @@
     <Content Include="Views\MeningoSender\Export.cshtml" />
     <Content Include="Scripts\moment.min.js.map" />
     <Content Include="Scripts\moment-with-locales.min.js.map" />
+    <Content Include="Views\MeningoPatientSending\MergePatient.cshtml" />
+    <Content Include="Views\MeningoPatientSending\MergePatientConfirmation.cshtml" />
+    <Content Include="Views\MeningoPatientSending\MergePatientSuccess.cshtml" />
+    <Content Include="Views\PatientSending\MergePatient.cshtml" />
+    <Content Include="Views\PatientSending\MergePatientConfirmation.cshtml" />
+    <Content Include="Views\PatientSending\MergePatientSuccess.cshtml" />
     <None Include="Web.template.config" />
     <Content Include="Web.Debug.config">
       <DependentUpon>Web.template.config</DependentUpon>

HaemophilusWeb/Properties/GlobalAssemblyInfo.cs

@@ -25,5 +25,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("3.38")]
-[assembly: AssemblyFileVersion("3.38")]
+[assembly: AssemblyVersion("3.39")]
+[assembly: AssemblyFileVersion("3.39")]

HaemophilusWeb/Tools/ExportDefinition.cs

@@ -24,6 +24,7 @@ public void AddField<TMember>(Expression<Func<T, TMember>> field, string headerN
             exportedFields.Add(Tuple.Create(wrappedExpression, headerName, typeof(TMember)));
         }
 
+
         protected void AddFieldOnPositiveTestResult<TMember>(Func<T, NativeMaterialTestResult> testResult, Func<T, TMember> field, string headerName)
         {
             AddField(s => testResult(s) == NativeMaterialTestResult.Positive 

HaemophilusWeb/Utils/ReportFormatter.cs

@@ -56,6 +56,17 @@ public static string ToReportFormat(this PatientBase patient)
             return $"{patient.Initials} / {patient.PostalCode}";
         }
 
+        public static string ToReportFormatLong(this PatientBase patient)
+        {
+            return $"Patienten-Nr.: {patient.PatientId},  Initialen: {patient.Initials}, Geschlecht: {EnumUtils.GetEnumDescription<Gender>(patient.Gender)}, Postleitzahl: {patient.PostalCode}";
+        }
+
+        public static string ToReportFormat<TPatient>(this SendingBase<TPatient> sending)
+        {
+            return $"Labornummer: {sending.GetIsolate().LaboratoryNumberWithPrefix}, Labnr. Einsender: {sending.SenderLaboratoryNumber}, Eingangsdatum: {sending.ReceivingDate.ToReportFormat()}, Stammnummer: {sending.GetIsolate().StemNumberWithPrefix}";
+        }
+
+
         public static string ToStemNumberWithPrefix(this int? stemNumber, DatabaseType databaseType = DatabaseType.None)
         {
             var stemNumberString = stemNumber.HasValue? stemNumber.ToString() : " -";

HaemophilusWeb/Validators/MergePatientRequestValidator.cs

@@ -0,0 +1,15 @@
+using FluentValidation;
+using HaemophilusWeb.Models;
+using HaemophilusWeb.ViewModels;
+
+namespace HaemophilusWeb.Validators
+{
+    public class MergePatientRequestValidator : AbstractValidator<MergePatientRequest>
+    {
+        public MergePatientRequestValidator()
+        {
+            RuleFor(m => m.PatientOneId).NotEqual(m => m.PatientTwoId)
+                .WithMessage("Bitte geben Sie zum Zusammenfügen zwei verschiedenen Patientennummern ein");
+        }
+    }
+}

HaemophilusWeb/ViewModels/MergePatientConfirmation.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using DocumentFormat.OpenXml.Office2010.ExcelAc;
+using HaemophilusWeb.Models;
+
+namespace HaemophilusWeb.ViewModels
+{
+    public class MergePatientConfirmation : MergePatientRequest
+    {
+        [Display(Name = "Patient 1")]
+        public string PatientOne { get; set; }
+
+        [Display(Name = "Einsendungen Patient 1")]
+        public List<string> PatientOneSendings { get; set; }
+
+        [Display(Name = "Patient 2")]
+        public string PatientTwo { get; set; }
+
+        [Display(Name = "Einsendungen Patient 2")]
+        public List<string> PatientTwoSendings { get; set; }
+
+    }
+
+    public enum MainPatientSelector
+    {
+        [Description("Patient 1")]
+        PatientOne,
+        [Description("Patient 2")]
+        PatientTwo
+    }
+}

HaemophilusWeb/ViewModels/MergePatientRequest.cs

@@ -0,0 +1,22 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using FluentValidation.Attributes;
+using HaemophilusWeb.Validators;
+
+namespace HaemophilusWeb.ViewModels
+{
+    [Validator(typeof (MergePatientRequestValidator))]
+    public class MergePatientRequest
+    {
+        [Display(Name = "Patienten-Nr. 1")]
+        public int PatientOneId { get; set; }
+
+        [Display(Name = "Patienten-Nr. 2")]
+        public int PatientTwoId { get; set; }
+
+        [Display(Name = "Zusammenfügen zu")]
+        public MainPatientSelector MainPatient { get; set; } 
+
+        public bool Confirmation { get; set; }
+    }
+}

HaemophilusWeb/Views/MeningoPatientSending/MergePatient.cshtml

@@ -0,0 +1,27 @@
+@using HaemophilusWeb.Views.Utils
+@model HaemophilusWeb.ViewModels.MergePatientRequest
+
+@{
+    ViewBag.Title = "Patienten Zusammenfügen (Meningokokken)";
+}
+
+<h3>Patientennummern</h3>
+
+@using (Html.BeginForm())
+{
+    @Html.AntiForgeryToken()
+
+    <div class="form-horizontal">
+        @Html.ValidationSummary(true)
+
+        @Html.TextEditorFor(m => m.PatientOneId)
+        @Html.TextEditorFor(m => m.PatientTwoId)
+
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-10">
+                <input type="submit" name="primary-submit" value="Zusammenfügen vorbereiten" class="btn btn-primary" />
+            </div>
+        </div>
+    </div>
+}
+

HaemophilusWeb/Views/MeningoPatientSending/MergePatientConfirmation.cshtml

@@ -0,0 +1,57 @@
+@using HaemophilusWeb.Views.Utils
+@model HaemophilusWeb.ViewModels.MergePatientConfirmation
+
+@{
+    ViewBag.Title = "Patienten Zusammenfügen (Meningokokken)";
+}
+
+<h3>Bestätigung</h3>
+
+@using (Html.BeginForm())
+{
+    @Html.AntiForgeryToken()
+
+<div class="form-horizontal">
+    @Html.ValidationSummary(true)
+
+    @Html.HiddenFor(m => m.PatientOneId)
+    @Html.HiddenFor(m => m.PatientTwoId)
+    @Html.HiddenFor(m => m.Confirmation)
+
+    @Html.ReadonlyFor(m => m.PatientOne, smXClass: "col-sm-10")
+    <div class="form-group">
+        <div class="col-sm-2 control-label">@Html.LabelFor(m => m.PatientOneSendings)</div>
+        <div class="col-sm-10 form-control-static">
+            <ul>
+                @foreach (var sending in Model.PatientOneSendings)
+                {
+                    <li>@sending</li>
+                }
+            </ul>
+        </div>
+    </div>
+    <hr />
+    @Html.ReadonlyFor(m => m.PatientTwo, smXClass: "col-sm-10")
+    <div class="form-group">
+        <div class="col-sm-2 control-label">@Html.LabelFor(m => m.PatientTwoSendings)</div>
+        <div class="col-sm-10 form-control-static">
+            <ul>
+                @foreach (var sending in Model.PatientTwoSendings)
+                {
+                    <li>@sending</li>
+                }
+            </ul>
+        </div>
+    </div>
+    <hr />
+    @Html.EnumRadioEditorFor(m => m.MainPatient)
+    <hr />
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-10">
+            <input type="submit" name="primary-submit" value="Zusammenfügen und doppelten Patienten löschen" class="btn btn-danger" />
+            @Html.ActionLink("Abbrechen", "MergePatient", "MeningoPatientSending", null, new { @class = "btn btn-secondary" })
+        </div>
+    </div>
+</div>
+}
+