Merge branch 'v2020morge-graphql' into 修改绩效0429

performance/Performance.DtoModels/Request/WorkDetailRequest.cs

@@ -8,7 +8,7 @@ namespace Performance.DtoModels
     public class WorkDetailRequest
     {
         public int AllotId { get; set; }
-        public int SecondId { get; set; }
+        //public int SecondId { get; set; }
         public string Source { get; set; }
         public string AccountingUnit { get; set; }
     }
@@ -20,7 +20,7 @@ public WorkDetailRequestValidator()
             RuleSet("Select", () =>
             {
                 RuleFor(x => x.AllotId).NotNull().NotEmpty().GreaterThan(0);
-                RuleFor(x => x.SecondId).NotNull().NotEmpty().GreaterThan(0);
+                //RuleFor(x => x.SecondId).NotNull().NotEmpty().GreaterThan(0);
                 RuleFor(x => x.AccountingUnit).NotNull().NotEmpty();
             });
         }

performance/Performance.Repository/PerforPerAllotRepository.cs

@@ -173,22 +173,25 @@ public void ImportWorkloadData(per_allot allot, object parameters)
         /// 查询工作量数据
         /// </summary>
         /// <param name="allotid"></param>
-        public IEnumerable<report_original_workload> QueryWorkloadData(int allotid, string accountingunit, string unittype, int hospitalid)
+        public IEnumerable<report_original_workload> QueryWorkloadData(int allotid, string accountingunit, string[] unittypes, int hospitalid)
         {
             using (var connection = context.Database.GetDbConnection())
             {
                 if (connection.State != ConnectionState.Open) connection.Open();
                 try
                 {
+                    string unittype = unittypes.Any(t => !string.IsNullOrEmpty(t) && t.Contains("医生"))
+                        ? "医生组"
+                        : unittypes.Any(t => !string.IsNullOrEmpty(t) && t.Contains("护理")) ? "护理组" : "其他组";
                     string clear = @"SELECT DISTINCT t3.AccountingUnit as Department,ifnull(t1.DoctorName, '未知') DoctorName,t1.PersonnelNumber,t1.Category,t1.Fee FROM ex_result t1
 	JOIN (select distinct AccountingUnit,HISDeptName,unittype from per_dept_dic where HospitalId = @hospitalid) t3 ON t1.Department = t3.HISDeptName
 WHERE t1.allotid = @allotid
-	AND t3.unittype = @unittype
+	AND t3.unittype in @unittypes
 	AND t3.accountingunit = @accountingunit
 	AND t1.Source LIKE CONCAT('%',@unittype,'工作量%')
 	AND T1.IsDelete = 0
 ORDER BY t1.doctorname,t1.Category;";
-                    return connection.Query<report_original_workload>(clear, new { allotid, accountingunit, unittype, hospitalid }, commandTimeout: 60 * 60);
+                    return connection.Query<report_original_workload>(clear, new { allotid, accountingunit, unittypes, unittype, hospitalid }, commandTimeout: 60 * 60);
                 }
                 catch (Exception ex)
                 {
@@ -201,7 +204,7 @@ public IEnumerable<report_original_workload> QueryWorkloadData(int allotid, stri
         /// 查询门诊收入数据
         /// </summary>
         /// <param name="allotid"></param>
-        public IEnumerable<ex_result> QueryIncomeData(int allotid, string source, string accountingunit, string unittype, int hospitalid)
+        public IEnumerable<ex_result> QueryIncomeData(int allotid, string source, string accountingunit, string[] unittype, int hospitalid)
         {
             using (var connection = context.Database.GetDbConnection())
             {
@@ -211,7 +214,7 @@ public IEnumerable<ex_result> QueryIncomeData(int allotid, string source, string
                     string clear = $@"SELECT DISTINCT t3.AccountingUnit as Department,ifnull(t1.DoctorName, '未知') DoctorName,t1.PersonnelNumber,t1.Category,t1.Fee FROM ex_result t1
 	JOIN (select distinct AccountingUnit,HISDeptName,unittype from per_dept_dic where HospitalId = @hospitalid) t3 ON t1.Department = t3.HISDeptName
 WHERE t1.allotid = @allotid
-	AND t3.unittype = @unittype
+	AND t3.unittype in @unittype
 	AND t3.accountingunit = @accountingunit
 	AND (t1.Source like '%{source}开单%' OR t1.Source like '%{source}就诊%')
 	AND T1.IsDelete = 0

performance/Performance.Services/ExtractExcelService/ExtractService.cs

@@ -139,7 +139,7 @@ private void WriteDataToFile(IWorkbook workbook, per_allot allot, Dictionary<ExD
             logger.LogInformation($"allotId: {allot.ID}: 总金额 - {extractDto?.Sum(s => s.Value ?? 0)}");
 
             WriteDataFactory factory = new WriteDataFactory();
-            var types = new List<SheetType> { SheetType.OtherIncome, SheetType.Income, SheetType.Expend, SheetType.Workload, SheetType.OtherWorkload, SheetType.AccountBasic };
+            var types = new List<SheetType> { SheetType.OtherIncome, SheetType.Income, SheetType.Expend, SheetType.Workload, SheetType.OtherWorkload/*, SheetType.AccountBasic*/ };
             decimal ratio = 60m;
             for (int sheetIndex = 0; sheetIndex < workbook.NumberOfSheets; sheetIndex++)
             {
@@ -242,7 +242,7 @@ private List<ExtractTransDto> StandDataFormat(int hospitalId, List<ex_result> re
                         InpatTechnicAccounting = t.inner.FirstOrDefault(f => f.Department == dept)?.InpatTechnicAccounting?.AccountingUnit,
                     };
                 });
-            logger.LogInformation("************抽取结果1***************: " + JsonHelper.Serialize(data.Where(t => t.Department == "一病区（外科一）" && t.Category == "CT费")));
+
             var groupdata = data.GroupBy(t => new { t.Department, t.Category, t.SheetName }).Select(t => new ExtractTransDto
             {
                 SheetName = t.Key.SheetName,
@@ -256,7 +256,6 @@ private List<ExtractTransDto> StandDataFormat(int hospitalId, List<ex_result> re
                 InpatNurseAccounting = t.First().InpatNurseAccounting,
                 InpatTechnicAccounting = t.First().InpatTechnicAccounting,
             });
-            logger.LogInformation("************抽取结果2***************: " + JsonHelper.Serialize(groupdata.Where(t => t.Department == "一病区（外科一）" && t.Category == "CT费")));
 
             return groupdata.ToList();
         }

performance/Performance.Services/PersonService.cs

@@ -509,15 +509,14 @@ public List<TitleValue> DeptDics(int hospitalId, int type)
         /// <returns></returns>
         public object DeptWorkloadDetail(WorkDetailRequest request, int userId)
         {
-            var second = agsecondallotRepository.GetEntity(w => w.Id == request.SecondId);
-            if (second == null)
-                return null;
+            string[] unitTypes = GetUnitType(userId);
+            if (unitTypes == null || !unitTypes.Any()) return new string[] { };
 
             var allot = perallotRepository.GetEntity(w => w.ID == request.AllotId);
             if (allot == null)
                 return null;
 
-            var data = perallotRepository.QueryWorkloadData(request.AllotId, request.AccountingUnit, second.UnitType, allot.HospitalId);
+            var data = perallotRepository.QueryWorkloadData(request.AllotId, request.AccountingUnit, unitTypes, allot.HospitalId);
             if (data != null && data.Any())
             {
                 return data.GroupBy(t => new { t.Department, t.DoctorName, t.PersonnelNumber, t.Category })
@@ -541,9 +540,8 @@ public object DeptWorkloadDetail(WorkDetailRequest request, int userId)
         /// <returns></returns>
         public object DeptIncomeDetail(WorkDetailRequest request, int userId)
         {
-            var second = agsecondallotRepository.GetEntity(w => w.Id == request.SecondId);
-            if (second == null)
-                return null;
+            string[] unitTypes = GetUnitType(userId);
+            if (unitTypes == null || !unitTypes.Any()) return new string[] { };
 
             var allot = perallotRepository.GetEntity(w => w.ID == request.AllotId);
             if (allot == null)
@@ -552,7 +550,7 @@ public object DeptIncomeDetail(WorkDetailRequest request, int userId)
             if (!sources.Contains(request.Source))
                 throw new PerformanceException($"数据来源错误，只支持：{string.Join(";", sources)}");
 
-            var data = perallotRepository.QueryIncomeData(request.AllotId, request.Source, request.AccountingUnit, second.UnitType, allot.HospitalId);
+            var data = perallotRepository.QueryIncomeData(request.AllotId, request.Source, request.AccountingUnit, unitTypes, allot.HospitalId);
             if (data != null && data.Any())
             {
                 return data.GroupBy(t => new { t.Department, t.DoctorName, t.PersonnelNumber, t.Category })
@@ -568,5 +566,27 @@ public object DeptIncomeDetail(WorkDetailRequest request, int userId)
 
             return new string[] { };
         }
+
+        private string[] GetUnitType(int userId)
+        {
+            Dictionary<int, string[]> dict = new Dictionary<int, string[]>
+            {
+                {  application.DirectorRole, new string []{ UnitType.医生组.ToString(), UnitType.其他医生组.ToString(), UnitType.其他医技组.ToString(), UnitType.医技组.ToString() } },
+                {  application.NurseRole, new string []{ UnitType.护理组.ToString(), UnitType.其他护理组.ToString() } },
+                {  application.SpecialRole, new string []{ UnitType.特殊核算组.ToString() } },
+                {  application.OfficeRole, new string []{ UnitType.行政后勤.ToString() } },
+            };
+
+            var user = perforUserRepository.GetEntity(t => t.ID == userId);
+            if (user == null)
+                throw new NotImplementedException("人员ID无效");
+            var userrole = perforUserroleRepository.GetEntity(t => t.UserID == userId);
+            var role = perforRoleRepository.GetEntity(t => t.ID == userrole.RoleID);
+
+            if (!role.Type.HasValue || !dict.ContainsKey(role.Type.Value))
+                return new string[] { };
+
+            return dict[role.Type.Value];
+        }
     }
 }

performance/Performance.Services/SecondAllot/SecondAllotService.cs

@@ -49,7 +49,7 @@ public SecondAllotResponse GetSecondSavedData(int userId, int secondId, int empl
                 ?? new ag_headsource
                 {
                     SecondId = secondId,
-                    TotalPerformance = second.RealGiveFee,
+                    TotalDistPerformance = second.RealGiveFee,
                     PaymentOfTheMonth = $"{allot.Year}年{allot.Month.ToString().PadLeft(2, '0')}月",
                     SeniorityTitlesAccountedPerformance = 0.2m,
                     Workload_Ratio_Default = 0.8m,