Merge branch 'hotfix/获取ename'

performance/Performance.Services/ExConfigService.cs

@@ -97,24 +97,18 @@ public void DefaultModules(int hospitalId)
             };
 
             var data = exmoduleRepository.GetEntities(t => t.HospitalId == hospitalId);
-            var inexistence = data == null ? moduleList : moduleList.Where(t => !data.Any(w => w.ModuleName.StartsWith(t.ModuleName.Split(' ')[0])));
+            var inexistence = (data == null || !data.Any()) ? moduleList : moduleList.Where(t => !data.Any(w => w.ModuleName.StartsWith(t.ModuleName.Split(' ')[0])));
 
             if (inexistence != null && inexistence.Any())
             {
-                List<ex_module> modules = new List<ex_module>();
-                foreach (var item in inexistence)
-                {
-                    var module = new ex_module
+                var modules = inexistence.Select(t => new ex_module
                 {
                     HospitalId = hospitalId,
-                        ModuleName = item.ModuleName,
-                        SheetType = (int)item.SheetType,
-                        ReadOnly = item.SheetType == (int)SheetType.Income ? 0 : 1,
+                    ModuleName = t.ModuleName,
+                    SheetType = (int)t.SheetType,
+                    ReadOnly = t.SheetType == (int)SheetType.Income ? 0 : 1,
                     TypeId = null,
-                    };
-                    modules.Add(module);
-                }
-                if (modules.Any())
+                });
                 exmoduleRepository.AddRange(modules.ToArray());
             }
         }

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

@@ -205,7 +205,7 @@ public static void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType s
                     filed = sheet.SheetName.Contains("住院") ? fieldInpat : fieldOut;
 
                 var ename = data.Where(w => w.SheetName == sheet.SheetName)?.FirstOrDefault(w => !string.IsNullOrEmpty(w.EName))?.EName;
-                if (string.IsNullOrEmpty(ename) || ename.Contains("住院") || ename.Contains("门诊"))
+                if (!string.IsNullOrEmpty(ename) && (ename.Contains("住院") || ename.Contains("门诊")))
                     filed = ename.Contains("住院") ? fieldInpatOut : fieldOutInpat;
             }
             else if (sheet.SheetName.Contains("工作量"))