职业病加编号

src/Shentun.Peis.Application.Contracts/OccupationalDiseases/OccupationalDiseaseWithDetailInputDto.cs

@@ -227,6 +227,7 @@ namespace Shentun.Peis.OccupationalDiseases
         /// </summary>
         public string Other { get; set; }
 
+
         ///// <summary>
         ///// 职业性异常
         ///// </summary>
@@ -251,6 +252,11 @@ namespace Shentun.Peis.OccupationalDiseases
         ///// 处理意见
         ///// </summary>
         //public string HandleSuggestion { get; set; }
+
+        /// <summary>
+        /// 职业病编号
+        /// </summary>
+        public string OccupationalDiseaseNumber { get; set; }
     }
 
     public class PatientPoisonInputDto

src/Shentun.Peis.Application.Contracts/OccupationalDiseases/PatientOccupationalDiseaseDto.cs

@@ -156,5 +156,10 @@ namespace Shentun.Peis.OccupationalDiseases
         /// 处理意见
         /// </summary>
         public string HandleSuggestion { get; set; }
+
+        /// <summary>
+        /// 职业病编号
+        /// </summary>
+        public string OccupationalDiseaseNumber { get; set; }
     }
 }

src/Shentun.Peis.Application.Contracts/PrintReports/OccupationalDiseaseMedicalReportDto.cs

@@ -2,6 +2,7 @@
 using Shentun.Peis.OccupationalDiseases;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text;
 
@@ -237,6 +238,12 @@ namespace Shentun.Peis.PrintReports
         /// 处理意见
         /// </summary>
         public string HandleSuggestion { get; set; }
+
+
+        /// <summary>
+        /// 职业病编号
+        /// </summary>
+        public string OccupationalDiseaseNumber { get; set; }
     }
 
 

src/Shentun.Peis.Application/OccupationalDiseases/OccupationalDiseaseAppService.cs

@@ -592,7 +592,8 @@ namespace Shentun.Peis.OccupationalDiseases
                     StillbirthTimes = patientOccupationalDiseaseEnt.StillbirthTimes,
                     TotalWorkTime = patientOccupationalDiseaseEnt.TotalWorkTime,
                     CreatorName = _cacheService.GetSurnameAsync(patientOccupationalDiseaseEnt.CreatorId).Result,
-                    LastModifierName = _cacheService.GetSurnameAsync(patientOccupationalDiseaseEnt.LastModifierId).Result
+                    LastModifierName = _cacheService.GetSurnameAsync(patientOccupationalDiseaseEnt.LastModifierId).Result,
+                    OccupationalDiseaseNumber = patientOccupationalDiseaseEnt.OccupationalDiseaseNumber
                 };
             }
 

src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs

@@ -662,7 +662,8 @@ namespace Shentun.Peis.PrintReports
                 SmokeNumMax = patientOccupationalDiseaseEnt.patientOccupationalDisease.SmokeNum != null ? patientOccupationalDiseaseEnt.patientOccupationalDisease.SmokeNum + 5 : null,
                 SmokeYears = patientOccupationalDiseaseEnt.patientOccupationalDisease.SmokeYears,
                 StillbirthTimes = patientOccupationalDiseaseEnt.patientOccupationalDisease.StillbirthTimes,
-                TotalWorkTime = patientOccupationalDiseaseEnt.patientOccupationalDisease.TotalWorkTime
+                TotalWorkTime = patientOccupationalDiseaseEnt.patientOccupationalDisease.TotalWorkTime,
+                OccupationalDiseaseNumber = patientOccupationalDiseaseEnt.patientOccupationalDisease.OccupationalDiseaseNumber
             };
             #endregion
 

src/Shentun.Peis.Domain/PatientOccupationalDiseases/PatientOccupationalDisease.cs

@@ -213,6 +213,13 @@ namespace Shentun.Peis.Models
         [Column("handle_suggestion", TypeName = "text")]
         public string? HandleSuggestion { get; set; }
 
+        /// <summary>
+        /// 职业病编号
+        /// </summary>
+        [Column("occupational_disease_number")]
+        [StringLength(50)]
+        public string OccupationalDiseaseNumber { get; set; }
+
 
         [Column("concurrency_stamp")]
         public string ConcurrencyStamp { get; set; }

src/Shentun.Peis.Domain/PatientOccupationalDiseases/PatientOccupationalDiseaseManager.cs

@@ -61,7 +61,8 @@ namespace Shentun.Peis.PatientOccupationalDiseases
                 SmokeYears = entity.SmokeYears,
                 StillbirthTimes = entity.StillbirthTimes,
                 TotalWorkTime = entity.TotalWorkTime,
-                PatientRegisterId = entity.PatientRegisterId
+                PatientRegisterId = entity.PatientRegisterId,
+                OccupationalDiseaseNumber = entity.OccupationalDiseaseNumber
             };
         }
 
@@ -106,6 +107,7 @@ namespace Shentun.Peis.PatientOccupationalDiseases
             targetEntity.PatientRegisterId = sourceEntity.PatientRegisterId;
             targetEntity.FamilyGeneticHistory = sourceEntity.FamilyGeneticHistory;
             targetEntity.RiskFactors = sourceEntity.RiskFactors;
+            targetEntity.OccupationalDiseaseNumber = sourceEntity.OccupationalDiseaseNumber;
         }
 
 
@@ -116,7 +118,7 @@ namespace Shentun.Peis.PatientOccupationalDiseases
         /// <returns></returns>
         public async Task<char> GetPatientRegisterIsOccupationalDisease(Guid PatientRegisterId)
         {
-           var isPatientOccupationalDisease = await _patientOccupationalDiseaseRepository.FirstOrDefaultAsync(c => c.PatientRegisterId == PatientRegisterId);
+            var isPatientOccupationalDisease = await _patientOccupationalDiseaseRepository.FirstOrDefaultAsync(c => c.PatientRegisterId == PatientRegisterId);
             if (isPatientOccupationalDisease != null)
             {
                 return 'Y';

src/Shentun.Peis.EntityFrameworkCore/Migrations/20241126060411_update_patient_occupational_disease_add_occupational_disease_number.cs

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

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

@@ -7174,6 +7174,11 @@ namespace Shentun.Peis.Migrations
                         .HasColumnType("text")
                         .HasColumnName("occupational_abnormal");
 
+                    b.Property<string>("OccupationalDiseaseNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("occupational_disease_number");
+
                     b.Property<string>("Other")
                         .HasMaxLength(200)
                         .HasColumnType("character varying(200)")