Merge branch 'master' of http://140.143.162.39:3000/wxd/WebPeis0523

src/Shentun.WebPeis.Application.Contracts/DiseaseRiskLevels/DiseaseRiskLevelAsbitemDto.cs

@@ -19,6 +19,12 @@ namespace Shentun.WebPeis.DiseaseRiskLevels
         /// </summary>
         public string AsbitemName { get; set; }
 
+        /// <summary>
+        /// 推荐组合项目级别 1-一级推荐，2-2级推荐，3-3级推荐
+        /// </summary>
+
+        public short AsbitemRecommendLevelId { get; set; }
+
 
 
     }

src/Shentun.WebPeis.Application/DiseaseRiskLevels/DiseaseRiskLevelAppService.cs

@@ -171,7 +171,7 @@ namespace Shentun.WebPeis.DiseaseRiskLevels
         [HttpPost("api/app/DiseaseRiskLevel/CreateDiseaseRiskLevelAnswer")]
         public async Task CreateDiseaseRiskLevelAnswerAsync(CreateDiseaseRiskLevelAnswerDto input)
         {
-            await _diseaseRiskLevelAnswerRepository.DeleteAsync(d => d.DiseaseRiskLevelId == input.DiseaseRiskLevelId);
+            await _diseaseRiskLevelAnswerRepository.DeleteAsync(d => d.DiseaseRiskLevelId == input.DiseaseRiskLevelId,true);
             if (input.QuestionAnswerIds.Any())
             {
                 foreach (var questionAnswerId in input.QuestionAnswerIds)
@@ -183,7 +183,7 @@ namespace Shentun.WebPeis.DiseaseRiskLevels
                         {
                             DiseaseRiskLevelId = input.DiseaseRiskLevelId,
                             QuestionAnswerId = questionAnswerId
-                        });
+                        }, true);
                     }
                 }
             }
@@ -228,7 +228,7 @@ namespace Shentun.WebPeis.DiseaseRiskLevels
         [HttpPost("api/app/DiseaseRiskLevel/CreateDiseaseRiskLevelAsbitem")]
         public async Task CreateDiseaseRiskLevelAsbitemAsync(CreateDiseaseRiskLevelAsbitemDto input)
         {
-            await _diseaseRiskLevelAsbitemRepository.DeleteAsync(d => d.DiseaseRiskLevelId == input.DiseaseRiskLevelId);
+            await _diseaseRiskLevelAsbitemRepository.DeleteAsync(d => d.DiseaseRiskLevelId == input.DiseaseRiskLevelId, true);
             if (input.Details.Any())
             {
                 foreach (var item in input.Details)
@@ -241,7 +241,7 @@ namespace Shentun.WebPeis.DiseaseRiskLevels
                             DiseaseRiskLevelId = input.DiseaseRiskLevelId,
                             AsbitemId = item.AsbitemId,
                             AsbitemRecommendLevelId = item.AsbitemRecommendLevelId
-                        });
+                        }, true);
                     }
                 }
             }
@@ -264,14 +264,16 @@ namespace Shentun.WebPeis.DiseaseRiskLevels
                         {
                             diseaseRiskLevelAsbitem.DiseaseRiskLevelId,
                             asbitem.AsbitemId,
-                            asbitem.AsbitemName
+                            asbitem.AsbitemName,
+                            diseaseRiskLevelAsbitem.AsbitemRecommendLevelId
                         };
 
             var entListDto = query.Select(s => new DiseaseRiskLevelAsbitemDto
             {
                 DiseaseRiskLevelId = s.DiseaseRiskLevelId,
                 AsbitemId = s.AsbitemId,
-                AsbitemName = s.AsbitemName
+                AsbitemName = s.AsbitemName,
+                AsbitemRecommendLevelId = s.AsbitemRecommendLevelId
             }).ToList();
 
             return entListDto;