12100

src/Shentun.Peis.Application.Contracts/DirectorManagement/GetAsbitemDto.cs

@@ -17,13 +17,13 @@ namespace Shentun.Peis.DirectorManagement
         /// 适用性别，M-男,F-女，A-全部
         /// </summary>
         public string ForSexName { get; set; }
-        
+
         /// <summary>
         /// 婚姻状况
         /// </summary>
         public string MaritalStatusName { get; set; }
 
-        
+
 
         /// <summary>
         /// 标准价格

src/Shentun.Peis.Application.Contracts/DirectorManagement/GetMedicalPackageDto.cs

@@ -26,7 +26,7 @@ namespace Shentun.Peis.DirectorManagement
         /// </summary>
         public string MaritalStatusName { get; set; }
 
-      
+
 
         /// <summary>
         /// 备注

src/Shentun.Peis.Application/CCTJExportDatas/CCTJExportDataAppService.cs

@@ -3375,6 +3375,9 @@ namespace Shentun.Peis.CCTJExportDatas
                         SummaryDate = string.IsNullOrEmpty(row["summary_date"].ToString()) ? null : Convert.ToDateTime(row["summary_date"].ToString()),
                         SummaryDoctorId = summaryDoctorId,
                         ThirdInfo = row["third_info"].ToString(),
+                        IsReceiveReport = Convert.ToChar(row["report_send_flag"].ToString()),
+                        ReportReceiveDate = string.IsNullOrEmpty(row["report_recipient_date"].ToString()) ? null : Convert.ToDateTime(row["report_recipient_date"].ToString()),
+                        ReportReceiveName = row["report_recipient"].ToString()
                     };
 
 

src/Shentun.Peis.Application/DiagnosisFunctions/DiagnosisFunctionAppService.cs

@@ -442,7 +442,8 @@ namespace Shentun.Peis.DiagnosisFunctions
                 if (asbitem.IsDiagnosisFunction == 'Y' && !string.IsNullOrWhiteSpace(asbitem.DiagnosisFunction))
                 {
                     var diagnosis = diagnosisBuilder.GetAsbitemDiagnosisResult(patientAsbitemDiagnosisInput, asbitem.DiagnosisFunction);
-                    diagnosisList.Add(diagnosis);
+                    List<string> ds = diagnosis.Split("$$", StringSplitOptions.RemoveEmptyEntries).ToList();
+                    diagnosisList.AddRange(ds);
                     if (asbitem.IsContinueProcess != 'Y')
                     {
                         //有一个不允许继续处理，则不允许继续处理
@@ -868,15 +869,20 @@ namespace Shentun.Peis.DiagnosisFunctions
                 {
                     continue;
                 }
-                var templatesList = itemInput.ItemResultMatches.Where(o => resultSplit.Contains(o.Result)).ToList();
+                var templatesList = itemInput.ItemResultMatches.Where(o => resultSplit.Contains(o.Result)).OrderByDescending(o => o.Result.Length).ToList();
+                List<string> tempResultAdd = new List<string>();
                 foreach (var template in templatesList)
                 {
                     if (template != null && template.DiagnosisId != Guid.Empty)
                     {
-                        var temp_diagnosis = await _diagnosisRepository.FirstOrDefaultAsync(m => m.Id == template.DiagnosisId);
-                        if (temp_diagnosis != null)
+                        if (tempResultAdd.Count(c => c.Contains(template.Result)) == 0)
                         {
-                            diagnosisList.Add(temp_diagnosis.DisplayName);
+                            var temp_diagnosis = await _diagnosisRepository.FirstOrDefaultAsync(m => m.Id == template.DiagnosisId);
+                            if (temp_diagnosis != null)
+                            {
+                                tempResultAdd.Add(template.Result);
+                                diagnosisList.Add(temp_diagnosis.DisplayName);
+                            }
                         }
                     }
                 }

src/Shentun.Peis.Application/DirectorManagements/DirectorManagementAppService.cs

@@ -408,7 +408,7 @@ namespace Shentun.Peis.DirectorManagements
             {
                 DisplayOrder = s.DisplayOrder,
                 ForSexName = GetForSexName(s.ForSexId),
-                MaritalStatusName = _cacheService.GetMaritalStatusNameAsync(s.MaritalStatusId).GetAwaiter().GetResult(),
+                MaritalStatusName = GetMaritalStatus(s.MaritalStatusId),
                 MedicalPackageName = s.DisplayName,
                 Price = s.Price,
                 Remark = s.Remark
@@ -440,7 +440,7 @@ namespace Shentun.Peis.DirectorManagements
             {
                 DisplayOrder = s.DisplayOrder,
                 ForSexName = GetForSexName(s.ForSexId),
-                MaritalStatusName = _cacheService.GetMaritalStatusNameAsync(s.MaritalStatusId).GetAwaiter().GetResult(),
+                MaritalStatusName = GetMaritalStatus(s.MaritalStatusId),
                 AsbitemName = s.DisplayName,
                 Price = s.Price
             }).OrderBy(o => o.DisplayOrder).ToList();
@@ -492,7 +492,7 @@ namespace Shentun.Peis.DirectorManagements
                 query = query.Where(m => m.patientRegister.PatientRegisterNo == input.PatientRegisterNo);
             }
 
-            var entListDto = query.Select(s => new GetPeisReportDto
+            var entListDto = query.ToList().Select(s => new GetPeisReportDto
             {
                 Age = s.patientRegister.Age == null ? "" : s.patientRegister.Age.ToString(),
                 MedicalStartDate = DataHelper.ConversionDateShortToString(s.patientRegister.MedicalStartDate),
@@ -655,6 +655,29 @@ namespace Shentun.Peis.DirectorManagements
             return msg;
         }
 
+        /// <summary>
+        /// 转换婚姻状况
+        /// </summary>
+        /// <param name="maritalStatusId"></param>
+        /// <returns></returns>
+        private string GetMaritalStatus(char maritalStatusId)
+        {
+            string msg = "";
+            if (maritalStatusId == 'A')
+            {
+                msg = "全部";
+            }
+            else if (maritalStatusId == '0')
+            {
+                msg = "未婚";
+            }
+            else if (maritalStatusId == '1')
+            {
+                msg = "已婚";
+            }
+            return msg;
+        }
+
         /// <summary>
         /// 转换人员状态
         /// </summary>

src/Shentun.Peis.Domain/PatientRegisters/PatientRegister.cs

@@ -356,6 +356,7 @@ namespace Shentun.Peis.Models
         /// 报告领取人
         /// </summary>
         [Column("report_receive_name")]
+        [StringLength(30)]
         public string ReportReceiveName { get; set; }
 
         /// <summary>

src/Shentun.Peis.EntityFrameworkCore/Migrations/20251210035959_update_patient_register_update_report_receive_length.cs

@@ -0,0 +1,39 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class update_patient_register_update_report_receive_length : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "report_receive_name",
+                table: "patient_register",
+                type: "character varying(30)",
+                maxLength: 30,
+                nullable: true,
+                comment: "报告领取人",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true,
+                oldComment: "报告领取人");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "report_receive_name",
+                table: "patient_register",
+                type: "text",
+                nullable: true,
+                comment: "报告领取人",
+                oldClrType: typeof(string),
+                oldType: "character varying(30)",
+                oldMaxLength: 30,
+                oldNullable: true,
+                oldComment: "报告领取人");
+        }
+    }
+}

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

@@ -19,7 +19,7 @@ namespace Shentun.Peis.Migrations
 #pragma warning disable 612, 618
             modelBuilder
                 .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
-                .HasAnnotation("ProductVersion", "6.0.5")
+                .HasAnnotation("ProductVersion", "6.0.19")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -7894,7 +7894,8 @@ namespace Shentun.Peis.Migrations
                         .HasComment("报告领取时间");
 
                     b.Property<string>("ReportReceiveName")
-                        .HasColumnType("text")
+                        .HasMaxLength(30)
+                        .HasColumnType("character varying(30)")
                         .HasColumnName("report_receive_name")
                         .HasComment("报告领取人");
 
@@ -13102,7 +13103,7 @@ namespace Shentun.Peis.Migrations
                         .HasColumnName("method_name");
 
                     b.Property<string>("Parameters")
-                        .HasMaxLength(2000)
+                        .HasMaxLength(50000)
                         .HasColumnType("text")
                         .HasColumnName("parameters");