Merge branch 'v2020dongfang' into v2020morge

performance/Performance.Api/Controllers/ComputeController.cs

@@ -166,6 +166,11 @@ public ApiResponse DeptDetail([FromBody] DeptDetailRequest request)
             {
                 second = _computeService.GetSecondByAccountId(request.AccountID);
             }
+            else if (request.AccountID != 0 && request.UnitType == (int)UnitType.行政后勤)
+            {
+                var response = _computeService.DeptOfficeDetail(request.AccountID);
+                return new ApiResponse(ResponseType.OK, response);
+            }
 
             if (second != null && second.UnitType == UnitType.特殊核算组.ToString())
             {

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

@@ -701,14 +701,14 @@
         </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.GetAprGroupList(Performance.EntityModels.per_apr_amount)">
             <summary>
-            获取人员补充绩效列表
+            医院其他绩效审核
             </summary>
             <param name="request"></param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.GetAprDetail(Performance.EntityModels.per_apr_amount)">
             <summary>
-            获取人员补充绩效列表
+            医院其他绩效审核详情
             </summary>
             <param name="request"></param>
             <returns></returns>

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

@@ -2720,7 +2720,7 @@
             <summary> 收入项名称 </summary>
         </member>
         <member name="P:Performance.DtoModels.DetailDtos`1.IncomeType">
-            <summary> 1、收入 2、支出 3、工作量 4、特殊科室 5、科室奖罚 6、科室药占比考核 7、科室材料占比考核 8、调节后其他绩效 </summary>
+            <summary> 1、收入 2、支出 3、工作量 4、特殊科室 5、科室奖罚 6、科室药占比考核 7、科室材料占比考核 8、调节后其他绩效 9、行政工勤 </summary>
         </member>
         <member name="P:Performance.DtoModels.DetailDtos`1.OriginalType">
             <summary> 原始SheetType </summary>

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

@@ -3625,6 +3625,11 @@
         </member>
         <member name="P:Performance.EntityModels.per_employee.PersonnelNumber">
             <summary>
+            员工工号（HIS）
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.per_employee.JobNumber">
+            <summary>
             员工工号
             </summary>
         </member>

performance/Performance.DtoModels/Response/DeptDetailResponse.cs

@@ -47,7 +47,7 @@ public class DetailDtos<T>
         /// <summary> 收入项名称 </summary>
         public string ItemName { get; set; }
 
-        /// <summary> 1、收入 2、支出 3、工作量 4、特殊科室 5、科室奖罚 6、科室药占比考核 7、科室材料占比考核 8、调节后其他绩效 </summary>
+        /// <summary> 1、收入 2、支出 3、工作量 4、特殊科室 5、科室奖罚 6、科室药占比考核 7、科室材料占比考核 8、调节后其他绩效 9、行政工勤 </summary>
         public int IncomeType { get; set; }
         /// <summary> 原始SheetType </summary>
         public int OriginalType { get; set; }

performance/Performance.EntityModels/Entity/per_employee.cs

@@ -45,12 +45,17 @@ public class per_employee
         /// 姓名
         /// </summary>
         public string DoctorName { get; set; }
-    
+
         /// <summary>
         /// 员工工号
         /// </summary>
         public string PersonnelNumber { get; set; }
-    
+
+        /// <summary>
+        /// 员工工号（HIS）
+        /// </summary>
+        public string JobNumber { get; set; }
+
         /// <summary>
         /// 正式/临聘
         /// </summary>

performance/Performance.Extract.Api/appsettings.Development.json

@@ -10,6 +10,7 @@
   //连接字符串
   "AppConnection": {
     "PerformanceConnectionString": "server=192.168.18.166;database=db_performance;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
+    //"PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
     //"PerformanceConnectionString": "server=116.62.245.55;database=db_performance;uid=bigdata;pwd=Suvalue@abc;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
     "HangfireConnectionString": "server=192.168.18.166;database=db_hangfire;uid=root;pwd=1234qwer;port=3306;allow user variables=true;",
     "RedisConnectionString": "116.62.245.55:6379,defaultDatabase=2"

performance/Performance.Services/ComputeService.cs

@@ -730,6 +730,7 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
                 Detail = new List<DetailDtos>()
             };
 
+            if (basicData == null || !basicData.Any()) return MergeDetails(deptDetails);
 
             var sheetType = new List<int>
             {
@@ -750,7 +751,7 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
 
                     var sheetName = new Regex("[0-9]*").Replace(sheet.SheetName, "", 5).Replace(".", "").Replace(" ", "");
                     var (sheettype, amount) = ClinicDepartmentDetail(persheet, account, basicData, sheet, type, sheetName);
-                    (sheettype, amount) = CommonDepartmentDetail(basicData, sheet, type);
+                    (sheettype, amount) = CommonDepartmentDetail(basicData, sheet, type, sheettype, amount);
                     var items = CommonDetailItems(basicData, headers, sheet, type);
 
                     if (sheet.SheetType == (int)SheetType.Workload)
@@ -822,10 +823,8 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
             return (sheettype, amount);
         }
 
-        private (int sheettype, decimal amount) CommonDepartmentDetail(List<im_data> basicData, per_sheet sheet, UnitType type)
+        private (int sheettype, decimal amount) CommonDepartmentDetail(List<im_data> basicData, per_sheet sheet, UnitType type, int sheettype = -1, decimal amount = 0)
         {
-            int sheettype = 1;
-            decimal amount = 0;
             //var sheettype = 1; var amount = 0m;
 
             //if (pairs.ContainsKey((SheetType)sheet.SheetType))
@@ -846,7 +845,7 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
 
             SheetType[] pairs = new SheetType[]
             {
-                SheetType.AccountDrugAssess, SheetType.AccountMaterialsAssess, SheetType.AccountScoreAverage, SheetType.AccountAdjustLaterOtherFee
+                SheetType.AccountExtra, SheetType.AccountDrugAssess, SheetType.AccountMaterialsAssess, SheetType.AccountScoreAverage, SheetType.AccountAdjustLaterOtherFee
             };
             if (pairs.Contains((SheetType)sheet.SheetType))
             {
@@ -1014,7 +1013,7 @@ public DeptDataDetails DeptOfficeDetail(int accountId)
             var detail = new DetailDtos
             {
                 ItemName = "行政后勤核算单元绩效测算表",
-                IncomeType = 4,
+                IncomeType = 9,
                 OriginalType = 4,
                 Amount = account.PerforTotal ?? 0,
                 Items = new List<DetailModule>(),
@@ -1035,6 +1034,8 @@ public DeptDataDetails DeptOfficeDetail(int accountId)
 
             deptDetails.Detail.Add(detail);
 
+            if (basicData == null || !basicData.Any()) return deptDetails;
+
             int groupBasis = 0;
             foreach (var stype in sheetType)
             {