Merge branch 'master' of http://140.143.162.39:3000/shentun/peis

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

@@ -230,7 +230,7 @@ namespace Shentun.Peis.DiagnosisFunctions
         [HttpPost("api/app/diagnosisfunction/getdiagnosisresult")]
         public async Task<OkObjectResult> GetDiagnosisResultAsync(GetDiagnosisResultRequestDto input)
         {
-
+            throw new Exception("禁止使用");
             var reslist = new List<GetDiagnosisResult_Detail>();
             var suggestionlist = new List<GetDiagnosisSuggestion_Detail>();
 
@@ -361,7 +361,8 @@ namespace Shentun.Peis.DiagnosisFunctions
             }
         }
 
-        public async Task<GetDiagnosisResultDto> GetDiagnosisResultAsync2(GetDiagnosisResultRequestDto input)
+        [HttpPost("api/app/DiagnosisFunction/GetDoctorCheckDiagnosisResultAsync")]
+        public async Task<GetDiagnosisResultDto> GetDoctorCheckDiagnosisResultAsync(GetDiagnosisResultRequestDto input)
         {
             var reslist = new List<GetDiagnosisResult_Detail>();
             var suggestionlist = new List<GetDiagnosisSuggestion_Detail>();
@@ -404,6 +405,7 @@ namespace Shentun.Peis.DiagnosisFunctions
             };
             foreach (var item in query)
             {
+                //组合项目参数
                 if (doctorCheckDiagnosisInput.Asbitems.Where(o => o.AsbitemId == item.asbitem.Id).Count() == 0)
                 {
                     var asbitemInput = new AsbitemInput()
@@ -417,7 +419,7 @@ namespace Shentun.Peis.DiagnosisFunctions
                     };
                     doctorCheckDiagnosisInput.Asbitems.Add(asbitemInput);
                 }
-
+                //项目参数
                 if (doctorCheckDiagnosisInput.Items.Where(o => o.ItemId == item.item.Id).Count() == 0)
                 {
                     var inputItem = input.Items.Where(o => o.ItemId == item.item.Id).FirstOrDefault();

test/Shentun.Peis.Application.Tests/DiagnosisFunctionAppServiceTest.cs

@@ -52,7 +52,7 @@ namespace Shentun.Peis
                         }
                     }
                 };
-                var result = await _appService.GetDiagnosisResultAsync2(getDiagnosisResultRequestDto);
+                var result = await _appService.GetDoctorCheckDiagnosisResultAsync(getDiagnosisResultRequestDto);
                 foreach (var item in result.DiagnosisResultDetails)
                 {
                     _output.WriteLine(item.DiagnosisResult);
@@ -98,7 +98,7 @@ namespace Shentun.Peis
                         },
                     }
                 };
-                var result = await _appService.GetDiagnosisResultAsync2(getDiagnosisResultRequestDto);
+                var result = await _appService.GetDoctorCheckDiagnosisResultAsync(getDiagnosisResultRequestDto);
                 foreach (var item in result.DiagnosisResultDetails)
                 {
                     _output.WriteLine(item.DiagnosisResult);
@@ -143,7 +143,7 @@ namespace Shentun.Peis
                         },
                     }
                 };
-                var result = await _appService.GetDiagnosisResultAsync2(getDiagnosisResultRequestDto);
+                var result = await _appService.GetDoctorCheckDiagnosisResultAsync(getDiagnosisResultRequestDto);
                 foreach (var item in result.DiagnosisResultDetails)
                 {
                     _output.WriteLine(item.DiagnosisResult);
@@ -188,7 +188,7 @@ namespace Shentun.Peis
                         },
                     }
                 };
-                var result = await _appService.GetDiagnosisResultAsync2(getDiagnosisResultRequestDto);
+                var result = await _appService.GetDoctorCheckDiagnosisResultAsync(getDiagnosisResultRequestDto);
                 foreach (var item in result.DiagnosisResultDetails)
                 {
                     _output.WriteLine(item.DiagnosisResult);