兼容sheetname就诊

performance/Performance.Services/ComputeService.cs

@@ -11,6 +11,7 @@
 using System.Text.RegularExpressions;
 using Performance.DtoModels.Request;
 using Performance.DtoModels.Response;
+using Performance.Services.ExtractExcelService;
 
 namespace Performance.Services
 {
@@ -1043,6 +1044,20 @@ 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;
+
+                if (name.IndexOf("就诊") > -1)
+                    _key = "就诊";
+
+                return _key;
+            };
+
+            string key = getShowKey.Invoke(persheet.FirstOrDefault(t => t.SheetName.NoBlank().StartsWith("1.1.1"))?.SheetName);
+
+
             DeptDataDetails deptDetails = new DeptDataDetails
             {
                 ShowFormula = allot.ShowFormula,
@@ -1050,7 +1065,7 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
                 Detail = new List<DetailDtos>()
             };
 
-            if (basicData == null || !basicData.Any()) return MergeDetails(deptDetails);
+            if (basicData == null || !basicData.Any()) return MergeDetails(deptDetails, key);
 
             var sheetType = new List<int>
             {
@@ -1118,7 +1133,7 @@ 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);
+            return MergeDetails(deptDetails, key);
             //return deptDetails;
         }
 
@@ -1243,7 +1258,7 @@ private List<DetailModule> CommonDetailItems(List<im_data> basicData, List<im_he
             return items;
         }
 
-        private DeptDataDetails<DetailModuleExtend> MergeDetails(DeptDataDetails details)
+        private DeptDataDetails<DetailModuleExtend> MergeDetails(DeptDataDetails details, string key)
         {
             if (details == null) return new DeptDataDetails<DetailModuleExtend>();
 
@@ -1256,6 +1271,7 @@ private DeptDataDetails<DetailModuleExtend> MergeDetails(DeptDataDetails details
 
             if (details.Detail == null || !details.Detail.Any(t => t.IncomeType == 1)) return result;
 
+            string[] sheetNameKeys = new string[] { "就诊", "开单" };
             foreach (var groupbasis in details.Detail.Select(t => t.GroupBasis).Distinct())
             {
                 var items = new List<DetailModuleExtend>();
@@ -1267,7 +1283,7 @@ private DeptDataDetails<DetailModuleExtend> MergeDetails(DeptDataDetails details
                     {
                         depts.AddRange(t.Items.Select(o => o.ItemName));
                     });
-                    var billing = data.FirstOrDefault(t => t.ItemName.Replace("就诊", "开单").IndexOf("开单") > -1);
+                    var billing = data.FirstOrDefault(t => t.ItemName.IndexOf(key) > -1);
                     var execute = data.FirstOrDefault(t => t.ItemName.IndexOf("执行") > -1);
                     foreach (var dept in depts.Distinct().OrderBy(t => t))
                     {
@@ -1316,7 +1332,7 @@ private DeptDataDetails<DetailModuleExtend> MergeDetails(DeptDataDetails details
                 result.Detail.Add(new DetailDtos<DetailModuleExtend>
                 {
                     ItemName = data.FirstOrDefault(t => t.ItemName.IndexOf("执行") > -1) is null ? data.First().ItemName :
-                    data.FirstOrDefault(t => t.ItemName.IndexOf("执行") > -1).ItemName?.Replace("执行", "开单/执行"),
+                    data.FirstOrDefault(t => t.ItemName.IndexOf("执行") > -1).ItemName?.Replace("执行", $"{key}/执行"),
                     IncomeType = data.First()?.IncomeType ?? 0,
                     OriginalType = data.First()?.OriginalType ?? 0,
                     Amount = data.Sum(w => w.Amount),

performance/Performance.Services/ExConfigService.cs

@@ -72,6 +72,7 @@ public List<ex_module> QueryModule(int hospitalId)
             DefaultModules(hospitalId);
 
             var list = exmoduleRepository.GetEntities(t => t.HospitalId == hospitalId).OrderBy(t => t.ModuleName).ToList();
+            list?.ForEach(t => t.ReadOnly = t.SheetType == (int)SheetType.Income ? 0 : 1);
             return list;
         }
 
@@ -90,7 +91,7 @@ private void DefaultModules(int hospitalId)
             };
 
             var data = exmoduleRepository.GetEntities(t => t.HospitalId == hospitalId);
-            var inexistence = data == null ? moduleList : moduleList.Where(t => !data.Select(p => p.ModuleName).ToArray().Contains(t.ModuleName));
+            var inexistence = data == null ? moduleList : moduleList.Where(t => !data.Any(w => w.ModuleName.StartsWith(t.ModuleName.Split(' ')[0])));
 
             if (inexistence != null && inexistence.Any())
             {
@@ -102,7 +103,7 @@ private void DefaultModules(int hospitalId)
                         HospitalId = hospitalId,
                         ModuleName = item.ModuleName,
                         SheetType = (int)item.SheetType,
-                        ReadOnly = 1,
+                        ReadOnly = item.SheetType == (int)SheetType.Income ? 0 : 1,
                         TypeId = null,
                     };
                     modules.Add(module);
@@ -121,7 +122,7 @@ public ex_module AddModule(ModModuleRequest request)
             if (request.SheetType == (int)SheetType.Income)
             {
                 string[] array = new string[] { "开单收入", "执行收入" };
-                if (request.ModuleName.IndexOf("开单收入") == -1 && request.ModuleName.IndexOf("执行收入") == -1)
+                if (request.ModuleName.IndexOf("开单收入") == -1 && request.ModuleName.IndexOf("就诊收入") == -1 && request.ModuleName.IndexOf("执行收入") == -1)
                     throw new PerformanceException("模块名称规则错误");
                 //if (!Regex.IsMatch(request.ModuleName, @"^[\u4e00-\u9fa5]+$"))
                 //    throw new PerformanceException("模块名称规则错误，请使用全中文命名");
@@ -132,7 +133,7 @@ public ex_module AddModule(ModModuleRequest request)
                     throw new PerformanceException("绩效模板已存在！");
 
                 var moduleList = exmoduleRepository.GetEntities(t => t.HospitalId == request.HospitalId && t.ModuleName.IndexOf("1.") != -1);
-                string name = request.ModuleName.Replace("开单收入", "").Replace("执行收入", "");
+                string name = request.ModuleName.Replace("开单收入", "").Replace("就诊收入", "").Replace("执行收入", "");
                 var exist = moduleList.Where(t => t.ModuleName.Contains(name));
                 if (exist != null && exist.Any())
                 {

performance/Performance.Services/ExtractExcelService/ExtractHelper/ExtractHelper.cs

@@ -57,7 +57,7 @@ public static void CreateNotExistSheet(List<ex_module> modulesList, IWorkbook wo
                 var sheet = workbook.GetSheet(module.ModuleName) ?? workbook.GetSheet(module.ModuleName.NoBlank());
                 if (sheet == null)
                 {
-                    string[] keyArray = new string[] { "开单", "执行" };
+                    string[] keyArray = new string[] { "开单", "就诊", "执行" };
                     if (keyArray.Any(key => module.ModuleName.Contains(key)))
                     {
                         var item = pairs.Where(t => t.Key.StartsWith("1.")).OrderByDescending(t => t.Key).First();