From 21e3f97891a6a7086b0365b84d88b32a020e69f8 Mon Sep 17 00:00:00 2001 From: Sandipan Mitra Date: Tue, 4 Feb 2025 16:10:40 +0530 Subject: [PATCH] worked for appointment api --- .../Appoinments/Dto/AppointmentDto.cs | 26 ++ .../Dto/CreateOrUpdateAppointmentDto.cs | 28 ++ .../Appointments/AppointmentAppService.cs | 68 ++++- .../Departments/DepartmentAppService.cs | 2 +- .../Doctors/DoctorAppService.cs | 2 +- .../HospitalManagementSystemAppService.cs | 4 +- ...Profile.cs => MainAppAutoMapperProfile.cs} | 14 +- .../Patients/PatientAppService.cs | 6 +- .../appsettings.json | 2 +- ...uctResultDto.cs => PagingSortResultDto.cs} | 2 +- .../Enum/GlobalEnum.cs | 2 +- .../Appointments/Appointment.cs | 4 +- ...lManagementSystemDbContextModelSnapshot.cs | 240 +----------------- .../appsettings.json | 2 +- 14 files changed, 148 insertions(+), 254 deletions(-) create mode 100644 aspnet-core/src/HospitalManagementSystem.Application.Contracts/Appoinments/Dto/AppointmentDto.cs create mode 100644 aspnet-core/src/HospitalManagementSystem.Application.Contracts/Appoinments/Dto/CreateOrUpdateAppointmentDto.cs rename aspnet-core/src/HospitalManagementSystem.Application/{PatientAutoMapperProfile.cs => MainAppAutoMapperProfile.cs} (62%) rename aspnet-core/src/HospitalManagementSystem.Domain.Shared/Dto/{PagingSortProductResultDto.cs => PagingSortResultDto.cs} (76%) diff --git a/aspnet-core/src/HospitalManagementSystem.Application.Contracts/Appoinments/Dto/AppointmentDto.cs b/aspnet-core/src/HospitalManagementSystem.Application.Contracts/Appoinments/Dto/AppointmentDto.cs new file mode 100644 index 0000000..64bdfb1 --- /dev/null +++ b/aspnet-core/src/HospitalManagementSystem.Application.Contracts/Appoinments/Dto/AppointmentDto.cs @@ -0,0 +1,26 @@ +using HospitalManagementSystem.GlobalEnum; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalManagementSystem.Appoinments.Dto +{ + public class AppointmentDto + { + public Guid Id { get; set; } + public string? FirstName { get; set; } + public string? LastName { get; set; } + public Gender Gender { get; set; } + public string? Mobile { get; set; } + public string? Address { get; set; } + public string? Email { get; set; } + public string? DOB { get; set; } + public Guid? DoctorId { get; set; } + public DateTime? DateOfAppointment { get; set; } + public string? TimeOfAppointment { get; set; } + public string? InjuryORContion { get; set; } + public string? Note { get; set; } + } +} diff --git a/aspnet-core/src/HospitalManagementSystem.Application.Contracts/Appoinments/Dto/CreateOrUpdateAppointmentDto.cs b/aspnet-core/src/HospitalManagementSystem.Application.Contracts/Appoinments/Dto/CreateOrUpdateAppointmentDto.cs new file mode 100644 index 0000000..39bce7f --- /dev/null +++ b/aspnet-core/src/HospitalManagementSystem.Application.Contracts/Appoinments/Dto/CreateOrUpdateAppointmentDto.cs @@ -0,0 +1,28 @@ +using HospitalManagementSystem.GlobalEnum; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Numerics; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalManagementSystem.Appoinments.Dto +{ + public class CreateOrUpdateAppointmentDto + { + public Guid Id { get; set; } + public string? FirstName { get; set; } + public string? LastName { get; set; } + public Gender Gender { get; set; } + public string? Mobile { get; set; } + public string? Address { get; set; } + public string? Email { get; set; } + public string? DOB { get; set; } + public Guid? DoctorId { get; set; } + public DateTime? DateOfAppointment { get; set; } + public string? TimeOfAppointment { get; set; } + public string? InjuryORContion { get; set; } + public string? Note { get; set; } + } +} diff --git a/aspnet-core/src/HospitalManagementSystem.Application/Appointments/AppointmentAppService.cs b/aspnet-core/src/HospitalManagementSystem.Application/Appointments/AppointmentAppService.cs index 831e6e4..412494c 100644 --- a/aspnet-core/src/HospitalManagementSystem.Application/Appointments/AppointmentAppService.cs +++ b/aspnet-core/src/HospitalManagementSystem.Application/Appointments/AppointmentAppService.cs @@ -1,4 +1,5 @@ -using System; +using Volo.Abp.Domain.Repositories; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -6,17 +7,30 @@ using System.Threading.Tasks; using Volo.Abp.DependencyInjection; using Volo.Abp.MultiTenancy; using Volo.Abp.Users; +using HospitalManagementSystem.Documents; +using HospitalManagementSystem.Patients.Dto; +using HospitalManagementSystem.Patients; +using HospitalManagementSystem.Permissions; +using Microsoft.AspNetCore.Authorization; +using HospitalManagementSystem.Appoinments.Dto; +using Volo.Abp.ObjectMapping; +using HospitalManagementSystem.Dto; +using Abp.Application.Services.Dto; +using Microsoft.EntityFrameworkCore; +using System.Linq.Dynamic.Core; namespace HospitalManagementSystem.Appointments { - public class AppointmentAppService : HospitalManagementSystemAppService, IAppointmentAppService, ITransientDependency + public class AppointmentAppService : ApplicationService, IAppointmentAppService, ITransientDependency { private readonly ICurrentUser _currentUser; private readonly ICurrentTenant _currentTenant; - public AppointmentAppService(ICurrentUser currentUser, ICurrentTenant currentTenant) + private IRepository _appointmentsRepository; + public AppointmentAppService(ICurrentUser currentUser, ICurrentTenant currentTenant, IRepository appointmentsRepository) { _currentUser = currentUser; _currentTenant = currentTenant; + _appointmentsRepository = appointmentsRepository; } public async Task GetAsync() { @@ -24,5 +38,53 @@ namespace HospitalManagementSystem.Appointments var y = _currentTenant.Id; return _currentUser.Name + " checking done."; } + #region Get Patient List with Paging and Searching + public async Task> GetAppointmentListAsync(PagingSortResultDto input, Guid Id) + { + var queryable = await _appointmentsRepository.GetQueryableAsync(); + + var filteredQuery = queryable + .WhereIf(!string.IsNullOrEmpty(input.Search), x => x.FirstName.ToLower().Contains(input.Search.ToLower()) || x.LastName.ToLower().Contains(input.Search.ToLower())) + .Where(x => x.Id == Id); + + var totalCount = await filteredQuery.CountAsync(); + + filteredQuery = !string.IsNullOrEmpty(input.Sorting) + ? filteredQuery.OrderBy(input.Sorting) + : filteredQuery.OrderBy(x => x.Id); + + var pagedQuery = await filteredQuery + .Skip(input.SkipCount) + .Take(input.MaxResultCount) + .ToListAsync(); + var appoinmentdto = ObjectMapper.Map, List>(pagedQuery); + return new PagedResultDto( + totalCount, + appoinmentdto + ); + + } + #endregion + #region Create Appointment + public async Task CreateAppointmentAsync(CreateOrUpdateAppointmentDto input) + { + var appointment = ObjectMapper.Map(input); + + appointment = await _appointmentsRepository.InsertAsync(appointment); + + return ObjectMapper.Map(appointment); + } + #endregion + + #region Update Appointment + public async Task UpdateAppointmentAsync(Guid id, CreateOrUpdateAppointmentDto input) + { + var appointment = await _appointmentsRepository.GetAsync(id); + var newdata = ObjectMapper.Map(input); + appointment = newdata; + appointment = await _appointmentsRepository.UpdateAsync(appointment); + return ObjectMapper.Map(appointment); + } + #endregion } } diff --git a/aspnet-core/src/HospitalManagementSystem.Application/Departments/DepartmentAppService.cs b/aspnet-core/src/HospitalManagementSystem.Application/Departments/DepartmentAppService.cs index 595aff9..bcf9f06 100644 --- a/aspnet-core/src/HospitalManagementSystem.Application/Departments/DepartmentAppService.cs +++ b/aspnet-core/src/HospitalManagementSystem.Application/Departments/DepartmentAppService.cs @@ -6,7 +6,7 @@ using Volo.Abp.Domain.Repositories; namespace HospitalManagementSystem.Departments { - public class DepartmentAppService : HospitalManagementSystemAppService, IDepartmentAppService + public class DepartmentAppService : ApplicationService, IDepartmentAppService { private readonly IRepository _departmentRepository; public DepartmentAppService(IRepository departmentRepository) diff --git a/aspnet-core/src/HospitalManagementSystem.Application/Doctors/DoctorAppService.cs b/aspnet-core/src/HospitalManagementSystem.Application/Doctors/DoctorAppService.cs index 2490fb9..80e9de1 100644 --- a/aspnet-core/src/HospitalManagementSystem.Application/Doctors/DoctorAppService.cs +++ b/aspnet-core/src/HospitalManagementSystem.Application/Doctors/DoctorAppService.cs @@ -7,7 +7,7 @@ using Volo.Abp.Domain.Repositories; namespace HospitalManagementSystem.Doctors { - public class DoctorAppService : HospitalManagementSystemAppService, IDoctorAppService + public class DoctorAppService : ApplicationService, IDoctorAppService { private readonly IRepository _doctorRepository; public DoctorAppService(IRepository doctorRepository) diff --git a/aspnet-core/src/HospitalManagementSystem.Application/HospitalManagementSystemAppService.cs b/aspnet-core/src/HospitalManagementSystem.Application/HospitalManagementSystemAppService.cs index 6f0786d..4078fca 100644 --- a/aspnet-core/src/HospitalManagementSystem.Application/HospitalManagementSystemAppService.cs +++ b/aspnet-core/src/HospitalManagementSystem.Application/HospitalManagementSystemAppService.cs @@ -8,9 +8,9 @@ namespace HospitalManagementSystem; /* Inherit your application services from this class. */ -public abstract class HospitalManagementSystemAppService : ApplicationService +public abstract class ApplicationService : Volo.Abp.Application.Services.ApplicationService { - protected HospitalManagementSystemAppService() + protected ApplicationService() { LocalizationResource = typeof(HospitalManagementSystemResource); } diff --git a/aspnet-core/src/HospitalManagementSystem.Application/PatientAutoMapperProfile.cs b/aspnet-core/src/HospitalManagementSystem.Application/MainAppAutoMapperProfile.cs similarity index 62% rename from aspnet-core/src/HospitalManagementSystem.Application/PatientAutoMapperProfile.cs rename to aspnet-core/src/HospitalManagementSystem.Application/MainAppAutoMapperProfile.cs index b10b5c0..2f62069 100644 --- a/aspnet-core/src/HospitalManagementSystem.Application/PatientAutoMapperProfile.cs +++ b/aspnet-core/src/HospitalManagementSystem.Application/MainAppAutoMapperProfile.cs @@ -1,4 +1,6 @@ using AutoMapper; +using HospitalManagementSystem.Appoinments.Dto; +using HospitalManagementSystem.Appointments; using HospitalManagementSystem.Patients; using HospitalManagementSystem.Patients.Dto; using System; @@ -9,10 +11,11 @@ using System.Threading.Tasks; namespace HospitalManagementSystem { - public class PatientAutoMapperProfile : Profile + public class MainAppAutoMapperProfile : Profile { - public PatientAutoMapperProfile() + public MainAppAutoMapperProfile() { + #region Patient // Entity to DTO mappings CreateMap(); CreateMap(); @@ -26,6 +29,13 @@ namespace HospitalManagementSystem // DTO to Entity mappings CreateMap(); + #endregion + + #region Appointment + CreateMap(); + CreateMap(); + CreateMap(); + #endregion } } } diff --git a/aspnet-core/src/HospitalManagementSystem.Application/Patients/PatientAppService.cs b/aspnet-core/src/HospitalManagementSystem.Application/Patients/PatientAppService.cs index cd53ffa..6bad524 100644 --- a/aspnet-core/src/HospitalManagementSystem.Application/Patients/PatientAppService.cs +++ b/aspnet-core/src/HospitalManagementSystem.Application/Patients/PatientAppService.cs @@ -23,7 +23,7 @@ using static HospitalManagementSystem.Permissions.HospitalManagementSystemPermis namespace HospitalManagementSystem.Patients { - public class PatientAppService : ApplicationService + public class PatientAppService : Volo.Abp.Application.Services.ApplicationService { private IRepository _patientrecordRepository; private IRepository _patientRepository; @@ -45,7 +45,7 @@ namespace HospitalManagementSystem.Patients #region Get Patient List with Paging and Searching [Authorize(HospitalManagementSystemPermissions.Patient.Default)] - public async Task> GetPatientRecordListAsync(PagingSortPatientResultDto input, Guid Id) + public async Task> GetPatientRecordListAsync(PagingSortResultDto input, Guid Id) { var queryable = await _patientrecordRepository.GetQueryableAsync(); @@ -263,7 +263,7 @@ namespace HospitalManagementSystem.Patients #region Get Patient List with Paging and Searching [Authorize(HospitalManagementSystemPermissions.Patient.Default)] - public async Task> GetPatientListAsync(PagingSortPatientResultDto input) + public async Task> GetPatientListAsync(PagingSortResultDto input) { List query; diff --git a/aspnet-core/src/HospitalManagementSystem.DbMigrator/appsettings.json b/aspnet-core/src/HospitalManagementSystem.DbMigrator/appsettings.json index 31ab9e9..15d685f 100644 --- a/aspnet-core/src/HospitalManagementSystem.DbMigrator/appsettings.json +++ b/aspnet-core/src/HospitalManagementSystem.DbMigrator/appsettings.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "Default": "Server=DESKTOP-JMNM6B1\\MSSQLSERVER19;Database=HospitalManagementSystemTestDb;Trusted_Connection=True;TrustServerCertificate=True" + "Default": "Server=DESKTOP-UO4Q385\\SQLEXPRESS;Database=HospitalManagementSystemTestDb;Trusted_Connection=True;TrustServerCertificate=True" }, "OpenIddict": { "Applications": { diff --git a/aspnet-core/src/HospitalManagementSystem.Domain.Shared/Dto/PagingSortProductResultDto.cs b/aspnet-core/src/HospitalManagementSystem.Domain.Shared/Dto/PagingSortResultDto.cs similarity index 76% rename from aspnet-core/src/HospitalManagementSystem.Domain.Shared/Dto/PagingSortProductResultDto.cs rename to aspnet-core/src/HospitalManagementSystem.Domain.Shared/Dto/PagingSortResultDto.cs index 99c5f05..fb77be2 100644 --- a/aspnet-core/src/HospitalManagementSystem.Domain.Shared/Dto/PagingSortProductResultDto.cs +++ b/aspnet-core/src/HospitalManagementSystem.Domain.Shared/Dto/PagingSortResultDto.cs @@ -7,7 +7,7 @@ using Volo.Abp.Application.Dtos; namespace HospitalManagementSystem.Dto { - public class PagingSortPatientResultDto : PagedAndSortedResultRequestDto + public class PagingSortResultDto : PagedAndSortedResultRequestDto { public string? Search { get; set; } } diff --git a/aspnet-core/src/HospitalManagementSystem.Domain.Shared/Enum/GlobalEnum.cs b/aspnet-core/src/HospitalManagementSystem.Domain.Shared/Enum/GlobalEnum.cs index e78851a..850490d 100644 --- a/aspnet-core/src/HospitalManagementSystem.Domain.Shared/Enum/GlobalEnum.cs +++ b/aspnet-core/src/HospitalManagementSystem.Domain.Shared/Enum/GlobalEnum.cs @@ -9,7 +9,7 @@ namespace HospitalManagementSystem.GlobalEnum public enum Gender { Male = 1, - Female = 2 + Female = 2, } public enum Status diff --git a/aspnet-core/src/HospitalManagementSystem.Domain/Appointments/Appointment.cs b/aspnet-core/src/HospitalManagementSystem.Domain/Appointments/Appointment.cs index c940367..a6b690f 100644 --- a/aspnet-core/src/HospitalManagementSystem.Domain/Appointments/Appointment.cs +++ b/aspnet-core/src/HospitalManagementSystem.Domain/Appointments/Appointment.cs @@ -1,5 +1,5 @@ using HospitalManagementSystem.Doctors; -using HospitalManagementSystem.Enums; +using HospitalManagementSystem.GlobalEnum; using System; using System.ComponentModel.DataAnnotations.Schema; using Volo.Abp.Domain.Entities.Auditing; @@ -10,7 +10,7 @@ namespace HospitalManagementSystem.Appointments { public string? FirstName { get; set; } public string? LastName { get; set; } - public GenderEnum? Gender { get; set; } + public Gender Gender { get; set; } public string? Mobile { get; set; } public string? Address { get; set; } public string? Email { get; set; } diff --git a/aspnet-core/src/HospitalManagementSystem.EntityFrameworkCore/Migrations/HospitalManagementSystemDbContextModelSnapshot.cs b/aspnet-core/src/HospitalManagementSystem.EntityFrameworkCore/Migrations/HospitalManagementSystemDbContextModelSnapshot.cs index 118b16a..e97a0b9 100644 --- a/aspnet-core/src/HospitalManagementSystem.EntityFrameworkCore/Migrations/HospitalManagementSystemDbContextModelSnapshot.cs +++ b/aspnet-core/src/HospitalManagementSystem.EntityFrameworkCore/Migrations/HospitalManagementSystemDbContextModelSnapshot.cs @@ -24,218 +24,7 @@ namespace HospitalManagementSystem.Migrations SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); - modelBuilder.Entity("HospitalManagementSystem.Appointments.Appointment", b => - { - b.Property("Id") - .HasColumnType("uniqueidentifier"); - - b.Property("Address") - .HasColumnType("nvarchar(max)"); - - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnType("uniqueidentifier") - .HasColumnName("CreatorId"); - - b.Property("DOB") - .HasColumnType("nvarchar(max)"); - - b.Property("DateOfAppointment") - .HasColumnType("datetime2"); - - b.Property("DeleterId") - .HasColumnType("uniqueidentifier") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnType("datetime2") - .HasColumnName("DeletionTime"); - - b.Property("DoctorId") - .HasColumnType("uniqueidentifier"); - - b.Property("Email") - .HasColumnType("nvarchar(max)"); - - b.Property("FirstName") - .HasColumnType("nvarchar(max)"); - - b.Property("Gender") - .HasColumnType("int"); - - b.Property("InjuryORContion") - .HasColumnType("nvarchar(max)"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnType("bit") - .HasDefaultValue(false) - .HasColumnName("IsDeleted"); - - b.Property("LastModificationTime") - .HasColumnType("datetime2") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnType("uniqueidentifier") - .HasColumnName("LastModifierId"); - - b.Property("LastName") - .HasColumnType("nvarchar(max)"); - - b.Property("Mobile") - .HasColumnType("nvarchar(max)"); - - b.Property("Note") - .HasColumnType("nvarchar(max)"); - - b.Property("TimeOfAppointment") - .HasColumnType("nvarchar(max)"); - - b.HasKey("Id"); - - b.HasIndex("DoctorId"); - - b.ToTable("Appointments"); - }); - - modelBuilder.Entity("HospitalManagementSystem.Departments.Department", b => - { - b.Property("Id") - .HasColumnType("uniqueidentifier"); - - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnType("uniqueidentifier") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnType("uniqueidentifier") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnType("datetime2") - .HasColumnName("DeletionTime"); - - b.Property("DepartmentDate") - .HasColumnType("datetime2"); - - b.Property("DepartmentHead") - .HasColumnType("nvarchar(max)"); - - b.Property("DepartmentName") - .HasColumnType("nvarchar(max)"); - - b.Property("DepartmentNo") - .HasColumnType("nvarchar(max)"); - - b.Property("Description") - .HasColumnType("nvarchar(max)"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnType("bit") - .HasDefaultValue(false) - .HasColumnName("IsDeleted"); - - b.Property("LastModificationTime") - .HasColumnType("datetime2") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnType("uniqueidentifier") - .HasColumnName("LastModifierId"); - - b.Property("Status") - .HasColumnType("nvarchar(max)"); - - b.HasKey("Id"); - - b.ToTable("Departments"); - }); - - modelBuilder.Entity("HospitalManagementSystem.Doctors.Doctor", b => - { - b.Property("Id") - .HasColumnType("uniqueidentifier"); - - b.Property("Address") - .HasColumnType("nvarchar(max)"); - - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnType("uniqueidentifier") - .HasColumnName("CreatorId"); - - b.Property("DOB") - .HasColumnType("nvarchar(max)"); - - b.Property("DeleterId") - .HasColumnType("uniqueidentifier") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnType("datetime2") - .HasColumnName("DeletionTime"); - - b.Property("DepartmentId") - .HasColumnType("uniqueidentifier"); - - b.Property("Designation") - .HasColumnType("nvarchar(max)"); - - b.Property("Education") - .HasColumnType("nvarchar(max)"); - - b.Property("Email") - .HasColumnType("nvarchar(max)"); - - b.Property("FirstName") - .HasColumnType("nvarchar(max)"); - - b.Property("Gender") - .HasColumnType("nvarchar(max)"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnType("bit") - .HasDefaultValue(false) - .HasColumnName("IsDeleted"); - - b.Property("LastModificationTime") - .HasColumnType("datetime2") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnType("uniqueidentifier") - .HasColumnName("LastModifierId"); - - b.Property("LastName") - .HasColumnType("nvarchar(max)"); - - b.Property("Mobile") - .HasColumnType("nvarchar(max)"); - - b.Property("Password") - .HasColumnType("nvarchar(max)"); - - b.HasKey("Id"); - - b.HasIndex("DepartmentId"); - - b.ToTable("Doctors"); - }); - - modelBuilder.Entity("HospitalManagementSystem.Documents.EntityDocument", b => + modelBuilder.Entity("HospitalManagementSystem.Documents.EntityDocument", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -520,6 +309,7 @@ namespace HospitalManagementSystem.Migrations b.ToTable("PatientRecords", (string)null); }); + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => { b.Property("Id") @@ -2260,25 +2050,7 @@ namespace HospitalManagementSystem.Migrations b.ToTable("AbpTenantConnectionStrings", (string)null); }); - modelBuilder.Entity("HospitalManagementSystem.Appointments.Appointment", b => - { - b.HasOne("HospitalManagementSystem.Doctors.Doctor", "Doctor") - .WithMany("Appointments") - .HasForeignKey("DoctorId"); - - b.Navigation("Doctor"); - }); - - modelBuilder.Entity("HospitalManagementSystem.Doctors.Doctor", b => - { - b.HasOne("HospitalManagementSystem.Departments.Department", "Department") - .WithMany() - .HasForeignKey("DepartmentId"); - - b.Navigation("Department"); - }); - - modelBuilder.Entity("HospitalManagementSystem.Documents.PatientDocument", b => + modelBuilder.Entity("HospitalManagementSystem.Documents.PatientDocument", b => { b.HasOne("HospitalManagementSystem.Documents.EntityDocument", "EntityDocuments") .WithMany() @@ -2334,6 +2106,7 @@ namespace HospitalManagementSystem.Migrations b.Navigation("Patients"); }); + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => { b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) @@ -2476,11 +2249,6 @@ namespace HospitalManagementSystem.Migrations .IsRequired(); }); - modelBuilder.Entity("HospitalManagementSystem.Doctors.Doctor", b => - { - b.Navigation("Appointments"); - }); - modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => { b.Navigation("Actions"); diff --git a/aspnet-core/src/HospitalManagementSystem.HttpApi.Host/appsettings.json b/aspnet-core/src/HospitalManagementSystem.HttpApi.Host/appsettings.json index 1c903e4..6ea233f 100644 --- a/aspnet-core/src/HospitalManagementSystem.HttpApi.Host/appsettings.json +++ b/aspnet-core/src/HospitalManagementSystem.HttpApi.Host/appsettings.json @@ -6,7 +6,7 @@ "RedirectAllowedUrls": "http://localhost:4200" }, "ConnectionStrings": { - "Default": "Server=DESKTOP-JMNM6B1\\MSSQLSERVER19;Database=HospitalManagementSystemTestDb;Trusted_Connection=True;TrustServerCertificate=True" + "Default": "Server=DESKTOP-UO4Q385\\SQLEXPRESS;Database=HospitalManagementSystemTestDb;Trusted_Connection=True;TrustServerCertificate=True" }, "AuthServer": { "Authority": "https://localhost:44360",