Merge branch 'feature/科室详情修改' into develop

performance/Performance.Services/ComputeService.cs

@@ -1188,7 +1188,7 @@ public List<res_baiscnorm> GetBaiscnorm(int allotId)
         /// <param name="accountId"></param>
         /// <param name="type"></param>
         /// <returns></returns>
-        public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
+        public DeptDataDetails DeptDetail(int accountId)
         {
             var account = perforResaccountRepository.GetEntity(t => t.ID == accountId);
             var allot = perforPerallotRepository.GetEntity(t => t.ID == account.AllotID);
@@ -1196,18 +1196,18 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
             var headers = _perforImheaderRepository.GetEntities(t => t.AllotID == account.AllotID);
             var basicData = _perforImDataRepository.GetEntities(t => t.AllotID == account.AllotID && t.AccountingUnit == account.AccountingUnit);
 
-            Func<string, string> getShowKey = (name) =>
-            {
-                string _key = "开单";
-                if (string.IsNullOrEmpty(name)) return _key;
+            //Func<string, string> getShowKey = (name) =>
+            //{
+            //    string _key = "开单";
+            //    if (string.IsNullOrEmpty(name)) return _key;
 
-                if (name.IndexOf("就诊") > -1)
-                    _key = "就诊";
+            //    if (name.IndexOf("就诊") > -1)
+            //        _key = "就诊";
 
-                return _key;
-            };
+            //    return _key;
+            //};
 
-            string key = getShowKey.Invoke(persheet.FirstOrDefault(t => t.SheetName.NoBlank().StartsWith("1.1.1"))?.SheetName);
+            //string key = getShowKey.Invoke(persheet.FirstOrDefault(t => t.SheetName.NoBlank().StartsWith("1.1.1"))?.SheetName);
 
 
             DeptDataDetails deptDetails = new DeptDataDetails
@@ -1217,7 +1217,7 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
                 Detail = new List<DetailDtos>()
             };
 
-            if (basicData == null || !basicData.Any()) return MergeDetails(deptDetails, key);
+            if (basicData == null || !basicData.Any()) return deptDetails;
 
             var sheetType = new List<int>
             {
@@ -1285,8 +1285,8 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
             deptDetails.Pandect.MaterialsExtra = deptDetails.Detail?.FirstOrDefault(w => w.OriginalType == (int)SheetType.AccountMaterialsAssess)?.Amount ?? deptDetails.Pandect.MaterialsExtra;
             deptDetails.Pandect.MedicineExtra = deptDetails.Detail?.FirstOrDefault(w => w.OriginalType == (int)SheetType.AccountDrugAssess)?.Amount ?? deptDetails.Pandect.MedicineExtra;
 
-            return MergeDetails(deptDetails, key);
-            //return deptDetails;
+            //return MergeDetails(deptDetails, key);
+            return deptDetails;
         }
 
         private decimal? GetFactors(List<per_sheet> persheet, List<im_data> basicData, UnitType type, SheetType sheetType)