1113

src/Shentun.Peis.Application.Contracts/ThirdBookings/GetThirdBookingListDto.cs

@@ -102,5 +102,10 @@ namespace Shentun.Peis.ThirdBookings
         /// 岗位
         /// </summary>
         public string PositionName { get; set; }
+
+        /// <summary>
+        /// 岗位名称
+        /// </summary>
+        public string Position2 { get; set; }
     }
 }

src/Shentun.Peis.Application/CustomerOrgs/CustomerOrgAppService.cs

@@ -351,7 +351,7 @@ namespace Shentun.Peis.CustomerOrgs
                             displayName = g.Key.DisplayName,
                             id = g.Key.Id,
                             simpleCode = g.Key.SimpleCode,
-                            displayOrder = g.Key.Id == GuidFlag.PersonCustomerOrgId ? 9999 : g.Key.DisplayOrder,
+                            displayOrder = g.Key.Id == GuidFlag.PersonCustomerOrgId ? 999999 : g.Key.DisplayOrder,
                             isChild = g.Any(x => x != null) ? 'Y' : 'N'
                         };
 

src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs

@@ -684,7 +684,7 @@ namespace Shentun.Peis.PatientRegisters
             if (!string.IsNullOrEmpty(input.Phone))
                 entlist = entlist.Where(m => m.patient.MobileTelephone == input.Phone || m.patient.Telephone == input.Phone);
 
-            if (input.SexId != null && input.SexId != ForSexFlag.All)
+            if (input.SexId != null)
                 entlist = entlist.Where(m => m.patientRegister.SexId == input.SexId);
 
             if (!string.IsNullOrEmpty(input.StartDate) && !string.IsNullOrEmpty(input.EndDate))
@@ -826,7 +826,10 @@ namespace Shentun.Peis.PatientRegisters
                 CustomerOrgParentId = _cacheService.GetTopCustomerOrgAsync(s.patientRegister.CustomerOrgId).GetAwaiter().GetResult().Id,
                 CustomerOrgParentName = _cacheService.GetTopCustomerOrgNameAsync(s.patientRegister.CustomerOrgId).GetAwaiter().GetResult(),
                 MedicalPackageName = s.patientRegister.MedicalPackageId == null ? "" : _cacheService.GetMedicalPackageAsync(s.patientRegister.MedicalPackageId.Value).GetAwaiter().GetResult().DisplayName,
-                CustomerOrgGroupName = s.patientRegister.CustomerOrgGroupId == null ? "" : _cacheService.GetCustomerOrgGroupAsync(s.patientRegister.CustomerOrgGroupId.Value).GetAwaiter().GetResult().DisplayName
+                CustomerOrgGroupName = s.patientRegister.CustomerOrgGroupId == null ? "" : _cacheService.GetCustomerOrgGroupAsync(s.patientRegister.CustomerOrgGroupId.Value).GetAwaiter().GetResult().DisplayName,
+                NationName = _cacheService.GetNationNameAsync(s.patient.NationId).GetAwaiter().GetResult(),
+                PersonnelTypeName = _cacheService.GetPersonnelTypeNameAsync(s.patientRegister.PersonnelTypeId).GetAwaiter().GetResult(),
+                MaritalStatusName = _cacheService.GetMaritalStatusNameAsync(s.patientRegister.MaritalStatusId).GetAwaiter().GetResult()
             }).ToList();
 
 

src/Shentun.Peis.Application/ThirdBookings/ThirdBookingAppService.cs

@@ -114,7 +114,8 @@ namespace Shentun.Peis.ThirdBookings
                 DepartmentName = s.DepartmentName,
                 CustomerOrgId = GetCustomerOrgId(customerOrgList, customerOrgId, s.ChildCompanyName, s.DepartmentName),
                 CustomerOrgRegisterId = customerOrgRegisterId,
-                PositionName = s.PositionName
+                PositionName = s.PositionName,
+                Position2 = s.Position2
             }).ToList();
 
             foreach (var item in entListDto)

src/Shentun.Peis.DbMigrator/appsettings.json

@@ -1,10 +1,10 @@
 {
   "ConnectionStrings": {
-    "Default": "Host=140.143.162.39;Port=5432;Database=ShentunPeis240701;User ID=postgres;Password=shentun123;"
+    //"Default": "Host=140.143.162.39;Port=5432;Database=ShentunPeis240701;User ID=postgres;Password=shentun123;"
     //"Default": "Host=192.168.2.67;Port=5432;Database=ShentunPeis;User ID=postgres;Password=st123;"
     //"Default": "Host=localhost;Port=5432;Database=ShentunPeis1218;User ID=postgres;Password=wxd123;"
     //"Default": "Host=10.1.12.140;Port=5432;Database=ShentunPeis0508;User ID=postgres;Password=st123;"
-    //"Default": "Host=192.168.0.188;Port=5432;Database=ShentunPeis;User ID=postgres;Password=St123456;"
+    "Default": "Host=192.168.0.188;Port=5432;Database=ShentunPeis;User ID=postgres;Password=St123456;"
   },
   "OpenIddict": {
     "Applications": {

src/Shentun.Peis.Domain/ThirdBookings/ThirdBooking.cs

@@ -100,7 +100,7 @@ namespace Shentun.Peis.Models
         public string DepartmentName { get; set; }
 
         /// <summary>
-        /// 岗位
+        /// 岗位类别
         /// </summary>
         [StringLength(100)]
         [Column("position_name")]
@@ -153,6 +153,13 @@ namespace Shentun.Peis.Models
         [StringLength(1)]
         public string ConfirmType { get; set; }
 
+        /// <summary>
+        /// 岗位名称
+        /// </summary>
+        [StringLength(100)]
+        [Column("position2")]
+        public string Position2 { get; set; }
+
         [Column("concurrency_stamp")]
         public string ConcurrencyStamp { get; set; }
 

src/Shentun.Peis.EntityFrameworkCore/Migrations/20251112094925_update_third_booking_add_position2.cs

@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class update_third_booking_add_position2 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "position2",
+                table: "third_booking",
+                type: "character varying(100)",
+                maxLength: 100,
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "position2",
+                table: "third_booking");
+        }
+    }
+}

src/Shentun.Peis.EntityFrameworkCore/Migrations/PeisDbContextModelSnapshot.cs

@@ -12054,6 +12054,11 @@ namespace Shentun.Peis.Migrations
                         .HasColumnName("phone")
                         .HasComment("电话");
 
+                    b.Property<string>("Position2")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)")
+                        .HasColumnName("position2");
+
                     b.Property<string>("PositionName")
                         .HasMaxLength(100)
                         .HasColumnType("character varying(100)")

src/Shentun.Peis.HttpApi.Host/PeisHttpApiHostModule.cs

@@ -607,12 +607,6 @@ public class PeisHttpApiHostModule : AbpModule
         });
 
  
-        //旧系统虚拟目录
-        app.UseStaticFiles(new StaticFileOptions
-        {
-            FileProvider = new PhysicalFileProvider("\\\\192.168.0.3\\mypacs\\picture\\"),
-            RequestPath = "/mypacs/picture"
-        });
 
         app.UseRouting();
         app.UseCors();