09 01 01 全院损益计算

src/main/java/com/imed/costaccount/service/impl/HospProfitAndLossServiceImpl.java

@@ -27,6 +27,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -385,7 +386,7 @@ public class HospProfitAndLossServiceImpl extends ServiceImpl<HospProfitAndLossM
         // 得到上一层的title子节点
 //        ExcelWriter writer = ExcelUtil.getWriter();
         String time = DateUtil.format(DateUtil.date(), "yyyy年MM月dd日HH时mm分ss秒");
-        String fileName = hospProfitReportUrl + "全院损益" + time + ".xlsx";
+        String fileName = hospProfitReportUrl + File.separator + hospId + File.separator + "hospReport" + File.separator + "全院损益" + time + ".xlsx";
         ExcelWriter writer = ExcelUtil.getWriter(fileName);
 
         List<String> secondTitleListCode = leafResp.stream().map(Responsibility::getResponsibilityCode).collect(Collectors.toList());
@@ -440,7 +441,11 @@ public class HospProfitAndLossServiceImpl extends ServiceImpl<HospProfitAndLossM
                 continue;
             }
             int size = children.size();
-            writer.merge(lastRow, lastRow + size - 1, 0, 0, parentFormVO.getReportName(), true);
+            if (size == 1) {
+                writer.writeCellValue(0, lastRow, parentFormVO.getReportName());
+            } else {
+                writer.merge(lastRow, lastRow + size - 1, 0, 0, parentFormVO.getReportName(), true);
+            }
             // 具体的报表项目
             for (int j = 0; j < size; j++) {
                 // todo  可以抽取出单独方法
@@ -462,7 +467,7 @@ public class HospProfitAndLossServiceImpl extends ServiceImpl<HospProfitAndLossM
             lastRow = lastRow + size;
         }
         FileRecord fileRecord = new FileRecord();
-        fileRecord.setFileName("全院损益" + time + ".xlsx").setFileSource(1).setFileType("全院损益").setFileUrl(serverUrl + fileName).setHospId(hospId)
+        fileRecord.setFileName("全院损益" + time + ".xlsx").setFileSource(1).setFileType("全院损益").setFileUrl(serverUrl + hospId + File.separator + "hospReport" + File.separator + "全院损益" + time + ".xlsx").setHospId(hospId)
                 .setDateYear(year).setDateMonth(month)
                 .setCreateTime(System.currentTimeMillis());
         fileRecordService.save(fileRecord);

src/main/resources/application-dev.yml

@@ -58,17 +58,17 @@ logging:
 ####本地文件相关配置
 file:
   #Windows
-  #  filelocal: file:D:\\file\\
+  filelocal: file:D:\\file\\
   #linux
-  filelocal: file:/image/
+#  filelocal: file:/image/
   #linux
   #  serverPath: /image
   #windows
   serverPath: D://file
   #local
-  #  serverUrl: http://112.124.59.133:8082//
+  serverUrl: http://localhost:8082/
   #linux
-  serverUrl: http://112.124.59.133:8082/
+#  serverUrl: http://112.124.59.133:8082/
   ##全院损益计算的报表URL
   #windows
   hospProfitReportUrl: d:/