科室导出也新增字段

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

@@ -18,6 +18,8 @@ import java.util.List;
 public class ExportExcelBehByDeptDTO {
     @Excel(name = "患者姓名", needMerge = true)
     private String patName;
+    @Excel(name = "病案号", needMerge = true)
+    private String fileCode;
     @Excel(name = "住院号", needMerge = true)
     private String behospitalCode;
     @Excel(name = "入院时间", needMerge = true, exportFormat = "yyyy/MM/dd")

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

@@ -20,10 +20,10 @@ public class ExportExcelBehospitalDTO {
     private String doctorName;
     @Excel(name = "患者姓名", needMerge = true)
     private String patName;
-    @Excel(name = "住院号", needMerge = true)
-    private String behospitalCode;
     @Excel(name = "病案号", needMerge = true)
     private String fileCode;
+    @Excel(name = "住院号", needMerge = true)
+    private String behospitalCode;
     @Excel(name = "入院时间", needMerge = true, exportFormat = "yyyy/MM/dd")
     private Date behospitalDate;
     @Excel(name = "出院时间", needMerge = true, exportFormat = "yyyy/MM/dd")

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

@@ -16,6 +16,8 @@ import java.util.Date;
 public class ExportExcelWideBehByDeptDTO {
     @Excel(name = "患者姓名", needMerge = true)
     private String patName;
+    @Excel(name = "病案号", needMerge = true)
+    private String fileCode;
     @Excel(name = "住院号", needMerge = true)
     private String behospitalCode;
     @Excel(name = "入院时间", needMerge = true, exportFormat = "yyyy/MM/dd")

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

@@ -16,6 +16,8 @@ public class ExportExcelWideBehospitalDTO {
     private String doctorName;
     @Excel(name = "患者姓名", needMerge = true)
     private String patName;
+    @Excel(name = "病案号", needMerge = true)
+    private String fileCode;
     @Excel(name = "住院号", needMerge = true)
     private String behospitalCode;
     @Excel(name = "入院时间", needMerge = true, exportFormat = "yyyy/MM/dd")

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

@@ -155,6 +155,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     QcresultDetailFacade qcresultDetailFacade;
 
 
+
     /**
      * 分页
      *
@@ -2058,6 +2059,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                     ExportExcelWideBehospitalDTO exportExcelWideBehospitalDTO = new ExportExcelWideBehospitalDTO();
                     exportExcelWideBehospitalDTO.setDoctorName(exportExcelBehospitalDTO.getDoctorName());
                     exportExcelWideBehospitalDTO.setBehospitalCode(exportExcelBehospitalDTO.getBehospitalCode());
+                    exportExcelWideBehospitalDTO.setFileCode(exportExcelBehospitalDTO.getFileCode());
                     exportExcelWideBehospitalDTO.setBehospitalDate(exportExcelBehospitalDTO.getBehospitalDate());
                     exportExcelWideBehospitalDTO.setLeaveHospitalDate(exportExcelBehospitalDTO.getLeaveHospitalDate());
                     exportExcelWideBehospitalDTO.setPatName(exportExcelBehospitalDTO.getPatName());

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

@@ -579,6 +579,7 @@ public class ConsoleByDeptExportFacade {
                 exportExcelBehByDeptDTOS.forEach(exportExcelBehByDeptDTO->{
                     ExportExcelWideBehByDeptDTO exportExcelWideBehByDeptDTO = new ExportExcelWideBehByDeptDTO();
                     exportExcelWideBehByDeptDTO.setBehospitalCode(exportExcelBehByDeptDTO.getBehospitalCode());
+                    exportExcelWideBehByDeptDTO.setFileCode(exportExcelBehByDeptDTO.getFileCode());
                     exportExcelWideBehByDeptDTO.setBehospitalDate(exportExcelBehByDeptDTO.getBehospitalDate());
                     exportExcelWideBehByDeptDTO.setLeaveHospitalDate(exportExcelBehByDeptDTO.getLeaveHospitalDate());
                     exportExcelWideBehByDeptDTO.setPatName(exportExcelBehByDeptDTO.getPatName());

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -4270,6 +4270,7 @@
                     ofType="com.diagbot.dto.ExportExcelBehByDeptDTO">
             <result column="patName" property="patName"/>
             <result column="behospitalCode" property="behospitalCode"/>
+            <result column="fileCode" property="fileCode"/>
             <result column="behospitalDate" property="behospitalDate"/>
             <result column="leaveHospitalDate" property="leaveHospitalDate"/>
             <result column="score" property="score"/>