添加日志，收入全导，其他(非公式)全导；二次绩效加载根据unittype判断

performance/Performance.Api/Controllers/ModExtractController.cs

@@ -160,8 +160,9 @@ public ApiResponse AddItem([FromBody]ItemListRequest request)
         [HttpPost]
         public ApiResponse Items([FromBody]ModItemRequest request)
         {
-            logger.LogInformation($"请求地址 {url.HttpPost}/modextract/items");
+            logger.LogInformation($"绩效收入模板配置项列表 : 请求地址 {url.HttpPost}/modextract/items");
             HttpHelper.HttpPost(url.HttpPost + "/modextract/items", JsonHelper.Serialize(request), true);
+            logger.LogInformation($"绩效收入模板配置项列表在{DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss完成请求")}");
             var list = modExtractService.Items(request.ModuleId.Value);
             return new ApiResponse(ResponseType.OK, list);
         }

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

@@ -683,6 +683,11 @@
             绩效ID
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.ag_secondallot.UseTempId">
+            <summary>
+            使用模板
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.ag_secondallot.UnitType">
             <summary>
             科室类型
@@ -1393,6 +1398,11 @@
             科室
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.im_accountbasic.IncludeAvgCalculate">
+            <summary>
+            是否带入平均计算 是 否
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.im_accountbasic.PermanentStaff">
             <summary>
             定科人数
@@ -2518,6 +2528,11 @@
             科室
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.res_account.IncludeAvgCalculate">
+            <summary>
+            是否带入平均计算 是 否
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.res_account.PermanentStaff">
             <summary>
             定科人数

performance/Performance.Services/ModExtractService.cs

@@ -440,9 +440,12 @@ public void AddItems(int moduleId)
                     throw new PerformanceException($"医院配置信息未设置");
                 }
 
-                var connection = ConnectionBuilder.Create(DatabaseType.SqlServer, hospitalConfig.DbSource, hospitalConfig.DbName, hospitalConfig.DbUser, hospitalConfig.DbPassword);
+                logger.LogInformation("创建数据库连接");
+                var connection = ConnectionBuilder.Create(DatabaseType.Oracle, hospitalConfig.DbSource, hospitalConfig.DbName, hospitalConfig.DbUser, hospitalConfig.DbPassword);
                 string sql = sqlconfig.Content;
+                logger.LogInformation($"执行sql：{sql}");
                 var dataList = perforExtractRepository.ExecuteScript(connection, sql, null);
+                logger.LogInformation($"获取数据{dataList?.Count ?? 0}条");
                 if (dataList != null && dataList.Any())
                 {
                     var itemList = dataList.Select(t => new mod_item

performance/Performance.Services/SecondAllotService.cs

@@ -84,7 +84,13 @@ public List<SecondListResponse> GetSecondList(int userId)
                 throw new NotImplementedException("该医院未生成绩效");
 
             var allotListId = allotList.Select(t => t.ID).ToList();
-            var secondList = perforAgsecondallotRepository.GetEntities(t => allotListId.Contains(t.AllotId.Value) && t.Department == user.Department);
+
+            Expression<Func<ag_secondallot, bool>> exp = t => allotListId.Contains(t.AllotId.Value) && t.Department == user.Department;
+            if (role.RoleID == application.NurseRole)
+                exp = exp.And(t => t.UnitType == "护理组");
+            else
+                exp = exp.And(t => t.UnitType != "护理组");
+            var secondList = perforAgsecondallotRepository.GetEntities(exp);
             //各科室绩效分配结果
             var accountList = perforResaccountRepository.GetEntities(t => allotListId.Contains(t.AllotID.Value) && t.Department == user.Department);
             //取得未生成二次绩效的绩效id