东方医院抽取

performance/Performance.Api/Performance.Api.csproj

@@ -77,6 +77,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="Template\东方医院绩效模板.xlsx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="Template\医院二次分配绩效模板.xlsx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

performance/Performance.Extract.Api/Controllers/ExtractController.cs

@@ -23,12 +23,14 @@ public class ExtractController : Controller
     {
         private readonly ExtractService extractService;
         private readonly NewExtractService newExtractService;
+        private readonly DFExtractService dfExtractService;
         private readonly HospitalService hospitalService;
         private readonly WebapiUrl url;
         private readonly ILogger<ExtractController> logger;
         private readonly IHostingEnvironment evn;
         public ExtractController(ExtractService extractService,
             NewExtractService newExtractService,
+            DFExtractService dfExtractService,
             HospitalService hospitalService,
             IOptions<WebapiUrl> url,
             ILogger<ExtractController> logger,
@@ -36,6 +38,7 @@ public class ExtractController : Controller
         {
             this.extractService = extractService;
             this.newExtractService = newExtractService;
+            this.dfExtractService = dfExtractService;
             this.hospitalService = hospitalService;
             this.url = url.Value;
             this.logger = logger;
@@ -119,7 +122,8 @@ public void ExtractData([CustomizeValidator, FromBody]ExtractRequest request)
         {
             LogHelper.Information("请求参数：" + JsonHelper.Serialize(request), "提取绩效数据");
             logger.LogInformation("请求参数：" + JsonHelper.Serialize(request));
-            string filePath = newExtractService.ExtractData(request.AllotId, request.Email, request.HospitalId);
+            //string filePath = newExtractService.ExtractData(request.AllotId, request.Email, request.HospitalId);
+            string filePath = dfExtractService.ExtractData(request.AllotId, request.Email, request.HospitalId);
             if (!string.IsNullOrEmpty(filePath) && FileHelper.IsExistFile(filePath))
             {
                 logger.LogInformation("请求路径：" + url.ImportFile + ",请求参数" + JsonHelper.Serialize(new { allotId = request.AllotId, hospitalId = request.HospitalId }));

performance/Performance.Extract.Api/Performance.Extract.Api.csproj

@@ -26,10 +26,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Template\" />
-  </ItemGroup>
-
-  <ItemGroup>
     <None Include="..\Performance.Api\Template\医院二次分配绩效模板.xlsx" Link="Template\医院二次分配绩效模板.xlsx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -38,6 +34,12 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="Template\东方医院绩效模板.xlsx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
   <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JSONSchema="" /></VisualStudio></ProjectExtensions>
 
 </Project>

performance/Performance.Services/NewExtractService.cs

@@ -896,7 +896,7 @@ public string Judge(int allotId, int hospitalId, int useTemplate)
                 // 获取最近一次绩效
                 var statesArray = new int[] { (int)AllotStates.GenerateSucceed, (int)AllotStates.Archive };
                 var allotList = perforPerallotRepository.GetEntities(t => t.HospitalId == hospitalId && statesArray.Contains(t.States));
-                var allotLast = allotList.OrderByDescending(t => t.Year).ThenByDescending(t => t.Month).First();
+                var allotLast = allotList?.OrderByDescending(t => t.Year).ThenByDescending(t => t.Month).First();
                 // 获取当前医院模版信息
                 var modulesList = perforModmoduleRepository.GetEntities(t => t.HospitalId == hospitalId);
                 if (modulesList == null || modulesList.Count == 0)