31天再入院

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

@@ -39,31 +39,38 @@ public class ReBeHosDetailByDeptDTO {
      * 科室编码
      */
     private String behDeptId;
+
+    /**
+     * 科室
+     */
+    @Excel(name = "科室", width = 50, orderNum = "5")
+    private String behDeptName;
+
     /**
      * 主管医生
      */
-    @Excel(name = "主管医生", width = 50, orderNum = "5")
+    @Excel(name = "主管医生", width = 50, orderNum = "6")
     private String doctorName;
     /**
      * 出院日期
      */
-    @Excel(name = "出院日期", format = "yyyy-MM-dd", width = 30, orderNum = "6")
+    @Excel(name = "出院日期", format = "yyyy-MM-dd", width = 30, orderNum = "7")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date leaveHospitalDate;
     /**
      * 入院日期
      */
-    @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 behospitalDate;
     /**
      * 住院天数
      */
-    @Excel(name = "住院天数", width = 15, orderNum = "8")
+    @Excel(name = "住院天数", width = 15, orderNum = "9")
     private String behospitalDayNum;
     /**
      * 住院费用
      */
-    @Excel(name = "住院费用", width = 15, orderNum = "9")
+    @Excel(name = "住院费用", width = 15, orderNum = "10")
     private String totleFee;
 }

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

@@ -31,6 +31,7 @@ public class ReBeHosMergeDTO {
     private Date leaveHospitalDate;
     private String lastBehDeptId;
     private String lastBehDeptName;
+    private String lastDoctorName;
     private String lastBehospitalCode;
     private Double lastScoreRes;
     private String lastLevel;

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

@@ -70,6 +70,7 @@ public class BasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
                 QueryWrapper<BehospitalInfo> QueryWrapper = new QueryWrapper<>();
                 QueryWrapper.eq("hospital_id",basDoctorInfoVO.getHospitalId());
                 QueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+                QueryWrapper.eq("is_placefile", basDoctorInfoVO.getIsPlacefile());
                 QueryWrapper.in("beh_dept_id",deptSetInfo);
 
                 if(StringUtils.isNotEmpty(basDoctorInfoVO.getInputStr())){

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

@@ -913,7 +913,8 @@ public class ConsoleByDeptFacade {
                 ReBeHosDetailByDeptDTO lastDetailRecord = new ReBeHosDetailByDeptDTO();
                 lastDetailRecord.setName(record.getName());
                 lastDetailRecord.setBehDeptId(record.getLastBehDeptId());
-                lastDetailRecord.setDoctorName(record.getDoctorName());
+                lastDetailRecord.setBehDeptName(record.getLastBehDeptName());
+                lastDetailRecord.setDoctorName(record.getLastDoctorName());
                 lastDetailRecord.setBehospitalCode(record.getLastBehospitalCode());
                 lastDetailRecord.setBehospitalDate(record.getLastBehospitalDate());
                 lastDetailRecord.setLeaveHospitalDate(record.getLastLeaveHospitalDate());

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

@@ -1972,7 +1972,7 @@ public class ConsoleFacade {
                 ReBeHosDetailDTO lastDetailRecord = new ReBeHosDetailDTO();
                 lastDetailRecord.setName(record.getName());
                 lastDetailRecord.setBehDeptId(record.getLastBehDeptId());
-                lastDetailRecord.setBehDeptName(record.getBehDeptName());
+                lastDetailRecord.setBehDeptName(record.getLastBehDeptName());
                 lastDetailRecord.setBehospitalCode(record.getLastBehospitalCode());
                 lastDetailRecord.setBehospitalDate(record.getLastBehospitalDate());
                 lastDetailRecord.setLeaveHospitalDate(record.getLastLeaveHospitalDate());

src/main/java/com/diagbot/vo/data/BasDoctorInfoVO.java

@@ -16,6 +16,7 @@ public class BasDoctorInfoVO {
      * 搜索参数
      */
     private String inputStr;
+    private String isPlacefile;
     private String deptName;
     @ApiModelProperty(hidden = true)
     private String deptId;

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -13602,6 +13602,7 @@
         t.leaveHospitalDate,
         t.lastBehDeptId,
         t.lastBehDeptName,
+        t.lastDoctorName,
         t.lastBehospitalCode,
         t.lastBehospitalDate,
         t.lastLeaveHospitalDate,
@@ -13631,6 +13632,7 @@
         be.leaveHospitalDate,
         be.lastBehDeptId,
         be.lastBehDeptName,
+        be.lastDoctorName,
         be.lastBoctorId,
         be.lastBoctorName,
         be.lastBehospitalCode,
@@ -13656,8 +13658,8 @@
         r2.beh_dept_name AS lastBehDeptName,
         r2.behospital_code AS lastBehospitalCode,
         r2.behospital_date AS lastBehospitalDate,
-        r2.doctor_id as lastBoctorId,
-        r2.doctor_name as lastBoctorName,
+        r2.doctor_id as lastDoctorId,
+        r2.doctor_name as lastDoctorName,
         r2.leave_hospital_date AS lastLeaveHospitalDate,
         TIMESTAMPDIFF( DAY, DATE( r2.leave_hospital_date ), DATE( r1.behospital_date ) ) AS diffDays
         FROM