Merge branch 'develop' of http://192.168.18.110:8880/zry/performance into develop

# Conflicts:
#	performance/Performance.Api/wwwroot/Performance.Api.xml

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

@@ -804,11 +804,12 @@
             <param name="allotId"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ConfigController.BatchCheckAccounting(System.Int32)">
+        <member name="M:Performance.Api.Controllers.ConfigController.BatchCheckAccounting(System.Int32,Performance.DtoModels.SaveCollectData)">
             <summary>
             核算单元及组别批量添加
             </summary>
             <param name="allotId"></param>
+            <param name="request"></param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.ConfigController.BatchSaveAccounting(System.Int32,Performance.DtoModels.SaveCollectData)">

performance/Performance.EntityModels/Other/view_allot_sign_emp.cs

@@ -10,6 +10,7 @@ public class view_allot_sign_emp
         public int SecondId { get; set; }
         public int States { get; set; }
         public string UnitType { get; set; }
+        public string Code { get; set; }
         public string AccountingUnit { get; set; }
         public string IsShowManage { get; set; }
         public string EmployeeName { get; set; }

performance/Performance.Repository/PerforReportRepository .cs

@@ -432,13 +432,13 @@ public List<dynamic> QueryComputeByDateAndTotal(string viewName, HospitalGrantSu
 
             Dictionary<string, List<string>> dict = new Dictionary<string, List<string>>
             {
-                { "view_allot_sign_emp_group", new List<string>{ /* "year", "month", "allotid", "secondid",*/ "hospitalid", "source", "states", "unittype", "accountingunit", "isshowmanage", "employeename", "jobnumber", "jobtitle", "emp_unittype", "emp_accountingunit", "bankcard", "batch", "jobcategory", "duty", "titleposition" } },
+                { "view_allot_sign_emp_group", new List<string>{ /* "year", "month", "allotid", "secondid",*/ "hospitalid", "source", "states", "unittype", "code", "accountingunit", "isshowmanage", "employeename", "jobnumber", "jobtitle", "emp_unittype", "emp_accountingunit", "bankcard", "batch", "jobcategory", "duty", "titleposition" } },
                 { "view_allot_sign_emp_sum", new List<string>{ "perforsumfee", "performanagementfee", "nightworkperfor", "adjustlaterotherfee", "otherperfor", "hideotherperfor", "shouldgivefee", "reservedratiofee", "realgivefee" } },
 
-                { "view_allot_sign_dept_group", new List<string>{ "hospitalid",/* "allotid", "year", "month", */"unittype", "accountingunit" } },
+                { "view_allot_sign_dept_group", new List<string>{ "hospitalid",/* "allotid", "year", "month", */"unittype", "code", "accountingunit" } },
                 { "view_allot_sign_dept_sum", new List<string>{ "perforfee", "workloadfee", "assessbeforeotherfee", "perfortotal", "scoringaverage", "extra", "medicineextra", "materialsextra", "assesslaterotherfee", "assesslaterperfortotal", "adjustfactor", "adjustlaterotherfee", "aprperforamount", "hideaprotherperforamount", "assesslatermanagementfee", "realgivefee" } },
                 
-                { "view_allot_sign_emp_finance_group", new List<string>{ "hospitalid",/* "year", "month", "allotid",*/ "jobnumber", "employeename", "jobtitle", "unittype", "accountingunit", "bankcard", "jobcategory", "duty", "titleposition" } },
+                { "view_allot_sign_emp_finance_group", new List<string>{ "hospitalid",/* "year", "month", "allotid",*/ "jobnumber", "employeename", "jobtitle", "unittype", "code", "accountingunit", "bankcard", "jobcategory", "duty", "titleposition" } },
                 { "view_allot_sign_emp_finance_sum", new List<string>{ "perforsumfee", "performanagementfee", "nightworkperfor", "adjustlaterotherfee", "otherperfor", "hideotherperfor", "shouldgivefee", "reservedratiofee", "realgivefee" } },
             };
            

performance/Performance.Services/ComputeService.cs

@@ -2271,6 +2271,7 @@ public static List<cof_alias> PerformanceTotal(string route, string[] heads)
         {
             new cof_alias{ Alias = "来源", Name = nameof(view_allot_sign_emp.Source), States = 1, SumStatus = 0, Sort = 1 },
             new cof_alias{ Alias = "核算组别", Name = nameof(view_allot_sign_emp.UnitType), States = 1, SumStatus = 0, Sort = 2 },
+            new cof_alias{ Alias = "核算序号", Name = nameof(view_allot_sign_emp.Code), States = 1, SumStatus = 0, Sort = 2 },
             new cof_alias{ Alias = "核算单元", Name = nameof(view_allot_sign_emp.AccountingUnit), States = 1, SumStatus = 0, Sort = 3 },
 
             new cof_alias{ Alias = "员工号", Name = nameof(view_allot_sign_emp.JobNumber), States = 1, SumStatus = 0, Sort = 4 },
@@ -2312,6 +2313,7 @@ public static List<cof_alias> AllComputeViewByDate
         public static List<cof_alias> AllComputePersonView { get; } = new List<cof_alias>
         {
             new cof_alias{ Alias = "核算组别", Name = nameof(view_allot_sign_emp.UnitType), States = 1, SumStatus = 0, Sort = 1 },
+            new cof_alias{ Alias = "核算序号", Name = nameof(view_allot_sign_emp.Code), States = 1, SumStatus = 0, Sort = 2 },
             new cof_alias{ Alias = "核算单元", Name = nameof(view_allot_sign_emp.AccountingUnit), States = 1, SumStatus = 0, Sort = 2 },
             new cof_alias{ Alias = "员工号", Name = nameof(view_allot_sign_emp.JobNumber), States = 1, SumStatus = 0, Sort = 3 },
             new cof_alias{ Alias = "人员姓名", Name = nameof(view_allot_sign_emp.EmployeeName), States = 1, SumStatus = 0, Sort = 4 },
@@ -2345,6 +2347,7 @@ public static List<cof_alias> AllComputePersonViewByDate
         public static List<cof_alias> AllComputeDepartmentView { get; } = new List<cof_alias>
         {
             new cof_alias{ Alias = "核算组别", Name = nameof(view_allot_sign_dept.UnitType), States = 1, SumStatus = 0, Sort = 1 },
+            new cof_alias{ Alias = "核算序号", Name = nameof(view_allot_sign_emp.Code), States = 1, SumStatus = 0, Sort = 2 },
             new cof_alias{ Alias = "核算单元", Name = nameof(view_allot_sign_dept.AccountingUnit), States = 1, SumStatus = 0, Sort = 2 },
             new cof_alias{ Alias = "业绩绩效", Name = nameof(view_allot_sign_dept.PerforFee), States = 1, SumStatus = 1, Sort = 3 },
             new cof_alias{ Alias = "工作量绩效", Name = nameof(view_allot_sign_dept.WorkloadFee), States = 1, SumStatus = 1, Sort = 4 },

performance/Performance.Services/EmployeeService.cs

@@ -645,7 +645,7 @@ public string ImpoerAprEmployees(int allotid, string path, int userid)
                         DoctorName = dict["姓名"] < 0 ? "" : row.GetCell(dict["姓名"]).GetValue(),
                         PerforType = dict["绩效类型"] < 0 ? "" : row.GetCell(dict["绩效类型"]).GetValue(),
                         Amount = dict["金额"] < 0 ? 0 : ConvertHelper.To<decimal>(row.GetCell(dict["金额"]).GetValue(), 0),
-                        Remark = dict["备注"] < 0 ? "" : row.GetCell(dict["金额"]).GetValue(),
+                        Remark = dict["备注"] < 0 ? "" : row.GetCell(dict["备注"]).GetValue(),
                         TypeInDepartment = typeIn,
                         AllotId = allotid,
                         CreateDate = createtime,