Merge branch '钟博' into v2020morge

performance/Performance.Api/.config/dotnet-tools.json

+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "5.0.1",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}
\ No newline at end of file

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -446,7 +446,9 @@ public ApiResponse SecondPrint(int secondid)
         public ApiResponse DeptComputeDetail(int allotId)
         {
             var userId = claimService.GetUserId();
-            var data = secondAllotService.DeptComputeDetail(userId, allotId, out int isShowManage);
+            //var data = secondAllotService.DeptComputeDetail(userId, allotId, out int isShowManage);
+            var data = secondAllotService.DeptComputeDetailList(userId, allotId, out int isShowManage);
+            
             return new ApiResponse(ResponseType.OK, new { isShowManage, data });
         }
     }

performance/Performance.Api/Performance.Api.csproj

@@ -32,6 +32,7 @@
   
   <PropertyGroup>
     <PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>
+    <UserSecretsId>e732666b-5531-4cd8-b713-2fe3db31126c</UserSecretsId>
   </PropertyGroup>
   
   <ItemGroup>

performance/Performance.Api/Properties/PublishProfiles/FolderProfile.pubxml

@@ -16,7 +16,7 @@
     <ProjectGuid>3ae00ff5-f0ba-4d72-a23b-770186309327</ProjectGuid>
     <SelfContained>false</SelfContained>
     <_IsPortable>true</_IsPortable>
-    <publishUrl>E:\release\jx.suvalue.com</publishUrl>
+    <publishUrl>D:\release</publishUrl>
     <DeleteExistingFiles>True</DeleteExistingFiles>
   </PropertyGroup>
 </Project>
\ No newline at end of file

performance/Performance.Api/appsettings.Localhost.json

@@ -8,7 +8,7 @@
   },
   "AppConnection": {
     //"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=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=192.168.18.166;database=db_yubei;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;",
     "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.DtoModels/HandsonTable.cs

@@ -40,6 +40,8 @@ public void SetRowData(IEnumerable<HandsonRowData> datas, bool isTypein)
                         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);
             }

performance/Performance.EntityModels/Entity/im_accountbasic.cs

@@ -119,7 +119,7 @@ public class im_accountbasic
         ///// <summary>
         ///// 医院奖罚
         ///// </summary>
-        //public Nullable<decimal> DoctorExtra { get; set; }
+        public Nullable<decimal> DoctorExtra { get; set; }
     
         /// <summary>
         /// 考核对分率

performance/Performance.Services/BudgetService.cs

@@ -78,8 +78,13 @@ public bool SaveBudgetData(int mainYear, List<BudgetResponse> request, int userI
             if (amounts != null && perbudgetamountRepository.AddRange(amounts.ToArray()))
             {
                 var ratios = Mapper.Map<List<per_budget_ratio>>(request.Where(t => t.Type == 2));
+                var budgetData = request.FirstOrDefault(t => t.Type == 2);
                 ratios.ForEach(t =>
                 {
+                    t.HospitalRevenue = budgetData?.HospitalRevenue;
+                    t.MeritPayIncrement = budgetData?.MeritPayIncrement;
+                    t.TheDrugIncomeBudget = budgetData?.TheDrugIncomeBudget;
+                    t.MaterialIncomeBudget = budgetData?.MaterialIncomeBudget;
                     t.MainYear = mainYear;
                     t.CreateTime = DateTime.Now;
                     t.CreateUser = userId;
@@ -136,19 +141,20 @@ public bool ModifyBudgetData(List<BudgetResponse> request)
                 foreach (var item in ratios)
                 {
                     var data = request.FirstOrDefault(t => t.Type == 2 && t.Id == item.Id);
+                    var budgetData = request.FirstOrDefault(t => t.Type == 2);
                     if (data == null) continue;
-                    item.HospitalRevenue = data.HospitalRevenue;
+                    item.HospitalRevenue = data.HospitalRevenue == 0 ? budgetData?.HospitalRevenue:data.HospitalRevenue;
                     item.TotalLaborCost = data.TotalLaborCost;
                     item.StaffSpendingFixed = data.StaffSpendingFixed;
                     item.StaffSpendingBonus = data.StaffSpendingBonus;
-                    item.MeritPayIncrement = data.MeritPayIncrement;
+                    item.MeritPayIncrement = data.MeritPayIncrement==0?budgetData?.MeritPayIncrement:data.MeritPayIncrement;
                     item.TotalMeritPay = data.TotalMeritPay;
                     item.Amplification = data.Amplification;
                     item.IncrementCapitaRatio = data.IncrementCapitaRatio;
                     item.TheDrugIncome = data.TheDrugIncome;
-                    item.TheDrugIncomeBudget = data.TheDrugIncomeBudget;
+                    item.TheDrugIncomeBudget = data.TheDrugIncomeBudget==0?budgetData?.TheDrugIncomeBudget:data.TheDrugIncomeBudget;
                     item.MaterialIncome = data.MaterialIncome;
-                    item.MaterialIncomeBudget = data.MaterialIncomeBudget;
+                    item.MaterialIncomeBudget = data.MaterialIncomeBudget==0?budgetData?.MaterialIncomeBudget:data.MaterialIncomeBudget;
                     item.TheCostInTotal = data.TheCostInTotal;
                     item.DepreOfFixedAssets = data.DepreOfFixedAssets;
                     item.AmortOfIntangibleAssets = data.AmortOfIntangibleAssets;

performance/Performance.Services/Details/SecondAllotDetails.cs

@@ -107,7 +107,7 @@ public SecondResponse GetSecondDetails(int userId, int secondId, int hospitalId,
             SupplyHeaderByWorkItem(hospitalId, result, secondAllot, savedDataList);
 
             result.HeadItems = result.HeadItems.OrderBy(t => t.Type).ThenBy(t => t.WorkType).ThenBy(t => t.Sort).ThenBy(t => t.FiledName).ToList();
-            result.BodyItems = result.BodyItems.OrderBy(t => t.RowNumber).ThenBy(t => t.Type).ThenBy(t => t.Sort).ToList();
+            result.BodyItems = result.BodyItems.OrderBy(t => t.RowNumber).ToList();
 
             return result;
         }
@@ -628,14 +628,15 @@ public List<ag_othersource> GetOtherTempDetails(int userId, int secondId, int is
                 // 如果已经保存>>走保存加载逻辑
                 if (employeeSource == (int)EmployeeSource.Initial)
                 {
-                    result = savedDataList.OrderBy(t => t.Id).ToList();
+                    result = savedDataList.OrderBy(t => t.WorkNumber).ToList();
                 }
                 // 如果没保存>>走加载im_employee_logistics人员名单逻辑
                 else
                 {
                     var types = new string[] { "行政后勤", "行政工勤" };
                     var logistics = _imemployeelogisticsRepository.GetEntities(w => w.AllotID == secondAllot.AllotId && types.Contains(w.AccountType) && w.AccountingUnit == secondAllot.Department);
-                    result = (logistics ?? new List<im_employee_logistics>()).Select(w => new ag_othersource
+                    result = (logistics ?? new List<im_employee_logistics>())
+                        .OrderBy(t=>Convert.ToInt32(t.PersonnelNumber)).Select(w => new ag_othersource
                     {
                         SecondId = secondId,
                         WorkNumber = w.PersonnelNumber,
@@ -651,12 +652,12 @@ public List<ag_othersource> GetOtherTempDetails(int userId, int secondId, int is
                 switch (employeeSource)
                 {
                     case (int)EmployeeSource.Initial:
-                        result = savedDataList.OrderBy(t => t.Id).ToList();
+                        result = savedDataList.OrderBy(t => Convert.ToInt32(t.WorkNumber)).ToList();
                         break;
 
                     case (int)EmployeeSource.EmployeeDict:
                         if (employees == null || !employees.Any()) return new List<ag_othersource>();
-                        result = employees.Select(t => new ag_othersource
+                        result = employees.OrderBy(t=>Convert.ToInt32(t.PersonnelNumber)).Select(t => new ag_othersource
                         {
                             SecondId = secondId,
                             WorkNumber = t.PersonnelNumber,
@@ -671,7 +672,7 @@ public List<ag_othersource> GetOtherTempDetails(int userId, int secondId, int is
                         isSupplementTitlePerformance = prevSavedDataList == null || !prevSavedDataList.Any();
                         if (prevSavedDataList != null && prevSavedDataList.Any())
                         {
-                            result = prevSavedDataList.OrderBy(t => t.Id)
+                            result = prevSavedDataList.OrderBy(t => Convert.ToInt32(t.WorkNumber))
                                 .Select(t => new ag_othersource
                                 {
                                     SecondId = secondId,

performance/Performance.Services/SecondAllotService.cs

@@ -1818,6 +1818,37 @@ public List<SecondPerforResponse> DeptComputeDetail(int userId, int allotId, out
             return result;
         }
 
+        public List<DeptDataDetails> DeptComputeDetailList(int userId, int allotId, out int isShowManage)
+        {
+            var user = perforUserRepository.GetEntity(t => t.ID == userId);
+            if (user == null)
+                throw new NotImplementedException("人员ID无效");
+
+            var deptDatas = new List<DeptDataDetails>();
+            var allot = perforPerallotRepository.GetEntity(t => t.ID == allotId);
+            isShowManage = computeService.IsShowManage(allotId);
+
+            var userrole = userroleRepository.GetEntity(t => t.UserID == userId);
+            var role = roleRepository.GetEntity(t => t.ID == userrole.RoleID);
+            Dictionary<int, string> dict = new Dictionary<int, string>
+            {
+                { application.DirectorRole, AccountUnitType.科主任.ToString() },
+                { application.NurseRole, AccountUnitType.护士长.ToString() },
+                { application.OfficeRole, AccountUnitType.行政中层.ToString() },
+                { application.SpecialRole, AccountUnitType.科主任.ToString() },
+            };
+
+            if (!dict.Keys.Contains(role.Type.Value)) return new List<DeptDataDetails>();
+
+            var computes = rescomputeRepository.GetEntities(t => t.AllotID == allotId && t.AccountingUnit == user.Department && t.AccountType == dict[role.Type.Value]);
+            if (computes == null || !computes.Any()) return new List<DeptDataDetails>();
+            foreach (var item in computes)
+            {
+                deptDatas.Add(computeService.GetDoctorDetail(item.ID));
+            }
+            return deptDatas;
+        }
+
         /// <summary>
         /// 获取一次次绩效结果
         /// </summary>