厦门五院个性化需求

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

@@ -59,7 +59,7 @@ public class QcResultShortDTO {
     private String behDoctorId;
     @Excel(name = "住院医生", width = 30, orderNum = "14")
     private String behDoctorName;
-    @Excel(name = "手术级别", width = 30, orderNum = "16")
+    @Excel(name = "手术级别", width = 30, orderNum = "18")
     private String operationLevel;
     /**
      * 主治医生id
@@ -73,7 +73,7 @@ public class QcResultShortDTO {
     private String directorDoctorId;
     @Excel(name = "主任医生", width = 30, orderNum = "16")
     private String directorDoctorName;
-    @Excel(name = "主刀医生", width = 30, orderNum = "16")
+    @Excel(name = "主刀医生", width = 30, orderNum = "17")
     private String operationDocterName;
     /**
      * 科室编码
@@ -82,9 +82,9 @@ public class QcResultShortDTO {
     /**
      * 科室名称
      */
-    @Excel(name = "科室", width = 70, orderNum = "17")
+    @Excel(name = "科室", width = 70, orderNum = "19")
     private String behDeptName;
-    @Excel(name = "评分时间", format = "yyyy-MM-dd", width = 30, orderNum = "18")
+    @Excel(name = "评分时间", format = "yyyy-MM-dd", width = 30, orderNum = "20")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date gradeTime;
 

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -7805,8 +7805,8 @@
     <select id="leaveHosMRPage" resultType="com.diagbot.dto.QcResultShortDTO">
         SELECT DISTINCT
         t.*,
-        t4.operation_doctor_id,
-        t4.operation_level
+        t4.operation_doctor_id AS operationDocterName,
+        t4.operation_level AS operationLevel
         FROM
         (SELECT
         t1.hospital_id AS hospitalId,
@@ -8075,10 +8075,10 @@
             AND t.`level` = #{qcResultShortPageVO.level}
         </if>
         <if test="qcResultShortPageVO.operationDoctor != null and qcResultShortPageVO.operationDoctor != ''">
-            AND t4.`operation_doctor_id` = #{qcResultShortPageVO.operationDoctor}
+            AND t4.`operationDocterName` = #{qcResultShortPageVO.operationDoctor}
         </if>
         <if test="qcResultShortPageVO.operationLevel != null and qcResultShortPageVO.operationLevel != ''">
-            AND t4.`operation_level` = #{qcResultShortPageVO.operationLevel}
+            AND t4.`operationLevel` = #{qcResultShortPageVO.operationLevel}
         </if>
     </select>