划拨显示，申请，审核样式修正、驳回修改

performance/Performance.Api/Controllers/CostTransferController.cs

@@ -59,8 +59,11 @@ public ApiResponse Common(int hospitalId, int allotId)
 
             var userid = claim.GetUserId();
             var user = userService.GetUser(userid);
+            var role = roleService.GetARole(user.UserID);
+
+            var result = costTransferService.Common(allotId, hospitalId,role.Type.Value, user.Department);
+
             
-            var result = costTransferService.Common(allotId, hospitalId);
             result.deparment = user.Department ?? "";
             return new ApiResponse(ResponseType.OK, result);
         }
@@ -109,5 +112,21 @@ public ApiResponse Audit([FromBody] CostTransferUpdateRequest request)
                 costTransferService.CostTransferAudit(request, false);
             return new ApiResponse(ResponseType.OK);
         }
+
+        /// <summary>
+        /// 驳回修改
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("updateapplicat")]
+        [HttpPost]
+        public ApiResponse UpdateApplicat([FromBody] CostTransferUpdateRequest request)
+        {
+            if (request.AllotId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
+
+            costTransferService.UpdateApplicat(request);
+            return new ApiResponse(ResponseType.OK);
+        }
     }
 }

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

@@ -723,6 +723,13 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.CostTransferController.UpdateApplicat(Performance.DtoModels.CostTransferUpdateRequest)">
+            <summary>
+            驳回修改
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.GetEmployeeList(Performance.DtoModels.EmployeeRequest)">
             <summary>
             获取人员列表

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

@@ -2953,6 +2953,36 @@
             银行卡号
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.CostTransferResponse.AllotId">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.CostTransferResponse.ApplicantUnitType">
+            <summary>
+            申请者核算单元类型
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.CostTransferResponse.ApplicantDepartment">
+            <summary>
+            申请者科室
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.CostTransferResponse.AdoptedUnitType">
+            <summary>
+            审核者核算单元类型
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.CostTransferResponse.AdoptedDepartment">
+            <summary>
+            审核者科室
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.CostTransferResponse.Status">
+            <summary>
+            0 未审核 1 部分审核 2 全部审核 3 未含有划拨明细
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.DeptDataDetails`1.Pandect">
             <summary> 概览</summary>
         </member>

performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs

@@ -235,6 +235,12 @@ public AutoMapperConfigs()
             CreateMap<HistoryData, report_original_surgery>()
                .ForMember(dest => dest.PersonTime, opt => opt.MapFrom(src => src.ResultData))
                .ReverseMap();
+
+            CreateMap<cost_transfer, CostTransferResponse>(
+                ).ForMember(back=>back.Items,n=>n.Ignore());
+            CreateMap<cost_transfer, cost_transfer>(
+                ).ForMember(back => back.Id, n => n.Ignore());
+
         }
 
         public void xx()

performance/Performance.DtoModels/Response/CostTransferResponse.cs

@@ -8,39 +8,62 @@ namespace Performance.DtoModels
     public class CostTransferResponse
     {
         public int Id { get; set; }
-        public string  AdoptedDepartment { get; set; }
-        public string AdoptedUnitType { get; set; }
-
-        public string ApplicantDepartment { get; set; }
-        public string ApplicantUnitType { get; set; }
-        public string Source { get; set; }
 
-        public string Category { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int AllotId { get; set; }
 
-        public Nullable<decimal> Amount { get; set; }
+        /// <summary>
+        /// 申请者核算单元类型
+        /// </summary>
+        public string ApplicantUnitType { get; set; }
 
-        public Nullable<decimal> Ratio { get; set; }
+        /// <summary>
+        /// 申请者科室
+        /// </summary>
+        public string ApplicantDepartment { get; set; }
 
-        public Nullable<decimal> CalculationAmount { get; set; }
+        /// <summary>
+        /// 审核者核算单元类型
+        /// </summary>
+        public string AdoptedUnitType { get; set; }
 
-        public string Remark { get; set; }
+        /// <summary>
+        /// 审核者科室
+        /// </summary>
+        public string AdoptedDepartment { get; set; }
 
+        /// <summary>
+        /// 0 未审核 1 部分审核 2 全部审核 
+        /// </summary>
         public int Status { get; set; }
 
         public int AdminStatus { get; set; }
-        //public List<TransferItemResponse> costTransferItem { get; set; }
+
+        public List<Option> Items { get; set; }
     }
 
+
     public class CommonResponse
     {
         public string deparment { get; set; }
         public string unitType { get; set; }
-        public IEnumerable<TitleValue> drugType { get; set; }
+        public List<TitleValue> account { get; set; }
 
-        public IEnumerable<TitleValue> sheets { get; set; }
+        public List<Common> Data { get; set; }
+    }
 
-        //public List<cof_accounting> accounting { get; set; }
+    public class Common
+    {
+        public string Source { get; set; }
+        public string Category { get; set; }
+        public decimal Ratio { get; set; }
+    }
 
-        public IEnumerable<TitleValue> dept { get; set; }
+    public class Option : cost_transfer_item
+    {
+        public string[] options { get; set; }   
     }
+
 }

performance/Performance.EntityModels/Entity/cost_transfer.cs

@@ -46,8 +46,10 @@ public class cost_transfer
         public string AdoptedDepartment { get; set; }
 
         /// <summary>
-        /// 0 未审核 1 部分审核 2 全部审核 3 未含有划拨明细
+        /// 0 未审核 1 部分审核 2 全部审核 
         /// </summary>
         public int Status { get; set; }
+
+        public int AdminStatus { get; set; }
     }
 }