0528

src/Shentun.Peis.Application/CustomerReports/CustomerReportAppService.cs

@@ -241,7 +241,7 @@ namespace Shentun.Peis.CustomerReports
         [HttpPost("api/customerreport/getpositivepatientregisterreportstandard")]
         public async Task<List<GetPositivePatientRegisterReportStandardDto>> GetPositivePatientRegisterReportStandardAsync(GetPositivePatientRegisterReportRequestDto input)
         {
-            var customerOrgList = await _customerOrgRepository.GetListAsync();
+            //var customerOrgList = await _customerOrgRepository.GetListAsync();
 
             var query = from c in await _sumDiagnosisRepository.GetQueryableAsync()
                         join a in await _patientRegisterRepository.GetQueryableAsync() on c.PatientRegisterId equals a.Id
@@ -356,7 +356,24 @@ namespace Shentun.Peis.CustomerReports
             }
 
 
-            var entlist = sumquery.GroupBy(g => g.c.DiagnosisId).Select(s => new GetPositivePatientRegisterReportStandardDto
+            //var entlist = sumquery.ToList().GroupBy(g => g.c.DiagnosisId).Select(s => new GetPositivePatientRegisterReportStandardDto
+            //{
+            //    DiagnosisName = s.FirstOrDefault().ad != null ? s.FirstOrDefault().ad.DisplayName : "",
+            //    PatientRegisters = s.Select(sa => new GetPositivePatientRegisterReportStandard_PatientRegister
+            //    {
+            //        PatientName = sa.a.PatientName,
+            //        Age = sa.a.Age,
+            //        PatientNo = sa.ab.PatientNo,
+            //        DepartmentName = EntityHelper.GetCustomerOrgNameNoSql(customerOrgList, s.FirstOrDefault().a.CustomerOrgId),
+            //        MedicalTimes = sa.a.MedicalTimes,
+            //        MobileTelephone = sa.ab.MobileTelephone,
+            //        PatientRegisterNo = sa.a.PatientRegisterNo,
+            //        Telephone = sa.ab.Telephone,
+            //        SexName = sa.ae != null ? sa.ae.DisplayName : ""
+            //    }).ToList()
+            //}).ToList();
+
+            var entlist = sumquery.ToList().GroupBy(g => g.c.DiagnosisId).Select(s => new GetPositivePatientRegisterReportStandardDto
             {
                 DiagnosisName = s.FirstOrDefault().ad != null ? s.FirstOrDefault().ad.DisplayName : "",
                 PatientRegisters = s.Select(sa => new GetPositivePatientRegisterReportStandard_PatientRegister
@@ -364,7 +381,7 @@ namespace Shentun.Peis.CustomerReports
                     PatientName = sa.a.PatientName,
                     Age = sa.a.Age,
                     PatientNo = sa.ab.PatientNo,
-                    DepartmentName = EntityHelper.GetCustomerOrgNameNoSql(customerOrgList, s.FirstOrDefault().a.CustomerOrgId),
+                    DepartmentName = _cacheService.GetCustomerOrgNameAsync(s.FirstOrDefault().a.CustomerOrgId).GetAwaiter().GetResult(),
                     MedicalTimes = sa.a.MedicalTimes,
                     MobileTelephone = sa.ab.MobileTelephone,
                     PatientRegisterNo = sa.a.PatientRegisterNo,

src/Shentun.Peis.Domain/RegisterCheckAsbitems/RegisterCheckAsbitem.cs

@@ -14,6 +14,7 @@ namespace Shentun.Peis.Models
     [Table("register_check_asbitem")]
     [Index(nameof(PatientRegisterId), nameof(AsbitemId), Name = "ix_register_asbitem", IsUnique = true)]
     [Index(nameof(ChargeRequestId), Name = "ix_register_check_charge_request_id")]
+    [Index(nameof(LisRequestId), Name = "ix_register_check_asbitem_lis_request_id")]
     public class RegisterCheckAsbitem : AuditedEntity<Guid>, IHasConcurrencyStamp
     {
         public RegisterCheckAsbitem()

src/Shentun.Peis.EntityFrameworkCore/Migrations/20250516043048_add_register_check_asbitem_ix_register_check_asbitem_lis_request_id.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class add_register_check_asbitem_ix_register_check_asbitem_lis_request_id : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "ix_register_check_asbitem_lis_request_id",
+                table: "register_check_asbitem",
+                column: "lis_request_id");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "ix_register_check_asbitem_lis_request_id",
+                table: "register_check_asbitem");
+        }
+    }
+}

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

@@ -9142,6 +9142,8 @@ namespace Shentun.Peis.Migrations
                     b.HasIndex(new[] { "PatientRegisterId", "AsbitemId" }, "ix_register_asbitem")
                         .IsUnique();
 
+                    b.HasIndex(new[] { "LisRequestId" }, "ix_register_check_asbitem_lis_request_id");
+
                     b.HasIndex(new[] { "ChargeRequestId" }, "ix_register_check_charge_request_id");
 
                     b.ToTable("register_check_asbitem");
@@ -13021,7 +13023,7 @@ namespace Shentun.Peis.Migrations
                         .HasColumnName("method_name");
 
                     b.Property<string>("Parameters")
-                        .HasMaxLength(2000)
+                        .HasMaxLength(50000)
                         .HasColumnType("text")
                         .HasColumnName("parameters");