Merge branch 'v2020morge' of https://gitlab.suvalue.com/zry/performance into v2020morge

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -401,7 +401,7 @@ public ApiResponse NursingDeptAuditResult([FromBody] SecondAuditRequest request)
         [HttpPost]
         public ApiResponse OtherList([FromBody] AgOtherRequest request)
         {
-            var result = secondAllotService.OtherList(request.SecondId, claimService.GetUserId());
+            var result = secondAllotDetails.GetOtherTempDetails(claimService.GetUserId(), request.SecondId, request.IsArchive, request.EmployeeSource);
             //var result = secondAllotDetails.GetOtherTempData(claimService.GetUserId(), request.SecondId, request.IsArchive, request.EmployeeSource, out decimal? realAmount);
             var obj = new
             {

performance/Performance.Api/wwwroot/Performance.Api.xml

@@ -467,6 +467,20 @@
             <param name="computeId"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.ComputeController.EditHospitalAvg(Performance.DtoModels.Request.ComputerAvgRequest)">
+            <summary>
+            编辑全院绩效平均
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ComputeController.OtherPerStats(System.Int32)">
+            <summary>
+            其他医院绩效统计
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.ConfigController.GetDrugtypeList(Performance.DtoModels.DrugpropRequest)">
             <summary>
             获取 药占比类型信息列表
@@ -756,6 +770,12 @@
             <param name="allotId"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetDeptAssessment(System.Int32)">
+            <summary>
+            材料科室考核
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.ExConfigController.Extract(Performance.DtoModels.ModModuleRequest)">
             <summary>
             绩效数据抽取模板

performance/Performance.Api/wwwroot/Performance.DtoModels.xml

@@ -1763,6 +1763,26 @@
         <member name="P:Performance.DtoModels.AprAmountAuditRequest.Remark">
             <summary> 备注 </summary>
         </member>
+        <member name="P:Performance.DtoModels.Request.ComputerAvgRequest.PositionName">
+            <summary>
+            绩效核算人群
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Request.ComputerAvgRequest.TotelValue">
+            <summary>
+            绩效总额
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Request.ComputerAvgRequest.AvgValue">
+            <summary>
+            人均绩效
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Request.ComputerAvgRequest.TotelNumber">
+            <summary>
+            总人数
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.Request.SmsCodeRequest.Type">
             <summary>
             短信验证类型 1 手机号登录 2 其他

performance/Performance.Services/Details/SecondAllotDetails.cs

@@ -635,7 +635,7 @@ private void SupplyHeaderByWorkItem(int hospitalId, SecondResponse result, ag_se
         public HandsonTable GetOtherTempData(int userId, int secondId, int isArchive, int employeeSource, out decimal? realAmount)
         {
             string[] workNumbers = new string[] { };
-            var details = GetOtherTempDetails(userId, secondId, isArchive, employeeSource, ref workNumbers);
+            var details = GetOtherTempDetails(userId, secondId, isArchive, employeeSource);
 
             var secondAllot = agsecondallotRepository.GetEntity(t => t.Id == secondId);
 
@@ -689,7 +689,7 @@ public HandsonTable GetOtherTempData(int userId, int secondId, int isArchive, in
             return result;
         }
 
-        public List<ag_othersource> GetOtherTempDetails(int userId, int secondId, int isArchive, int employeeSource, ref string[] workNumbers)
+        public List<ag_othersource> GetOtherTempDetails(int userId, int secondId, int isArchive, int employeeSource)
         {
             var secondAllot = agsecondallotRepository.GetEntity(t => t.Id == secondId);
             if (secondAllot == null) throw new PerformanceException("二次绩效信息无效！");
@@ -780,7 +780,6 @@ public List<ag_othersource> GetOtherTempDetails(int userId, int secondId, int is
                 }
             }
             var originalEmployees = personService.GetPerEmployee(secondAllot.AllotId.Value);
-            workNumbers = originalEmployees?.Select(t => t.PersonnelNumber).Distinct().ToArray();
             SupplementSecondDetail(secondAllot, originalEmployees, result, isSupplementTitlePerformance);
 
             return result;
@@ -864,7 +863,7 @@ private void SupplementSecondDetail(ag_secondallot second, List<per_employee> em
 
                 foreach (var item in groupData)
                 {
-                    if (employees.Any(t => t.PersonnelNumber == item.WorkNumber)
+                    if (employees != null && employees.Any(t => t.PersonnelNumber == item.WorkNumber)
                         && employees.FirstOrDefault(t => t.PersonnelNumber == item.WorkNumber) is per_employee employee
                         && employee.UnitType == second.UnitType)
                     {