31天再入院逻辑调整

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

@@ -27,19 +27,25 @@ public class ReBeHosDetailDTO {
     private String name;
 
     /**
-     * 主诊断
+     * 入院诊断
      */
-    @Excel(name = "主诊断", width = 50, needMerge = true, orderNum = "3")
+    @Excel(name = "入院诊断", width = 50, needMerge = true, orderNum = "3")
     private String diagnose;
+
+    /**
+     * 出院诊断
+     */
+    @Excel(name = "出院诊断", width = 50, needMerge = true, orderNum = "4")
+    private String diagnoseName;
     /**
      * 病历等级
      */
-    @Excel(name = "病历等级", width = 10, orderNum = "4")
+    @Excel(name = "病历等级", width = 10, orderNum = "5")
     private String level;
     /**
      * 病历得分
      */
-    @Excel(name = "病历得分", width = 10, orderNum = "5")
+    @Excel(name = "病历得分", width = 10, orderNum = "6")
     private Double scoreRes;
     /**
      * 科室编码
@@ -48,29 +54,29 @@ public class ReBeHosDetailDTO {
     /**
      * 科室
      */
-    @Excel(name = "科室", width = 50, orderNum = "6")
+    @Excel(name = "科室", width = 50, orderNum = "7")
     private String behDeptName;
     /**
      * 出院日期
      */
-    @Excel(name = "出院日期", format = "yyyy-MM-dd", width = 30, orderNum = "7")
+    @Excel(name = "出院日期", format = "yyyy-MM-dd", width = 30, orderNum = "8")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date leaveHospitalDate;
     /**
      * 入院日期
      */
-    @Excel(name = "入院日期", format = "yyyy-MM-dd", width = 30, orderNum = "8")
+    @Excel(name = "入院日期", format = "yyyy-MM-dd", width = 30, orderNum = "9")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date behospitalDate;
     /**
      * 住院天数
      */
-    @Excel(name = "住院天数", width = 15, orderNum = "9")
+    @Excel(name = "住院天数", width = 15, orderNum = "10")
     private String behospitalDayNum;
     /**
      * 住院费用
      */
-    @Excel(name = "住院费用", width = 15, orderNum = "10")
+    @Excel(name = "住院费用", width = 15, orderNum = "11")
     private String totleFee;
 
     private String age;

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

@@ -3029,7 +3029,8 @@ public class ConsoleFacade {
                 ReBeHosDetailDTO lastDetailRecord = new ReBeHosDetailDTO();
                 lastDetailRecord.setName(record.getName());
                 lastDetailRecord.setAge(record.getLastAge());
-                lastDetailRecord.setDiagnose(record.getLastDiagnoseName());
+                lastDetailRecord.setDiagnose(record.getLastDiagnose());
+                lastDetailRecord.setDiagnoseName(record.getLastDiagnoseName());
                 lastDetailRecord.setBehDeptId(record.getLastBehDeptId());
                 lastDetailRecord.setBehDeptName(record.getLastBehDeptName());
                 lastDetailRecord.setBehospitalCode(record.getLastBehospitalCode());
@@ -3054,7 +3055,7 @@ public class ConsoleFacade {
         int endIndex = startIndex + (int) size;
 
         if(retRecords.size()>1){
-            if( retRecords.size()-startIndex<retRecords.size()){
+            if( retRecords.size()-startIndex<(int)size){
                 retRecords = retRecords.subList(startIndex,retRecords.size());
             }else{
                 retRecords = retRecords.subList(startIndex,endIndex );