Browse Source

页面也导出字段同步

chengyao 3 years ago
parent
commit
3448f0a1b7

+ 1 - 1
src/main/java/com/diagbot/dto/ReBeHosByDeptDTO.java

@@ -30,7 +30,7 @@ public class ReBeHosByDeptDTO {
      * 间隔天数
      */
     @Excel(name = "间隔天数", width = 10, needMerge = true, orderNum = "4")
-    private Integer diffDays;
+    private String diffDays;
 
     @Excel(name = "是否有出院31天内再住院计划", width = 30, needMerge = true,  orderNum = "5")
     private String lastAgainBehospitalPlan;//31天再入院计划(是/否)

+ 1 - 1
src/main/java/com/diagbot/dto/ReBeHosDTO.java

@@ -30,7 +30,7 @@ public class ReBeHosDTO {
      * 间隔天数
      */
     @Excel(name = "间隔天数", width = 10, needMerge = true, orderNum = "4")
-    private Integer diffDays;
+    private String diffDays;
 
 
     @Excel(name = "是否有出院31天内再住院计划", width = 30, needMerge = true,  orderNum = "5")

+ 1 - 1
src/main/java/com/diagbot/dto/ReBeHosMergeDTO.java

@@ -42,7 +42,7 @@ public class ReBeHosMergeDTO {
     private Date lastBehospitalDate;
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date lastLeaveHospitalDate;
-    private Integer diffDays;
+    private String diffDays;
     private String totleFee;
     private String behospitalDayNum;
     private String againBehospitalPlan;//31天再入院计划(是/否)

+ 3 - 0
src/main/java/com/diagbot/facade/ConsoleByDeptFacade.java

@@ -977,6 +977,9 @@ public class ConsoleByDeptFacade {
     }
 
     public static void strTrans(ReBeHosMergeDTO record) {
+        if(StringUtils.isNotBlank(record.getDiffDays()) && "0".equals(record.getDiffDays())){
+            record.setDiffDays("-");
+        }
         String replace = record.getLastAgainBehospitalPlan();
         if(StringUtils.isEmpty(replace)){
             replace = "否";