职业病

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

@@ -50,7 +50,7 @@ namespace Shentun.Peis.OccupationalDiseases
         /// </summary>
         /// <returns></returns>
         [HttpPost("api/app/OccupationalDisease/CreateOccupationalDiseaseWithDetail")]
-        public async Task CreateOccupationalDiseaseWithDetailAsync(OccupationalDiseaseWithDetailInputDto input)
+        public async Task<OccupationalDiseaseWithDetailByPatientRegisterIdDto> CreateOccupationalDiseaseWithDetailAsync(OccupationalDiseaseWithDetailInputDto input)
         {
             if (input == null)
             {
@@ -139,6 +139,11 @@ namespace Shentun.Peis.OccupationalDiseases
             await _patientOccupationalHistoryRepository.InsertManyAsync(patientOccupationalHistoryList);
 
             #endregion
+
+            return await GetOccupationalDiseaseWithDetailByPatientRegisterIdAsync(new PatientRegisterIdInputDto
+            {
+                PatientRegisterId = input.PatientRegisterId
+            });
         }
 
 
@@ -287,7 +292,7 @@ namespace Shentun.Peis.OccupationalDiseases
         /// 修改检查结论
         /// </summary>
         /// <returns></returns>
-        [HttpPost("api/app/OccupationalDisease/GetOccupationalDiseaseWithDetailByPatientRegisterId")]
+        [HttpPost("api/app/OccupationalDisease/UpdateOccupationalDiseaseInspectionConclusion")]
         public async Task UpdateOccupationalDiseaseInspectionConclusionAsync(OccupationalDiseaseInspectionConclusionInputDto input)
         {
             var patientOccupationalDiseaseEnt = await _patientOccupationalDiseaseRepository.FirstOrDefaultAsync(F => F.PatientRegisterId == input.PatientRegisterId);

src/Shentun.Peis.Application/Poisons/PoisonAppService.cs

@@ -70,6 +70,7 @@ namespace Shentun.Peis.Poisons
                 CreatorId = s.CreatorId,
                 DisplayName = s.DisplayName,
                 DisplayOrder = s.DisplayOrder,
+                PoisonTypeId = s.PoisonTypeId,
                 Id = s.Id,
                 LastModificationTime = s.LastModificationTime,
                 LastModifierId = s.LastModifierId,

src/Shentun.Peis.Domain/Poisons/PoisonManager.cs

@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Domain.Services;
 using Volo.Abp;
+using Volo.Abp.Domain.Entities;
 
 namespace Shentun.Peis.Poisons
 {
@@ -37,12 +38,17 @@ namespace Shentun.Peis.Poisons
         {
             DataHelper.CheckEntityIsNull(entity);
             DataHelper.CheckStringIsNull(entity.DisplayName, "名称");
-            await EntityHelper.CheckSameName<Poison, Guid>(_poisonRepository, entity.DisplayName);
+
+            var isPoison = await _poisonRepository.FirstOrDefaultAsync(f => f.PoisonTypeId == entity.PoisonTypeId && f.DisplayName == entity.DisplayName);
+            if (isPoison != null)
+                throw new UserFriendlyException($"毒害因素{entity.DisplayName}已存在");
+            //await EntityHelper.CheckSameName<Poison, Guid>(_poisonRepository, entity.DisplayName);
             return new Poison
             {
                 DisplayName = entity.DisplayName,
                 SimpleCode = LanguageConverter.GetPYSimpleCode(entity.DisplayName),
-                DisplayOrder = await EntityHelper.CreateMaxDisplayOrder<Poison>(_poisonRepository)
+                DisplayOrder = await EntityHelper.CreateMaxDisplayOrder<Poison>(_poisonRepository),
+                PoisonTypeId = entity.PoisonTypeId
             };
         }
 
@@ -62,13 +68,18 @@ namespace Shentun.Peis.Poisons
             DataHelper.CheckStringIsNull(sourceEntity.DisplayName, "名称");
             if (sourceEntity.DisplayName != targetEntity.DisplayName)
             {
-
-                await EntityHelper.CheckSameName<Poison, Guid>(_poisonRepository, sourceEntity.DisplayName, targetEntity);
+                var isPoison = await _poisonRepository.FirstOrDefaultAsync(f => f.PoisonTypeId == sourceEntity.PoisonTypeId
+                && f.DisplayName == sourceEntity.DisplayName && f.Id != targetEntity.Id);
+                if (isPoison != null)
+                    throw new UserFriendlyException($"毒害因素{sourceEntity.DisplayName}已存在");
+                //await EntityHelper.CheckSameName<Poison, Guid>(_poisonRepository, sourceEntity.DisplayName, targetEntity);
                 targetEntity.DisplayName = sourceEntity.DisplayName;
                 targetEntity.SimpleCode = LanguageConverter.GetPYSimpleCode(targetEntity.DisplayName);
-                targetEntity.PoisonTypeId = sourceEntity.PoisonTypeId;
+
             }
 
+            targetEntity.PoisonTypeId = sourceEntity.PoisonTypeId;
+
         }