diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/Hospital/HospitalBusinessLogic/OfficePackage/AbstractSaveToExcel.cs index 2c8af81..49cebb4 100644 --- a/Hospital/HospitalBusinessLogic/OfficePackage/AbstractSaveToExcel.cs +++ b/Hospital/HospitalBusinessLogic/OfficePackage/AbstractSaveToExcel.cs @@ -89,7 +89,7 @@ namespace HospitalBusinessLogic.OfficePackage { ColumnName = "E", RowIndex = rowIndex, - Text = patient.Item4.ToString(), + Text = patient.Item4.ToShortDateString(), StyleInfo = ExcelStyleInfoType.TextWithBroder }); rowIndex++; diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/Hospital/HospitalBusinessLogic/OfficePackage/AbstractSaveToWord.cs index 6ac408a..0f90169 100644 --- a/Hospital/HospitalBusinessLogic/OfficePackage/AbstractSaveToWord.cs +++ b/Hospital/HospitalBusinessLogic/OfficePackage/AbstractSaveToWord.cs @@ -35,7 +35,7 @@ namespace HospitalBusinessLogic.OfficePackage Texts = new List<(string, WordTextProperties)> { (patient.Item1, new WordTextProperties { Size = "24"}), (" " + patient.Item2, new WordTextProperties { Size = "24", }), - (" " + patient.Item3, new WordTextProperties { Size = "24", }), (", " + patient.Item4, new WordTextProperties { Size = "24", }) }, + (" " + patient.Item3, new WordTextProperties { Size = "24", }), (", " + patient.Item4.ToShortDateString(), new WordTextProperties { Size = "24", }) }, TextProperties = new WordTextProperties { Size = "24", diff --git a/Hospital/HospitalDatabaseImplement/Models/Recipe.cs b/Hospital/HospitalDatabaseImplement/Models/Recipe.cs index 2eb4847..27549fc 100644 --- a/Hospital/HospitalDatabaseImplement/Models/Recipe.cs +++ b/Hospital/HospitalDatabaseImplement/Models/Recipe.cs @@ -131,13 +131,18 @@ namespace HospitalDatabaseImplement.Models context.SaveChanges(); } var recipe = context.Recipes.First(x => x.Id == Id); + var existingTreatmentsIds = recipeTreatments?.Select(x => x.TreatmentId).ToList(); foreach (var rec in model.RecipeTreatments) { - context.RecipeTreatments.Add(new RecipeTreatment + if (existingTreatmentsIds != null && !existingTreatmentsIds.Contains(rec.Key)) + { + context.RecipeTreatments.Add(new RecipeTreatment { Recipe = recipe, Treatment = context.Treatments.First(x => x.Id == rec.Key), - }); + }); + } + context.SaveChanges(); } _recipeTreatments = null;