职业病

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

@@ -112,16 +112,19 @@ namespace Shentun.Peis.OccupationalDiseases
 
             var patientOccupationalDiseaseInput = ObjectMapper.Map<PatientOccupationalDiseaseInputDto, PatientOccupationalDisease>(input.PatientOccupationalDisease);
 
+            patientOccupationalDiseaseInput.PatientRegisterId = input.PatientRegisterId;
+
             var patientOccupationalDiseaseEnt = await _patientOccupationalDiseaseRepository.FirstOrDefaultAsync(f => f.PatientRegisterId == input.PatientRegisterId);
             if (patientOccupationalDiseaseEnt == null)
             {
+               
                 var entity = _patientOccupationalDiseaseManager.CreateAsync(patientOccupationalDiseaseInput);
-                await _patientOccupationalDiseaseRepository.InsertAsync(entity);
+                await _patientOccupationalDiseaseRepository.InsertAsync(entity, true);
             }
             else
             {
                 _patientOccupationalDiseaseManager.UpdateAsync(patientOccupationalDiseaseEnt, patientOccupationalDiseaseInput);
-                await _patientOccupationalDiseaseRepository.UpdateAsync(patientOccupationalDiseaseEnt);
+                await _patientOccupationalDiseaseRepository.UpdateAsync(patientOccupationalDiseaseEnt, true);
             }
             #endregion
 
@@ -139,7 +142,7 @@ namespace Shentun.Peis.OccupationalDiseases
                 });
             }
 
-            await _patientPoisonRepository.InsertManyAsync(patientPoisonList);
+            await _patientPoisonRepository.InsertManyAsync(patientPoisonList, true);
             #endregion
 
             #region 症状
@@ -158,7 +161,7 @@ namespace Shentun.Peis.OccupationalDiseases
                 });
             }
 
-            await _patientSymptomRepository.InsertManyAsync(patientSymptomList);
+            await _patientSymptomRepository.InsertManyAsync(patientSymptomList, true);
 
             #endregion
 
@@ -182,7 +185,7 @@ namespace Shentun.Peis.OccupationalDiseases
                 });
             }
 
-            await _patientOccupationalHistoryRepository.InsertManyAsync(patientOccupationalHistoryList);
+            await _patientOccupationalHistoryRepository.InsertManyAsync(patientOccupationalHistoryList, true);
 
             #endregion
 
@@ -213,7 +216,7 @@ namespace Shentun.Peis.OccupationalDiseases
             #region 基础信息
 
             var patientOccupationalDiseaseEnt = await _patientOccupationalDiseaseRepository.FirstOrDefaultAsync(f => f.PatientRegisterId == input.PatientRegisterId);
-            if (patientOccupationalDiseaseEnt == null)
+            if (patientOccupationalDiseaseEnt != null)
             {
                 result.PatientOccupationalDisease = new PatientOccupationalDiseaseDto
                 {
@@ -407,7 +410,7 @@ namespace Shentun.Peis.OccupationalDiseases
             {
                 return null;
             }
-          
+
             //将子项目类别设置为父项目类别
             var itemTypes = await _itemTypeRepository.GetListAsync();
             foreach (var listItem in list)
@@ -468,7 +471,7 @@ namespace Shentun.Peis.OccupationalDiseases
 
                 };
                 detailedResultsList_Asbitem.Summarys = detailedResultsList_Asbitem.Summarys.Distinct().ToList();
-               
+
 
 
                 detailedResultsList_Asbitems.Add(detailedResultsList_Asbitem);

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

@@ -58,7 +58,8 @@ namespace Shentun.Peis.PatientOccupationalDiseases
                 SmokeNum = entity.SmokeNum,
                 SmokeYears = entity.SmokeYears,
                 StillbirthTimes = entity.StillbirthTimes,
-                TotalWorkTime = entity.TotalWorkTime
+                TotalWorkTime = entity.TotalWorkTime,
+                PatientRegisterId = entity.PatientRegisterId
             };
         }
 
@@ -105,6 +106,7 @@ namespace Shentun.Peis.PatientOccupationalDiseases
             targetEntity.SmokeYears = sourceEntity.SmokeYears;
             targetEntity.StillbirthTimes = sourceEntity.StillbirthTimes;
             targetEntity.TotalWorkTime = sourceEntity.TotalWorkTime;
+            targetEntity.PatientRegisterId = sourceEntity.PatientRegisterId;
         }
     }
 }

src/Shentun.Peis.EntityFrameworkCore/DbMapping/PatientOccupationalDiseases/PatientOccupationalDiseaseDbMapping.cs

@@ -19,13 +19,13 @@ namespace Shentun.Peis.DbMapping
 
             entity.Property(e => e.Id).ValueGeneratedNever();
 
-          
+
 
             entity.Property(e => e.OcCheckTypeId).IsFixedLength().IsRequired();
 
             entity.HasOne(d => d.PatientRegister)
                 .WithOne(p => p.PatientOccupationalDisease)
-                .HasForeignKey<PatientOccupationalDisease>(d => d.Id)
+                .HasForeignKey<PatientOccupationalDisease>(d => d.PatientRegisterId)
                 .HasConstraintName("fk_patient");
 
             entity.ConfigureByConvention();

src/Shentun.Peis.EntityFrameworkCore/Migrations/20240522092401_init20240522001.cs

@@ -0,0 +1,49 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class init20240522001 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "fk_patient",
+                table: "patient_occupational_disease");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_patient_occupational_disease_patient_register_id",
+                table: "patient_occupational_disease",
+                column: "patient_register_id",
+                unique: true);
+
+            migrationBuilder.AddForeignKey(
+                name: "fk_patient",
+                table: "patient_occupational_disease",
+                column: "patient_register_id",
+                principalTable: "patient_register",
+                principalColumn: "id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "fk_patient",
+                table: "patient_occupational_disease");
+
+            migrationBuilder.DropIndex(
+                name: "IX_patient_occupational_disease_patient_register_id",
+                table: "patient_occupational_disease");
+
+            migrationBuilder.AddForeignKey(
+                name: "fk_patient",
+                table: "patient_occupational_disease",
+                column: "id",
+                principalTable: "patient_register",
+                principalColumn: "id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

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

@@ -6569,6 +6569,9 @@ namespace Shentun.Peis.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("PatientRegisterId")
+                        .IsUnique();
+
                     b.ToTable("patient_occupational_disease");
                 });
 
@@ -13425,7 +13428,7 @@ namespace Shentun.Peis.Migrations
                 {
                     b.HasOne("Shentun.Peis.Models.PatientRegister", "PatientRegister")
                         .WithOne("PatientOccupationalDisease")
-                        .HasForeignKey("Shentun.Peis.Models.PatientOccupationalDisease", "Id")
+                        .HasForeignKey("Shentun.Peis.Models.PatientOccupationalDisease", "PatientRegisterId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired()
                         .HasConstraintName("fk_patient");