返回审核录入数据

performance/Performance.Api/Controllers/CollectController.cs

@@ -109,10 +109,65 @@ public ApiResponse SaveCollectData(int allotId, [FromBody] SaveCollectData reque
         {
             if (allotId <= 0)
                 return new ApiResponse(ResponseType.ParameterError, "参数无效");
-            collectService.SaveCollectData(allotId, request);
+            collectService.SaveCollectData(allotId, request, claim.GetUserId());
 
             return new ApiResponse(ResponseType.OK);
         }
-    }
 
-}
\ No newline at end of file
+        /// <summary>
+        /// 提交采集信息
+        /// </summary>
+        [HttpPost]
+        [Route("submitcollectdata/{allotId}")]
+        public ApiResponse SubmitCollectData(int allotId, [FromQuery] string sheetName)
+        {
+            if (allotId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数无效");
+
+            collectService.SubmitCollectData(allotId, sheetName, claim.GetUserId());
+            return new ApiResponse(ResponseType.OK);
+        }
+
+        /// <summary>
+        /// 数据录入显示列表
+        /// </summary>
+        [HttpPost]
+        [Route("collectdatalist/{hospitalId}")]
+        public ApiResponse CollectDataList(int hospitalId)
+        {
+            if (hospitalId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数无效");
+
+            var data = collectService.CollectDataList(hospitalId);
+            return new ApiResponse(ResponseType.OK, data);
+        }
+
+        /// <summary>
+        /// 核算办显示列表
+        /// </summary>
+        [HttpPost]
+        [Route("performanceforlist/{allotId}")]
+        public ApiResponse PerformanceforList(int allotId)
+        {
+            if (allotId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数无效");
+
+            var data = collectService.PerformanceforList(allotId);
+            return new ApiResponse(ResponseType.OK, data);
+        }
+
+        /// <summary>
+        /// 科室显示列表
+        /// </summary>
+        [HttpPost]
+        [Route("departmentlist/{allotId}")]
+        public ApiResponse DepartmentList(int allotId, [FromQuery] int userId)
+        {
+            if (allotId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数无效");
+
+            var data = collectService.DepartmentList(allotId, userId);
+            return new ApiResponse(ResponseType.OK, data);
+        }
+    }
+}

performance/Performance.Api/Job/JobRegistry.cs

@@ -8,7 +8,7 @@ public JobRegistry()
         {
             //Schedule<ExtractDataJob>().ToRunNow().AndEvery(1).Days().At(23, 0);
             //Schedule<ExtractDataJob>().ToRunEvery(1).Days().At(23, 0);
-            Schedule<ExtractGenerateJob>().ToRunEvery(1).Days().At(14, 00);
+            Schedule<ExtractGenerateJob>().ToRunEvery(1).Days().At(23, 00);
         }
     }
 }

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

@@ -397,6 +397,26 @@
             保存采集内容
             </summary>
         </member>
+        <member name="M:Performance.Api.Controllers.CollectController.SubmitCollectData(System.Int32,System.String)">
+            <summary>
+            提交采集信息
+            </summary>
+        </member>
+        <member name="M:Performance.Api.Controllers.CollectController.CollectDataList(System.Int32)">
+            <summary>
+            数据录入显示列表
+            </summary>
+        </member>
+        <member name="M:Performance.Api.Controllers.CollectController.PerformanceforList(System.Int32)">
+            <summary>
+            核算办显示列表
+            </summary>
+        </member>
+        <member name="M:Performance.Api.Controllers.CollectController.DepartmentList(System.Int32,System.Int32)">
+            <summary>
+            科室显示列表
+            </summary>
+        </member>
         <member name="M:Performance.Api.Controllers.ComputeController.GetCompute(Performance.DtoModels.ComputerRequest)">
             <summary>
             获取绩效发放列表

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

@@ -2276,6 +2276,26 @@
             单元格value
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.collect_data.Status">
+            <summary>
+            1 保存 2 提交 3 审核通过 4 驳回 5 部分审核
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.collect_data.SavedUser">
+            <summary>
+            保存数据的用户
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.collect_data.SavedTime">
+            <summary>
+            保存数据的时间
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.collect_data.SubmitUser">
+            <summary>
+            提交数据的用户
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.collect_permission">
             <summary>
             

performance/Performance.DtoModels/HandsonTable.cs

@@ -48,12 +48,12 @@ public void SetRowData(IEnumerable<HandsonRowData> datas, bool isTypein)
                 var dic = CreateDataRow("编号", dt.Row.ToString());
                 foreach (var item in dt.CellData)
                 {
-                    if (dic.ContainsKey(item.Name.ToLower()) && isTypein && _permissions.Any(w => w.HeadName.ToLower() == item.Name.ToLower()))
-                        dic[item.Name.ToLower()] = item.Value?.ToString() ?? "";
-                    else if (dic.ContainsKey(item.Name.ToLower()) && _permissions.Any(w => w.HeadName.ToLower() == item.Name.ToLower() && w.AttachLast > 0))
-                        dic[item.Name.ToLower()] = item.Value?.ToString() ?? "";
-                    else if (dic.ContainsKey(item.Name.ToLower()) && _permissions.Any(w => w.HeadName.ToLower() == item.Name.ToLower()))
-                        dic[item.Name.ToLower()] = item.Value?.ToString() ?? "";
+                    //if (dic.ContainsKey(item.Name.ToLower()) && isTypein && _permissions.Any(w => w.HeadName.ToLower() == item.Name.ToLower()))
+                    //    dic[item.Name.ToLower()] = item.Value?.ToString() ?? "";
+                    //else if (dic.ContainsKey(item.Name.ToLower()) && _permissions.Any(w => w.HeadName.ToLower() == item.Name.ToLower() && w.AttachLast > 0))
+                    //    dic[item.Name.ToLower()] = item.Value?.ToString() ?? "";
+                    //else if (dic.ContainsKey(item.Name.ToLower()) && _permissions.Any(w => w.HeadName.ToLower() == item.Name.ToLower()))
+                    dic[item.Name.ToLower()] = item.Value?.ToString() ?? "";
                 }
                 Data.Add(dic);
             }
@@ -66,6 +66,7 @@ private void InitColHeaders(int sheetType, string[] cols)
                 new DefalutHandsonHeader{ SheetType = SheetType.OtherIncome, Necessity = new[] { "核算单元（医技组）","核算单元（医生组）","核算单元（护理组）","科室名称" } },
                 new DefalutHandsonHeader{ SheetType = SheetType.Expend, Necessity = new[] { "核算单元（医技组）","核算单元（医生组）","核算单元（护理组）","科室名称" } },
                 new DefalutHandsonHeader{ SheetType = SheetType.Workload, Necessity = new[] { "核算单元","科室名称" } },
+                new DefalutHandsonHeader{ SheetType = SheetType.SpecialUnit, Necessity = new[] { "科室名称" } },
                 //new DefalutHandsonHeader{ SheetType = SheetType.AccountExtra, Necessity = new[] { "核算单元","科室名称" } },
                 //new DefalutHandsonHeader{ SheetType = SheetType.PersonExtra, Necessity = new[] { "核算单元","科室名称" } },
               };

performance/Performance.EntityModels/Entity/collect_data.cs

@@ -3,6 +3,7 @@
 // * FileName: .cs 
 // </copyright>
 //-----------------------------------------------------------------------
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -81,7 +82,7 @@ public class collect_data
         public string CellValue { get; set; }
 
         /// <summary>
-        /// 1 保存 2 提交 3 审核通过 4 驳回
+        /// 1 保存 2 提交（等待审核） 3 审核通过 4 驳回
         /// </summary>
         public int Status { get; set; }
 
@@ -93,6 +94,11 @@ public class collect_data
         /// <summary>
         /// 保存数据的时间
         /// </summary>
-        public int SavedTime { get; set; }
+        public Nullable<DateTime> SavedTime { get; set; }
+
+        /// <summary>
+        /// 提交数据的用户
+        /// </summary>
+        public Nullable<int> SubmitUser { get; set; }
     }
 }