科室增加31天再入院计划

src/main/java/com/diagbot/dto/ReBeHosByDeptDTO.java

@@ -31,9 +31,13 @@ public class ReBeHosByDeptDTO {
      */
     @Excel(name = "间隔天数", width = 10, needMerge = true, orderNum = "4")
     private Integer diffDays;
+
+    @Excel(name = "是否有出院31天内再住院计划", width = 30, needMerge = true,  orderNum = "5")
+    private String lastAgainBehospitalPlan;//31天再入院计划(是/否)
+
     /**
      * 比较病历组
      */
-    @ExcelCollection(name = "", orderNum = "5")
+    @ExcelCollection(name = "", orderNum = "6")
     private List<ReBeHosDetailByDeptDTO> details;
 }

src/main/java/com/diagbot/facade/ConsoleByDeptFacade.java

@@ -913,6 +913,7 @@ public class ConsoleByDeptFacade {
             Iterator<ReBeHosMergeDTO> iterator = records.iterator();
             while(iterator.hasNext()){
                 ReBeHosMergeDTO record = iterator.next();
+                strTrans(record);
                 Boolean flag = ConsoleFacade.isContainDiagnose(record);
                 if(!flag){
                     iterator.remove();
@@ -965,6 +966,18 @@ public class ConsoleByDeptFacade {
         retPage.setRecords(retRecords);
         return retPage;
     }
+
+    public static void strTrans(ReBeHosMergeDTO record) {
+        String replace = record.getLastAgainBehospitalPlan();
+        if(StringUtils.isEmpty(record.getLastAgainBehospitalPlan())){
+            replace = "否";
+        }
+        replace = record.getLastAgainBehospitalPlan().replace("无", "否")
+                .replace("-", "无").replace("是一周后", "是")
+                .replace("1", "否").replace("2", "是")
+                .replace("有", "是");
+        record.setLastAgainBehospitalPlan(replace);
+    }
     /**
      * 未整改病历质控评分页-科室（内页）
      *

src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -3015,6 +3015,7 @@ public class ConsoleFacade {
             Iterator<ReBeHosMergeDTO> iterator = records.iterator();
             while(iterator.hasNext()){
                 ReBeHosMergeDTO record = iterator.next();
+                ConsoleByDeptFacade.strTrans(record);
                 Boolean flag = isContainDiagnose(record);
                 if(!flag){
                     iterator.remove();

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -14347,6 +14347,8 @@
         mqi.LEVEL AS LEVEL,
         mqi_last.score_res AS lastScoreRes,
         mqi_last.LEVEL AS lastLevel,
+        mhp.again_behospital_plan AS againBehospitalPlan,
+        mhp_last.again_behospital_plan AS lastAgainBehospitalPlan,
         mhp.total_fee AS totleFee,
         mhp.behospital_day_num AS behospitalDayNum,
         mhp_last.total_fee AS lastTotleFee,