Merge branch 'dev/20201224_2.0.0' into debug

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

@@ -19,7 +19,7 @@ public class EntryStasByDeptDTO {
     /**
      * 主治医生
      */
-    @Excel(name = "主治医生", width = 30, orderNum = "1")
+    @Excel(name = "主管医生", width = 30, orderNum = "1")
     private String doctorName;
     /**
      * 未在24小时内完成会诊数

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

@@ -937,7 +937,7 @@ public class ConsoleByDeptFacade {
                 casesEntryIds.add(Long.valueOf(keyValue[0]));
             }
         }
-        IPage<MedicalCheckDTO> medicalCheck = behospitalInfoFacade.getMedicalCheck(filterVO,casesEntryIds);
+        IPage<MedicalCheckDTO> medicalCheck = behospitalInfoFacade.getMedicalChecks(filterVO,casesEntryIds);
         return medicalCheck;
     }
 

src/main/java/com/diagbot/service/BehospitalInfoService.java

@@ -392,6 +392,12 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      */
     IPage<MedicalCheckDTO>  getMedicalCheck(FilterMedicalCheckVO filterVO,@Param("casesEntryIds")List<Long> casesEntryIds);
 
+    /**
+     * 病历稽查表
+     * @return
+     */
+    IPage<MedicalCheckDTO>  getMedicalChecks(FilterMedicalCheckVO filterVO,@Param("casesEntryIds")List<Long> casesEntryIds);
+
     /**
      * 病历稽查表导出
      * @return

src/main/java/com/diagbot/service/impl/BehospitalInfoServiceImpl.java

@@ -548,6 +548,107 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      */
     @Override
     public IPage<MedicalCheckDTO> getMedicalCheck(@Param("filterVO") FilterMedicalCheckVO filterVO, @Param("casesEntryIds") List<Long> casesEntryIds) {
+        IPage<MedicalCheckDTO> medicalCheck = baseMapper.getMedicalCheck(filterVO);
+        List<MedicalCheckIdNameDTO> medicalEntryIds = baseMapper.getMedicalEntryIds(casesEntryIds);
+
+        List<MedicalCheckDTO> records = medicalCheck.getRecords();
+        for (MedicalCheckDTO record : records) {
+            for (MedicalCheckIdNameDTO medicalEntryId : medicalEntryIds) {
+                if ("2170".equals(medicalEntryId.getId())) {
+                    record.setEntry_2170_id(medicalEntryId.getId());
+                    record.setEntry_2170_name(medicalEntryId.getName());
+                }
+                if ("2217".equals(medicalEntryId.getId())) {
+                    record.setEntry_2217_id(medicalEntryId.getId());
+                    record.setEntry_2217_name(medicalEntryId.getName());
+                }
+                if ("2218".equals(medicalEntryId.getId())) {
+                    record.setEntry_2218_id(medicalEntryId.getId());
+                    record.setEntry_2218_name(medicalEntryId.getName());
+                }
+                if ("2220".equals(medicalEntryId.getId())) {
+                    record.setEntry_2220_id(medicalEntryId.getId());
+                    record.setEntry_2220_name(medicalEntryId.getName());
+                }
+                if ("2229".equals(medicalEntryId.getId())) {
+                    record.setEntry_2229_id(medicalEntryId.getId());
+                    record.setEntry_2229_name(medicalEntryId.getName());
+                }
+                if ("2287".equals(medicalEntryId.getId())) {
+                    record.setEntry_2287_id(medicalEntryId.getId());
+                    record.setEntry_2287_name(medicalEntryId.getName());
+                }
+                if ("2486".equals(medicalEntryId.getId())) {
+                    record.setEntry_2486_id(medicalEntryId.getId());
+                    record.setEntry_2486_name(medicalEntryId.getName());
+                }
+                if ("2495".equals(medicalEntryId.getId())) {
+                    record.setEntry_2495_id(medicalEntryId.getId());
+                    record.setEntry_2495_name(medicalEntryId.getName());
+                }
+                if ("2654".equals(medicalEntryId.getId())) {
+                    record.setEntry_2654_id(medicalEntryId.getId());
+                    record.setEntry_2654_name(medicalEntryId.getName());
+                }
+                if ("2655".equals(medicalEntryId.getId())) {
+                    record.setEntry_2655_id(medicalEntryId.getId());
+                    record.setEntry_2655_name(medicalEntryId.getName());
+                }
+                if ("2657".equals(medicalEntryId.getId())) {
+                    record.setEntry_2657_id(medicalEntryId.getId());
+                    record.setEntry_2657_name(medicalEntryId.getName());
+                }
+                if ("2658".equals(medicalEntryId.getId())) {
+                    record.setEntry_2658_id(medicalEntryId.getId());
+                    record.setEntry_2658_name(medicalEntryId.getName());
+                }
+                if ("2686".equals(medicalEntryId.getId())) {
+                    record.setEntry_2686_id(medicalEntryId.getId());
+                    record.setEntry_2686_name(medicalEntryId.getName());
+                }
+                if ("2852".equals(medicalEntryId.getId())) {
+                    record.setEntry_2852_id(medicalEntryId.getId());
+                    record.setEntry_2852_name(medicalEntryId.getName());
+                }
+                if ("2900".equals(medicalEntryId.getId())) {
+                    record.setEntry_2900_id(medicalEntryId.getId());
+                    record.setEntry_2900_name(medicalEntryId.getName());
+                }
+                if ("2930".equals(medicalEntryId.getId())) {
+                    record.setEntry_2930_id(medicalEntryId.getId());
+                    record.setEntry_2930_name(medicalEntryId.getName());
+                }
+                if ("3010".equals(medicalEntryId.getId())) {
+                    record.setEntry_3010_id(medicalEntryId.getId());
+                    record.setEntry_3010_name(medicalEntryId.getName());
+                }
+                if ("3025".equals(medicalEntryId.getId())) {
+                    record.setEntry_3025_id(medicalEntryId.getId());
+                    record.setEntry_3025_name(medicalEntryId.getName());
+                }
+                if ("3062".equals(medicalEntryId.getId())) {
+                    record.setEntry_3062_id(medicalEntryId.getId());
+                    record.setEntry_3062_name(medicalEntryId.getName());
+                }
+                if ("3063".equals(medicalEntryId.getId())) {
+                    record.setEntry_3063_id(medicalEntryId.getId());
+                    record.setEntry_3063_name(medicalEntryId.getName());
+                }
+            }
+        }
+
+        return medicalCheck;
+
+    }
+
+    /**
+     * 病历稽查表-科室
+     *
+     * @param filterVO
+     * @return
+     */
+    @Override
+    public IPage<MedicalCheckDTO> getMedicalChecks(@Param("filterVO") FilterMedicalCheckVO filterVO, @Param("casesEntryIds") List<Long> casesEntryIds) {
         IPage<MedicalCheckDTO> medicalCheck = baseMapper.getMedicalCheckByDept(filterVO);
         List<MedicalCheckIdNameDTO> medicalEntryIds = baseMapper.getMedicalEntryIds(casesEntryIds);
 

src/main/java/com/diagbot/vo/FilterMedicalCheckVO.java

@@ -42,6 +42,11 @@ public class FilterMedicalCheckVO extends Page {
      */
     private String deptName;
 
+    /**
+     * 主管医生
+     */
+    private String name;
+
     /**
      * 是否归档（0：未归档，1：已归档）
      */

src/main/java/com/diagbot/vo/FilterUnModifyMRVO.java

@@ -62,4 +62,5 @@ public class FilterUnModifyMRVO {
      * 是否归档（0：未归档，1：已归档）
      */
     private String isPlacefile = "1";
+    private String doctorName;
 }

src/main/resources/bootstrap.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: mrqc-sys
   profiles:
-    active: local
+    active: test
   main:
     allow-bean-definition-overriding: true
 

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -52,7 +52,7 @@
         h.check_time AS mr_time
         from (
         select a.*, ifnull(b.level,'未评分') as `level`, b.grade_type, b.score_res, b.gmt_create as
-        grade_time,IF(c.age is null, null,CONCAT( ifnull(c.age,'') ,ifnull(c.age_unit,'') )as age,e.score_res as score_bn from med_behospital_info a
+        grade_time,IF(c.age is null, null,CONCAT( ifnull(c.age,'') ,ifnull(c.age_unit,'') ))as age,e.score_res as score_bn from med_behospital_info a
         LEFT JOIN med_qcresult_info b
         on a.behospital_code = b.behospital_code and b.is_deleted = 'N'
         left join med_home_page c
@@ -379,7 +379,7 @@
             AND t.diagnose LIKE CONCAT( '%', #{diagnose}, '%' )
         </if>
         <if test="deptName != null and deptName != ''">
-            and t.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
+            and t.beh_dept_name = #{deptName}
         </if>
         <if test="doctorName != null and doctorName != ''">
             and CONCAT(
@@ -511,7 +511,7 @@
             AND t.diagnose LIKE CONCAT( '%', #{diagnose}, '%' )
         </if>
         <if test="deptName != null and deptName != ''">
-            and t.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
+            and t.beh_dept_name = #{deptName}
         </if>
         <if test="name != null and name != ''">
             and t.name like CONCAT('%',#{name},'%')
@@ -2819,7 +2819,7 @@
             AND e.user_id = #{userId}
         </if>
         <if test="deptName != null and deptName != ''">
-            and a.beh_dept_name like CONCAT('%',#{deptName},'%')
+            and a.beh_dept_name = #{deptName}
         </if>
         GROUP BY
         a.doctor_id,
@@ -2882,7 +2882,7 @@
             AND f.user_id = #{userId}
         </if>
         <if test="deptName != null and deptName != ''">
-            and a.beh_dept_name like CONCAT('%',#{deptName},'%')
+            and a.beh_dept_name = #{deptName}
         </if>
         GROUP BY
         a.doctor_id,
@@ -2969,7 +2969,7 @@
             AND e.user_id = #{userId}
         </if>
         <if test="deptName != null and deptName != ''">
-            and a.beh_dept_name like CONCAT('%',#{deptName},'%')
+            and a.beh_dept_name = #{deptName}
         </if>
         GROUP BY
         a.doctor_id,
@@ -3032,7 +3032,7 @@
             AND f.user_id = #{userId}
         </if>
         <if test="deptName != null and deptName != ''">
-            and a.beh_dept_name like CONCAT('%',#{deptName},'%')
+            and a.beh_dept_name = #{deptName}
         </if>
         GROUP BY
         a.doctor_id,
@@ -3203,6 +3203,9 @@
         <if test="deptName!=null and deptName !=''">
             AND a.beh_dept_name = #{deptName}
         </if>
+        <if test="name != null and name != ''">
+            AND a.doctor_name  like CONCAT('%', #{name}, '%')
+        </if>
         GROUP BY
         a.doctor_id,
         a.doctor_name
@@ -3273,6 +3276,9 @@
         <if test="deptName!=null and deptName !=''">
             AND a.beh_dept_name = #{deptName}
         </if>
+        <if test="name != null and name != ''">
+            AND a.doctor_name  like CONCAT('%', #{name}, '%')
+        </if>
         GROUP BY
         a.doctor_id,
         a.doctor_name
@@ -3359,6 +3365,9 @@
         <if test="deptName!=null and deptName !=''">
             AND a.beh_dept_name = #{deptName}
         </if>
+        <if test="name != null and name != ''">
+            AND a.doctor_name  like CONCAT('%', #{name}, '%')
+        </if>
         GROUP BY
         a.doctor_id,
         a.doctor_name
@@ -3696,7 +3705,7 @@
         AND t1.behDeptName = t2.behDeptName
         ORDER BY
         t1.behDeptName,
-        t1.behDoctorName,
+        t1.doctorName,
         t1.patName,
         <if test="radioCheck !=null and radioCheck == 1">
         t1.caseName,
@@ -3843,7 +3852,7 @@
             OR a.director_doctor_id like CONCAT('%',#{doctorCode},'%'))
         </if>
         <if test="deptName != null and deptName != ''">
-            and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
+            and a.beh_dept_name = #{deptName}
         </if>
         <if test="name != null and name != ''">
             AND a.name like CONCAT('%',#{name},'%')
@@ -3913,7 +3922,7 @@
             OR a.director_doctor_id like CONCAT('%',#{doctorCode},'%'))
         </if>
         <if test="deptName != null and deptName != ''">
-            and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
+            and a.beh_dept_name = #{deptName}
         </if>
         <if test="name != null and name != ''">
             AND a.name like CONCAT('%',#{name},'%')
@@ -4077,6 +4086,9 @@
         <if test="deptId != null and deptId != ''">
             AND a.beh_dept_id = #{deptId}
         </if>
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name = #{deptName}
+        </if>
         <if test="name != null and name != ''">
             AND a.name like CONCAT('%',#{name},'%')
         </if>
@@ -4151,6 +4163,9 @@
         <if test="deptId != null and deptId != ''">
             AND a.beh_dept_id = #{deptId}
         </if>
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name = #{deptName}
+        </if>
         <if test="name != null and name != ''">
             AND a.name like CONCAT('%',#{name},'%')
         </if>
@@ -4810,7 +4825,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
@@ -5602,8 +5617,11 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
             </if>
         </if>
+        <if test="doctorName != null and doctorName != ''">
+            AND a.doctor_name  like CONCAT('%', #{doctorName}, '%')
+        </if>
         <if test="deptName != null and deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
+            AND a.beh_dept_name = #{deptName}
         </if>
         ) c
         LEFT JOIN med_qcresult_detail d ON d.is_deleted = 'N'
@@ -5681,8 +5699,11 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
             </if>
         </if>
+        <if test="doctorName != null and doctorName != ''">
+            AND a.doctor_name  like CONCAT('%', #{doctorName}, '%')
+        </if>
         <if test="deptName != null and deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
+            AND a.beh_dept_name = #{deptName}
         </if>
             ) d
         LEFT JOIN med_qcresult_detail e ON e.is_deleted = 'N'
@@ -5756,8 +5777,11 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
             </if>
         </if>
+        <if test="doctorName != null and doctorName != ''">
+            AND a.doctor_name  like CONCAT('%', #{doctorName}, '%')
+        </if>
         <if test="deptName != null and deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
+            AND a.beh_dept_name = #{deptName}
         </if>
         ) c
         LEFT JOIN med_qcresult_detail d ON d.is_deleted = 'N'
@@ -5831,8 +5855,11 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
             </if>
         </if>
+        <if test="doctorName != null and doctorName != ''">
+            AND a.doctor_name  like CONCAT('%', #{doctorName}, '%')
+        </if>
         <if test="deptName != null and deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
+            AND a.beh_dept_name = #{deptName}
         </if>
         ) b
         LEFT JOIN med_qcresult_detail c ON c.is_deleted = 'N'
@@ -5906,8 +5933,11 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
             </if>
         </if>
+        <if test="doctorName != null and doctorName != ''">
+            AND a.doctor_name  like CONCAT('%', #{doctorName}, '%')
+        </if>
         <if test="deptName != null and deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
+            AND a.beh_dept_name = #{deptName}
         </if>
         ) b
         GROUP BY
@@ -6717,7 +6747,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
@@ -7382,7 +7412,10 @@
             </if>
         </if>
         <if test="deptName != null and deptName != ''">
-            and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
+            and a.beh_dept_name = #{deptName}
+        </if>
+        <if test="doctorName != null and doctorName != ''">
+            and a.doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )
         </if>
         GROUP BY
         a.doctor_id,
@@ -7440,7 +7473,10 @@
             </if>
         </if>
         <if test="deptName != null and deptName != ''">
-            and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
+            and a.beh_dept_name = #{deptName}
+        </if>
+        <if test="doctorName != null and doctorName != ''">
+            and a.doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )
         </if>
         GROUP BY
         a.doctor_id,
@@ -7497,7 +7533,10 @@
             </if>
         </if>
         <if test="deptName != null and deptName != ''">
-            and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
+            and a.beh_dept_name = #{deptName}
+        </if>
+        <if test="doctorName != null and doctorName != ''">
+            and a.doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )
         </if>
         GROUP BY
         a.doctor_id,
@@ -7565,7 +7604,7 @@
             </if>
         </if>
         <if test="deptName != null and deptName != ''">
-            and m1.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
+            and m1.beh_dept_name = #{deptName}
         </if>
         GROUP BY
         m1.behospital_code
@@ -7613,8 +7652,11 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
             </if>
         </if>
+        <if test="doctorName != null and doctorName != ''">
+            and a.doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )
+        </if>
         <if test="deptName != null and deptName != ''">
-            and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
+            and a.beh_dept_name = #{deptName}
         </if>
         GROUP BY
         a.doctor_id,
@@ -8315,7 +8357,7 @@
         AND a.beh_dept_id = b.dept_id
         AND a.qc_type_id != 0
         <if test="qcResultShortPageVO.userId!=null">
-            AND c.user_id = #{qcResultShortPageVO.userId}
+            AND b.user_id = #{qcResultShortPageVO.userId}
         </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
             and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
@@ -8343,7 +8385,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
@@ -8557,7 +8599,7 @@
         AND a.beh_dept_id = b.dept_id
         AND a.qc_type_id != 0
         <if test="qcResultShortPageVO.userId!=null">
-            AND c.user_id = #{qcResultShortPageVO.userId}
+            AND b.user_id = #{qcResultShortPageVO.userId}
         </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
             and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
@@ -8585,7 +8627,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
@@ -8697,7 +8739,9 @@
         </if>
         GROUP BY
         t.behDeptId,
-        t.behDeptName
+        t.behDeptName,
+        t.doctorId,
+        t.doctorName
         )f2
         WHERE
         f1.doctorId = f2.doctorId
@@ -8840,7 +8884,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND a.doctor_name = #{qcResultShortPageVO.doctorName}
@@ -9111,7 +9155,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
@@ -9955,7 +9999,6 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.beh_dept_id = f.dept_id
-        AND a.beh_dept_id = e.dept_id
         AND c.cases_entry_id = d.id
         and a.doctor_id=e.doctor_id
         and e.group_id is not NULL
@@ -9964,6 +10007,9 @@
         <if test="filterVO.userId!=null">
             AND f.user_id = #{filterVO.userId}
         </if>
+        <if test="filterVO.name != null and filterVO.name != ''">
+            AND a.doctor_name  like CONCAT('%', #{filterVO.name}, '%')
+        </if>
         <if test="filterVO.isPlacefile != null and filterVO.isPlacefile != ''">
             and a.is_placefile = #{filterVO.isPlacefile}
         </if>
@@ -9987,7 +10033,7 @@
             </if>
         </if>
         <if test="filterVO.deptName != null and filterVO.deptName != ''">
-            AND a.beh_dept_name like CONCAT('%', #{filterVO.deptName}, '%')
+            AND a.beh_dept_name = #{filterVO.deptName}
         </if>
         GROUP BY
         a.beh_dept_id,
@@ -10039,7 +10085,6 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.beh_dept_id = f.dept_id
-        AND a.beh_dept_id = e.dept_id
         AND c.cases_entry_id = d.id
         and a.doctor_id=e.doctor_id
         and e.group_id is not NULL
@@ -10054,6 +10099,9 @@
         <if test="filterVO.hospitalId != null and filterVO.hospitalId != ''">
             AND a.hospital_id = #{filterVO.hospitalId}
         </if>
+        <if test="filterVO.name != null and filterVO.name != ''">
+            AND a.doctor_name  like CONCAT('%', #{filterVO.name}, '%')
+        </if>
         <if test="filterVO.isPlacefile != null and filterVO.isPlacefile == 0">
             <if test="filterVO.startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{filterVO.startDate}]]>
@@ -10071,7 +10119,7 @@
             </if>
         </if>
         <if test="filterVO.deptName != null and filterVO.deptName != ''">
-            AND a.beh_dept_name like CONCAT('%', #{filterVO.deptName}, '%')
+            AND a.beh_dept_name = #{filterVO.deptName}
         </if>
         GROUP BY
         a.beh_dept_id,
@@ -10331,7 +10379,6 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.beh_dept_id = f.dept_id
-        AND a.beh_dept_id = e.dept_id
         AND c.cases_entry_id = d.id
         and a.doctor_id=e.doctor_id
         and e.group_id is not NULL
@@ -10362,8 +10409,11 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{filterVO.endDate}]]>
             </if>
         </if>
+        <if test="filterVO.name != null and filterVO.name != ''">
+            AND a.doctor_name  like CONCAT('%', #{filterVO.name}, '%')
+        </if>
         <if test="filterVO.deptName != null and filterVO.deptName != ''">
-            AND a.beh_dept_name like CONCAT('%', #{filterVO.deptName}, '%')
+            AND a.beh_dept_name = #{filterVO.deptName}
         </if>
         GROUP BY
         a.beh_dept_id,
@@ -10415,7 +10465,6 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = c.behospital_code
         AND a.beh_dept_id = f.dept_id
-        AND a.beh_dept_id = e.dept_id
         AND c.cases_entry_id = d.id
         and a.doctor_id=e.doctor_id
         and e.group_id is not NULL
@@ -10446,8 +10495,11 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{filterVO.endDate}]]>
             </if>
         </if>
+        <if test="filterVO.name != null and filterVO.name != ''">
+            AND a.doctor_name  like CONCAT('%', #{filterVO.name}, '%')
+        </if>
         <if test="filterVO.deptName != null and filterVO.deptName != ''">
-            AND a.beh_dept_name like CONCAT('%', #{filterVO.deptName}, '%')
+            AND a.beh_dept_name = #{filterVO.deptName}
         </if>
         GROUP BY
         a.beh_dept_id,
@@ -10573,7 +10625,10 @@
             </if>
         </if>
         <if test="deptName != null and deptName != ''">
-            AND a.beh_dept_name like CONCAT('%', #{deptName}, '%')
+            AND a.beh_dept_name= #{deptName}
+        </if>
+        <if test="doctorName != null and doctorName != ''">
+            AND a.doctor_name  like CONCAT('%', #{doctorName}, '%')
         </if>
         <if test="casesEntryIds != null and casesEntryIds.size()>0">
             AND c.cases_entry_id IN
@@ -10698,7 +10753,7 @@
             and a.is_placefile = #{isPlacefile}
         </if>
         <if test="doctorName != null and doctorName != ''">
-            and a.doctor_name = #{doctorName}
+            AND a.doctor_name like CONCAT('%', #{doctorName}, '%')
         </if>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
@@ -10800,7 +10855,7 @@
             and a.beh_dept_name = #{deptName}
         </if>
         <if test="doctorName != null and doctorName != ''">
-            and a.doctor_name = #{doctorName}
+            AND a.doctor_name like CONCAT('%', #{doctorName}, '%')
         </if>
         <if test="deptClass != null and deptClass != ''">
             and a.beh_dept_id = #{deptClass}
@@ -11461,8 +11516,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
-
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
@@ -12161,7 +12215,7 @@
             </if>
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
-            and a.doctor_name = #{qcResultShortPageVO.doctorName}
+            AND a.doctor_name  like CONCAT('%', #{qcResultShortPageVO.doctorName}, '%')
         </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
             and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
@@ -13130,7 +13184,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
@@ -13352,7 +13406,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
@@ -14999,7 +15053,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
@@ -15777,7 +15831,7 @@
             </if>
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND m1.beh_dept_name like CONCAT('%', #{qcResultShortPageVO.deptName}, '%')
+            AND m1.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         GROUP BY
         m1.behospital_code
@@ -16036,7 +16090,7 @@
             </if>
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND m1.beh_dept_name like CONCAT('%', #{qcResultShortPageVO.deptName}, '%')
+            AND m1.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         GROUP BY
         m1.behospital_code
@@ -16745,8 +16799,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
-
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND c.`level` = #{qcResultShortPageVO.level}
@@ -16941,8 +16994,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
-
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND c.`level` = #{qcResultShortPageVO.level}

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -1384,6 +1384,9 @@
         <if test="filterPageByDeptVO.deptName != null and filterPageByDeptVO.deptName != ''">
             AND a.beh_dept_name = #{filterPageByDeptVO.deptName}
         </if>
+        <if test="filterPageByDeptVO.doctorName != null and filterPageByDeptVO.doctorName != ''">
+            AND a.doctor_name like CONCAT('%', #{filterPageByDeptVO.doctorName}, '%')
+        </if>
         <if test="filterPageByDeptVO.isReject != null">
             AND d.is_reject = #{filterPageByDeptVO.isReject}
         </if>
@@ -1456,6 +1459,9 @@
         <if test="filterPageByDeptVO.deptName != null and filterPageByDeptVO.deptName != ''">
             AND a.beh_dept_name = #{filterPageByDeptVO.deptName}
         </if>
+        <if test="filterPageByDeptVO.doctorName != null and filterPageByDeptVO.doctorName != ''">
+            AND a.doctor_name like CONCAT('%', #{filterPageByDeptVO.doctorName}, '%')
+        </if>
         GROUP BY
         a.beh_dept_id,
         a.beh_dept_name
@@ -1948,6 +1954,9 @@
         <if test="filterPageByDeptVO.deptName != null and filterPageByDeptVO.deptName != ''">
             AND a.beh_dept_name = #{filterPageByDeptVO.deptName}
         </if>
+        <if test="filterPageByDeptVO.doctorName != null and filterPageByDeptVO.doctorName != ''">
+            and a.doctor_name like CONCAT('%', #{filterPageByDeptVO.doctorName}, '%')
+        </if>
         GROUP BY
         d.cases_id,
         a.beh_dept_id,
@@ -2007,6 +2016,9 @@
         <if test="filterPageByDeptVO.deptName != null and filterPageByDeptVO.deptName != ''">
             AND a.beh_dept_name = #{filterPageByDeptVO.deptName}
         </if>
+        <if test="filterPageByDeptVO.doctorName != null and filterPageByDeptVO.doctorName != ''">
+            and a.doctor_name like CONCAT('%', #{filterPageByDeptVO.doctorName}, '%')
+        </if>
         GROUP BY
         a.beh_dept_id,
         a.beh_dept_name
@@ -2134,7 +2146,9 @@
         d.cases_id,
         d.cases_entry_id,
         a.beh_dept_id,
-        a.beh_dept_name
+        a.beh_dept_name,
+        a.doctor_id,
+        a.doctor_name
         ) tt1,
         qc_cases_entry tt2
         WHERE