科室/模块小结下拉+模糊处理

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

@@ -501,8 +501,8 @@ public class ConsoleByDeptFacade {
         filterFacade.filterOrderByDeptVOSet(filterOrderByDeptVO);
         List<HomePageNumDTO> records = behospitalInfoFacade.homePageLevelStatisticsByDept(filterOrderByDeptVO);
         //没有医生过滤时增加全科室数据
-        if (StringUtil.isBlank(filterOrderByDeptVO.getName())
-                || filterOrderByDeptVO.getName().equals(filterOrderByDeptVO.getDeptName())) {
+        if (StringUtil.isBlank(filterOrderByDeptVO.getDeptName())
+                || filterOrderByDeptVO.getDeptName().equals(filterOrderByDeptVO.getDeptName())) {
             HomePageNumDTO item = getGlobleRecord(records, filterOrderByDeptVO.getDeptName());
             if (item != null) {
                 records.add(0, item);
@@ -657,4 +657,4 @@ public class ConsoleByDeptFacade {
         IPage<QcResultShortDTO> page = behospitalInfoFacade.qcResultShortByDeptPage(qcResultShortPageVO);
         return page;
     }
-}
+}

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

@@ -222,9 +222,9 @@ public class ConsoleExportFacade {
     public void qcResultShortPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         qcResultShortPageVO.setHospitalId(hospitalId);
-        if (StringUtil.isNotBlank(qcResultShortPageVO.getBehDeptName())
-                && qcResultShortPageVO.getBehDeptName().equals("全部")) {
-            qcResultShortPageVO.setBehDeptName("");
+        if (StringUtil.isNotBlank(qcResultShortPageVO.getDeptName())
+                && qcResultShortPageVO.getDeptName().equals("全部")) {
+            qcResultShortPageVO.setDeptName("");
         }
         Date startDate = qcResultShortPageVO.getStartDate();
         Date endDate = qcResultShortPageVO.getEndDate();
@@ -254,9 +254,9 @@ public class ConsoleExportFacade {
     public void leaveHosMrPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         qcResultShortPageVO.setHospitalId(hospitalId);
-        if (StringUtil.isNotBlank(qcResultShortPageVO.getBehDeptName())
-                && qcResultShortPageVO.getBehDeptName().equals("全部")) {
-            qcResultShortPageVO.setBehDeptName("");
+        if (StringUtil.isNotBlank(qcResultShortPageVO.getDeptName())
+                && qcResultShortPageVO.getDeptName().equals("全部")) {
+            qcResultShortPageVO.setDeptName("");
         }
         Date startDate = qcResultShortPageVO.getStartDate();
         Date endDate = qcResultShortPageVO.getEndDate();
@@ -298,9 +298,9 @@ public class ConsoleExportFacade {
     public void unModifyMRPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         qcResultShortPageVO.setHospitalId(hospitalId);
-        if (StringUtil.isNotBlank(qcResultShortPageVO.getBehDeptName())
-                && qcResultShortPageVO.getBehDeptName().equals("全部")) {
-            qcResultShortPageVO.setBehDeptName("");
+        if (StringUtil.isNotBlank(qcResultShortPageVO.getDeptName())
+                && qcResultShortPageVO.getDeptName().equals("全部")) {
+            qcResultShortPageVO.setDeptName("");
         }
         Date startDate = qcResultShortPageVO.getStartDate();
         Date endDate = qcResultShortPageVO.getEndDate();
@@ -330,9 +330,9 @@ public class ConsoleExportFacade {
     public void badLevelPagePageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         qcResultShortPageVO.setHospitalId(hospitalId);
-        if (StringUtil.isNotBlank(qcResultShortPageVO.getBehDeptName())
-                && qcResultShortPageVO.getBehDeptName().equals("全部")) {
-            qcResultShortPageVO.setBehDeptName("");
+        if (StringUtil.isNotBlank(qcResultShortPageVO.getDeptName())
+                && qcResultShortPageVO.getDeptName().equals("全部")) {
+            qcResultShortPageVO.setDeptName("");
         }
         Date startDate = qcResultShortPageVO.getStartDate();
         Date endDate = qcResultShortPageVO.getEndDate();
@@ -368,7 +368,7 @@ public class ConsoleExportFacade {
     public void unModifyMRStatisticsExport(HttpServletResponse response, FilterUnModifyMRVO filterUnModifyMRVO) {
         filterFacade.filterUnModifyMRVOSet(filterUnModifyMRVO);
         List<ExcelExportEntity> colList = Lists.newLinkedList();
-        ExcelExportEntity deptNameCol = new ExcelExportEntity("科室名称", "deptName");
+        ExcelExportEntity deptNameCol = new ExcelExportEntity("科室", "deptName");
         deptNameCol.setWidth(50);
         colList.add(deptNameCol);
 
@@ -428,9 +428,9 @@ public class ConsoleExportFacade {
     public void hmImproveMRPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         qcResultShortPageVO.setHospitalId(hospitalId);
-        if (StringUtil.isNotBlank(qcResultShortPageVO.getBehDeptName())
-                && qcResultShortPageVO.getBehDeptName().equals("全部")) {
-            qcResultShortPageVO.setBehDeptName("");
+    if (StringUtil.isNotBlank(qcResultShortPageVO.getDeptName())
+                && qcResultShortPageVO.getDeptName().equals("全部")) {
+            qcResultShortPageVO.setDeptName("");
         }
         Date startDate = qcResultShortPageVO.getStartDate();
         Date endDate = qcResultShortPageVO.getEndDate();
@@ -460,9 +460,9 @@ public class ConsoleExportFacade {
     public void qcCheckMRPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         qcResultShortPageVO.setHospitalId(hospitalId);
-        if (StringUtil.isNotBlank(qcResultShortPageVO.getBehDeptName())
-                && qcResultShortPageVO.getBehDeptName().equals("全部")) {
-            qcResultShortPageVO.setBehDeptName("");
+        if (StringUtil.isNotBlank(qcResultShortPageVO.getDeptName())
+                && qcResultShortPageVO.getDeptName().equals("全部")) {
+            qcResultShortPageVO.setDeptName("");
         }
         Date startDate = qcResultShortPageVO.getStartDate();
         Date endDate = qcResultShortPageVO.getEndDate();

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

@@ -584,7 +584,7 @@ public class ConsoleFacade {
         filterFacade.filterOrderVOSame(filterOrderVO);
         List<LevelStatisticsDTO> records = behospitalInfoFacade.levelStatistics(filterOrderVO);
         //没有科室过滤时增加全院数据
-        if (StringUtil.isBlank(filterOrderVO.getName()) || filterOrderVO.getName().equals("全院")) {
+        if (StringUtil.isBlank(filterOrderVO.getDeptName()) || filterOrderVO.getDeptName().equals("全院")) {
             LevelStatisticsDTO item = getGlobleTitle(records);
             if (item != null) {
                 records.add(0, item);
@@ -608,7 +608,7 @@ public class ConsoleFacade {
         filterFacade.filterOrderVOSame(filterOrderVO);
         List<LevelStatisticsDTO> records = behospitalInfoFacade.levelStatistics(filterOrderVO);
         //没有科室过滤时增加全院数据
-        if (StringUtil.isBlank(filterOrderVO.getName()) || filterOrderVO.getName().equals("全院")) {
+        if (StringUtil.isBlank(filterOrderVO.getDeptName()) || filterOrderVO.getDeptName().equals("全院")) {
             LevelStatisticsDTO item = getGlobleTitle(records);
             if (item != null) {
                 records.add(0, item);
@@ -817,7 +817,7 @@ public class ConsoleFacade {
     public List<LevelStatisticsTZDTO> levelStatisticsByDeptStr_TZ(FilterOrderVO filterOrderVO) {
         filterFacade.filterOrderVOSame(filterOrderVO);
         List<LevelStatisticsTZDTO> records = behospitalInfoFacade.levelStatisticsByDeptClass_TZ(filterOrderVO);
-        if( StringUtil.isBlank(filterOrderVO.getName())){
+        if( StringUtil.isBlank(filterOrderVO.getDeptName())){
             LevelStatisticsTZDTO item = getGlobleRecords(records,filterOrderVO);
             if (item != null) {
                 records.add(0, item);
@@ -841,7 +841,7 @@ public class ConsoleFacade {
     public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO) {
         filterFacade.filterOrderVOSame(filterOrderVO);
         List<LevelStatisticsTZDTO> records = behospitalInfoFacade.levelStatisticsByDeptClass_TZ(filterOrderVO);
-            if( StringUtil.isBlank(filterOrderVO.getName())){
+            if( StringUtil.isBlank(filterOrderVO.getDeptName())){
                 LevelStatisticsTZDTO item = getGlobleRecords(records,filterOrderVO);
                 if (item != null) {
                     records.add(0, item);
@@ -1236,7 +1236,7 @@ public class ConsoleFacade {
         filterFacade.filterOrderVOSet(filterOrderVO);
         List<HomePageNumDTO> records = behospitalInfoFacade.homePageLevelStatistics(filterOrderVO);
         //没有科室过滤时增加全院数据
-        if (StringUtil.isBlank(filterOrderVO.getName()) || filterOrderVO.getName().equals("全院")) {
+        if (StringUtil.isBlank(filterOrderVO.getDeptName()) || filterOrderVO.getDeptName().equals("全院")) {
             HomePageNumDTO item = getGlobleRecord(records);
             if (item != null) {
                 records.add(0, item);
@@ -1591,7 +1591,7 @@ public class ConsoleFacade {
         filterFacade.filterOrderVOSet(filterOrderVO);
         List<HomePageImproveDTO> records = behospitalInfoFacade.qcCheckStatistics(filterOrderVO);
         //增加全院数据
-        if (StringUtil.isBlank(filterOrderVO.getName()) || filterOrderVO.getName().equals("全院")) {
+        if (StringUtil.isBlank(filterOrderVO.getDeptName()) || filterOrderVO.getDeptName().equals("全院")) {
             HomePageImproveDTO item = getGlobleRecord_improve(records);
             if (item != null) {
                 records.add(0, item);
@@ -1731,7 +1731,7 @@ public class ConsoleFacade {
         ColumnDTO columnDeptName = new ColumnDTO();
         columnDeptName.setOrderNo(orderNo);
         columnDeptName.setFieldName("deptName");
-        columnDeptName.setColumnName("科室名称");
+        columnDeptName.setColumnName("科室");
         columnDeptName.setIsShow(1);
         columns.add(columnDeptName);
         orderNo++;
@@ -1873,8 +1873,8 @@ public class ConsoleFacade {
         });
         //增加全院数据
         if (ListUtil.isNotEmpty(retList) &&
-                (StringUtil.isBlank(filterUnModifyMRVO.getName())
-                        || filterUnModifyMRVO.getName().equals("全院"))) {
+                (StringUtil.isBlank(filterUnModifyMRVO.getDeptName())
+                        || filterUnModifyMRVO.getDeptName().equals("全院"))) {
             try {
 
                 Object globleObj = new Object();

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

@@ -387,8 +387,8 @@ public class FilterFacade {
         String userId = SysUserUtils.getCurrentPrincipleID();
         qcResultPageVO.setHospitalId(hospitalId);
         qcResultPageVO.setUserId(Long.valueOf(userId));
-        if (qcResultPageVO.getBehDeptName().equals("全院")|| StringUtils.isEmpty(qcResultPageVO.getBehDeptName())) {
-            qcResultPageVO.setBehDeptName("");
+        if (qcResultPageVO.getDeptName().equals("全院")|| StringUtils.isEmpty(qcResultPageVO.getDeptName())) {
+            qcResultPageVO.setDeptName("");
         }
         /*long interval = qcResultShortPageVO.getEndDate().getTime() + 1000;
         qcResultShortPageVO.setEndDate(new Date(Long.valueOf(interval)));*/

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

@@ -16,6 +16,7 @@ import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.QcCasesEntryFindVO;
 import com.diagbot.vo.QcCasesEntryHospitalVO;
 import com.diagbot.vo.QcCasesEntryUpdataVO;
+import com.diagbot.vo.QcCasesEntryVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -81,8 +82,8 @@ public class QcCasesEntryHospitalFacade extends QcCasesEntryHospitalServiceImpl
      *
      * @return
      */
-    public List<QcCasesAllDTO> getQcCasesAlls() {
-        return  qcCasesFacade.getQcCasesAlls();
+    public List<QcCasesAllDTO> getQcCasesAlls(QcCasesEntryVO qcCasesEntryVO) {
+        return  qcCasesFacade.getQcCasesAlls(qcCasesEntryVO);
     }
 
     /**

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

@@ -12,9 +12,11 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.SysUserUtils;
+import com.diagbot.vo.QcCasesEntryVO;
 import com.diagbot.vo.QcCasesQueryVO;
 import com.diagbot.vo.QcCasesSaveListVO;
 import com.diagbot.vo.QcCasesSaveVO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -72,9 +74,12 @@ public class QcCasesFacade extends QcCasesServiceImpl {
      *
      * @return 基础模块数据信息列表
      */
-    public List<QcCasesAllDTO> getQcCasesAlls() {
+    public List<QcCasesAllDTO> getQcCasesAlls(QcCasesEntryVO qcCasesEntryVO) {
         QueryWrapper<QcCases> qc = new QueryWrapper<>();
         qc.eq("is_deleted", IsDeleteEnum.N.getKey());
+        if(StringUtils.isNotBlank(qcCasesEntryVO.getCasesName())){
+            qc.like("name", qcCasesEntryVO.getCasesName());
+        }
         List<QcCases> data = list(qc);
         List<QcCasesAllDTO> dataNew = new ArrayList<QcCasesAllDTO>();
         dataNew = BeanUtil.listCopyTo(data, QcCasesAllDTO.class);

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

@@ -69,7 +69,7 @@ public class BehospitalPageVO extends Page implements Serializable {
     /**
      * 住院科室名称
      */
-    private String deptId;
+    private String deptName;
 
     /**
      * 主诊断

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

@@ -37,7 +37,7 @@ public class ExportQcresultVO {
     private String level;
     private String doctorName;
     private String doctorCode;
-    private String deptId;
+    private String deptName;
     private String name;
     private Integer checkStatus;
     private Integer mrStatus;

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

@@ -40,7 +40,7 @@ public class FilterMedicalCheckVO extends Page {
     /**
      * 科室名称
      */
-    private String name;
+    private String deptName;
 
     /**
      * 是否归档（0：未归档，1：已归档）

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

@@ -27,9 +27,9 @@ public class FilterOrderVO extends FilterVO {
     private String desc;
 
     /**
-     * 科室名称/主管医生名称
+     * 科室名称
      */
-    private String name;
+    private String deptName;
     /**
      * 去年同期起始时间
      */

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

@@ -40,6 +40,10 @@ public class FilterPageVO extends Page {
      */
     @ApiModelProperty(hidden = true)
     private Long userId;
+
+    /**
+     * 缺陷名称
+     */
     private String name;
 
     /**

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

@@ -46,7 +46,7 @@ public class FilterUnModifyMRVO {
     /**
      * 科室名称
      */
-    private String name;
+    private String deptName;
 
     /**
      * 排序（升序）
@@ -62,4 +62,4 @@ public class FilterUnModifyMRVO {
      * 是否归档（0：未归档，1：已归档）
      */
     private String isPlacefile = "1";
-}
+}

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

@@ -0,0 +1,21 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-05-15 15:19
+ */
+@Setter
+@Getter
+public class QcCasesEntryVO {
+
+
+    private String casesName;
+
+    private String isPlacefile = "1";
+}

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

@@ -60,7 +60,7 @@ public class QcResultPageVO extends Page {
     /**
      * 科室名称
      */
-    private String behDeptName;
+    private String deptName;
     /**
      * 医生姓名
      */

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

@@ -58,7 +58,7 @@ public class QcResultShortPageVO extends Page {
     /**
      * 科室名称
      */
-    private String behDeptName;
+    private String deptName;
     /**
      * 医生姓名
      */

src/main/java/com/diagbot/web/QcCasesEntryHospitalController.java

@@ -11,6 +11,7 @@ import com.diagbot.facade.QcCasesEntryHospitalFacade;
 import com.diagbot.vo.QcCasesEntryFindVO;
 import com.diagbot.vo.QcCasesEntryHospitalVO;
 import com.diagbot.vo.QcCasesEntryUpdataVO;
+import com.diagbot.vo.QcCasesEntryVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,8 +63,8 @@ public class QcCasesEntryHospitalController {
             notes = "")
     @PostMapping("/getQcCasesAll")
     @SysLogger("getQcCasesAll")
-    public RespDTO<List<QcCasesAllDTO>> getQcCasesAlls() {
-        return RespDTO.onSuc(qcCasesEntryHospitalFacade.getQcCasesAlls());
+    public RespDTO<List<QcCasesAllDTO>> getQcCasesAlls(@RequestBody @Valid QcCasesEntryVO qcCasesEntryVO) {
+        return RespDTO.onSuc(qcCasesEntryHospitalFacade.getQcCasesAlls(qcCasesEntryVO));
     }
 
     @ApiOperation(value = "模糊查询医院模块条目列表[by:wangfeng]",

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -72,8 +72,8 @@
         <if test="diagnose != null and diagnose != ''">
             AND t.diagnose LIKE CONCAT( '%', #{diagnose}, '%' )
         </if>
-        <if test="deptId != null and deptId != ''">
-            and t.beh_dept_id = #{deptId}
+        <if test="deptName != null and deptName != ''">
+            and t.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         <if test="doctorName != null and doctorName != ''">
             and CONCAT(
@@ -378,8 +378,8 @@
         <if test="diagnose != null and diagnose != ''">
             AND t.diagnose LIKE CONCAT( '%', #{diagnose}, '%' )
         </if>
-        <if test="deptId != null and deptId != ''">
-            and t.beh_dept_id = #{deptId}
+        <if test="deptName != null and deptName != ''">
+            and t.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         <if test="doctorName != null and doctorName != ''">
             and CONCAT(
@@ -510,8 +510,8 @@
         <if test="diagnose != null and diagnose != ''">
             AND t.diagnose LIKE CONCAT( '%', #{diagnose}, '%' )
         </if>
-        <if test="deptId != null and deptId != ''">
-            and t.beh_dept_id = #{deptId}
+        <if test="deptName != null and deptName != ''">
+            and t.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         <if test="name != null and name != ''">
             and t.name like CONCAT('%',#{name},'%')
@@ -1418,8 +1418,8 @@
         <if test="level != null and level != ''">
             and c.level = #{level}
         </if>
-        <if test="name != null and name != ''">
-            and a.beh_dept_name like CONCAT('%',#{name},'%')
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name like CONCAT('%',#{deptName},'%')
         </if>
         GROUP BY
         a.beh_dept_id,
@@ -1472,8 +1472,8 @@
         <if test="level != null and level != ''">
             and c.level = #{level}
         </if>
-        <if test="name != null and name != ''">
-            and a.beh_dept_name like CONCAT('%',#{name},'%')
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name like CONCAT('%',#{deptName},'%')
         </if>
         GROUP BY
         a.beh_dept_id,
@@ -1549,8 +1549,8 @@
         <if test="level != null and level != ''">
             and c.level = #{level}
         </if>
-        <if test="name != null and name != ''">
-            and a.beh_dept_name like CONCAT('%',#{name},'%')
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name like CONCAT('%',#{deptName},'%')
         </if>
         GROUP BY
         a.beh_dept_id,
@@ -1603,8 +1603,8 @@
         <if test="level != null and level != ''">
             and c.level = #{level}
         </if>
-        <if test="name != null and name != ''">
-            and a.beh_dept_name like CONCAT('%',#{name},'%')
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name like CONCAT('%',#{deptName},'%')
         </if>
         GROUP BY
         a.beh_dept_id,
@@ -1781,8 +1781,8 @@
         <if test="level != null and level != ''">
             and c.level = #{level}
         </if>
-        <if test="name != null and name != ''">
-            and a.beh_dept_name like CONCAT('%',#{name},'%')
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name like CONCAT('%',#{deptName},'%')
         </if>
         <if test="deptClass != null and deptClass != ''">
             and e.dept_name = #{deptClass}
@@ -1850,8 +1850,8 @@
         <if test="level != null and level != ''">
             and c.level = #{level}
         </if>
-        <if test="name != null and name != ''">
-            and a.beh_dept_name like CONCAT('%',#{name},'%')
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name like CONCAT('%',#{deptName},'%')
         </if>
         <if test="deptClass != null and deptClass != ''">
             and g.dept_name = #{deptClass}
@@ -2034,8 +2034,8 @@
         <if test="level != null and level != ''">
             and c.level = #{level}
         </if>
-        <if test="name != null and name != ''">
-            and a.beh_dept_name like CONCAT('%',#{name},'%')
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         ) tt1
         LEFT JOIN bas_dept_info e ON tt1.parentDeptId = e.dept_id
@@ -2111,8 +2111,8 @@
         <if test="level != null and level != ''">
             and c.level = #{level}
         </if>
-        <if test="name != null and name != ''">
-            and a.beh_dept_name like CONCAT('%',#{name},'%')
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         ) tt2
         LEFT JOIN bas_dept_info g ON tt2.parentDeptId = g.dept_id
@@ -2215,8 +2215,8 @@
         <if test="level != null and level != ''">
             and c.level = #{level}
         </if>
-        <if test="name != null and name != ''">
-            and a.beh_dept_name like CONCAT('%',#{name},'%')
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         ) tt1
         LEFT JOIN bas_dept_info e ON tt1.parentDeptId = e.dept_id
@@ -2292,8 +2292,8 @@
         <if test="level != null and level != ''">
             and c.level = #{level}
         </if>
-        <if test="name != null and name != ''">
-            and a.beh_dept_name like CONCAT('%',#{name},'%')
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         ) tt2
         LEFT JOIN bas_dept_info g ON tt2.parentDeptId = g.dept_id
@@ -2458,8 +2458,8 @@
         <if test="level != null and level != ''">
             and c.level = #{level}
         </if>
-        <if test="name != null and name != ''">
-            and a.beh_dept_name like CONCAT('%',#{name},'%')
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name like CONCAT('%',#{deptName},'%')
         </if>
         GROUP BY
         a.beh_dept_id,
@@ -2514,8 +2514,8 @@
         <if test="level != null and level != ''">
             and c.level = #{level}
         </if>
-        <if test="name != null and name != ''">
-            and a.beh_dept_name like CONCAT('%',#{name},'%')
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name like CONCAT('%',#{deptName},'%')
         </if>
         GROUP BY
         a.beh_dept_id,
@@ -2585,8 +2585,8 @@
         <if test="level != null and level != ''">
             and b.level = #{level}
         </if>
-        <if test="name != null and name != ''">
-            and a.beh_dept_name like CONCAT('%',#{name},'%')
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name like CONCAT('%',#{deptName},'%')
         </if>
         GROUP BY
         a.beh_dept_id,
@@ -3335,8 +3335,8 @@
             OR a.beh_doctor_id like CONCAT('%',#{doctorCode},'%')
             OR a.director_doctor_id like CONCAT('%',#{doctorCode},'%'))
         </if>
-        <if test="deptId != null and deptId != ''">
-            AND a.beh_dept_id = #{deptId}
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         <if test="name != null and name != ''">
             AND a.name like CONCAT('%',#{name},'%')
@@ -3393,8 +3393,8 @@
             OR a.beh_doctor_id like CONCAT('%',#{doctorCode},'%')
             OR a.director_doctor_id like CONCAT('%',#{doctorCode},'%'))
         </if>
-        <if test="deptId != null and deptId != ''">
-            AND a.beh_dept_id = #{deptId}
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         <if test="name != null and name != ''">
             AND a.name like CONCAT('%',#{name},'%')
@@ -3547,8 +3547,8 @@
             OR a.beh_doctor_id like CONCAT('%',#{doctorCode},'%')
             OR a.director_doctor_id like CONCAT('%',#{doctorCode},'%'))
         </if>
-        <if test="deptId != null and deptId != ''">
-            AND a.beh_dept_id = #{deptId}
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         <if test="name != null and name != ''">
             AND a.name like CONCAT('%',#{name},'%')
@@ -3617,8 +3617,8 @@
             OR a.beh_doctor_id like CONCAT('%',#{doctorCode},'%')
             OR a.director_doctor_id like CONCAT('%',#{doctorCode},'%'))
         </if>
-        <if test="deptId != null and deptId != ''">
-            AND a.beh_dept_id = #{deptId}
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         <if test="name != null and name != ''">
             AND a.name like CONCAT('%',#{name},'%')
@@ -4018,8 +4018,8 @@
         <if test="qcResultShortPageVO.diagnose != null and qcResultShortPageVO.diagnose != ''">
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultShortPageVO.behDeptName}
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
@@ -4492,7 +4492,7 @@
             </if>
         </if>
         <if test="deptName != null and deptName != ''">
-            AND a.beh_dept_name = #{deptName}
+            AND a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         ) c
         LEFT JOIN med_qcresult_detail d ON d.is_deleted = 'N'
@@ -4560,7 +4560,7 @@
             </if>
         </if>
         <if test="deptName != null and deptName != ''">
-            AND a.beh_dept_name = #{deptName}
+            AND a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         ) d
         LEFT JOIN med_qcresult_detail e ON e.is_deleted = 'N'
@@ -4624,7 +4624,7 @@
             </if>
         </if>
         <if test="deptName != null and deptName != ''">
-            AND a.beh_dept_name = #{deptName}
+            AND a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         ) c
         LEFT JOIN med_qcresult_detail d ON d.is_deleted = 'N'
@@ -4688,7 +4688,7 @@
             </if>
         </if>
         <if test="deptName != null and deptName != ''">
-            AND a.beh_dept_name = #{deptName}
+            AND a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         ) b
         LEFT JOIN med_qcresult_detail c ON c.is_deleted = 'N'
@@ -4752,7 +4752,7 @@
             </if>
         </if>
         <if test="deptName != null and deptName != ''">
-            AND a.beh_dept_name = #{deptName}
+            AND a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         ) b
         GROUP BY
@@ -5320,8 +5320,8 @@
         <if test="qcResultShortPageVO.diagnose != null and qcResultShortPageVO.diagnose != ''">
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultShortPageVO.behDeptName}
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
         </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
@@ -5652,8 +5652,8 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
             </if>
         </if>
-        <if test="name != null and name != ''">
-            AND a.beh_dept_name like CONCAT('%', #{name}, '%')
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         GROUP BY
         a.beh_dept_id,
@@ -5701,8 +5701,8 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
             </if>
         </if>
-        <if test="name != null and name != ''">
-            AND a.beh_dept_name like CONCAT('%', #{name}, '%')
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         GROUP BY
         a.beh_dept_id,
@@ -5748,8 +5748,8 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
             </if>
         </if>
-        <if test="name != null and name != ''">
-            AND a.beh_dept_name like CONCAT('%', #{name}, '%')
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         GROUP BY
         a.beh_dept_id,
@@ -5813,8 +5813,8 @@
                 <![CDATA[ AND m1.leave_hospital_date <= #{endDate}]]>
             </if>
         </if>
-        <if test="name != null and name != ''">
-            AND m1.beh_dept_name like CONCAT('%', #{name}, '%')
+        <if test="deptName != null and deptName != ''">
+            and m1.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         GROUP BY
         m1.behospital_code
@@ -5856,8 +5856,8 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
             </if>
         </if>
-        <if test="name != null and name != ''">
-            AND a.beh_dept_name like CONCAT('%', #{name}, '%')
+        <if test="deptName != null and deptName != ''">
+            and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
         </if>
         GROUP BY
         a.beh_dept_id,
@@ -6062,8 +6062,8 @@
         <if test="qcResultShortPageVO.diagnose != null and qcResultShortPageVO.diagnose != ''">
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultShortPageVO.behDeptName}
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
         </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
@@ -6293,8 +6293,8 @@
         <if test="qcResultShortPageVO.diagnose != null and qcResultShortPageVO.diagnose != ''">
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultShortPageVO.behDeptName}
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
         </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
@@ -6542,8 +6542,9 @@
         <if test="qcResultShortPageVO.diagnose != null and qcResultShortPageVO.diagnose != ''">
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultShortPageVO.behDeptName}
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
@@ -6810,8 +6811,8 @@
         <if test="qcResultShortPageVO.diagnose != null and qcResultShortPageVO.diagnose != ''">
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultShortPageVO.behDeptName}
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
@@ -7039,8 +7040,8 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{filterVO.endDate}]]>
             </if>
         </if>
-        <if test="filterVO.name != null and filterVO.name != ''">
-            AND a.beh_dept_name like CONCAT('%', #{filterVO.name}, '%')
+        <if test="filterVO.deptName != null and filterVO.deptName != ''">
+            AND a.beh_dept_name like CONCAT('%', #{filterVO.deptName}, '%')
         </if>
         GROUP BY
         a.beh_dept_id,
@@ -7185,8 +7186,8 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{filterVO.endDate}]]>
             </if>
         </if>
-        <if test="filterVO.name != null and filterVO.name != ''">
-            AND a.beh_dept_name like CONCAT('%', #{filterVO.name}, '%')
+        <if test="filterVO.deptName != null and filterVO.deptName != ''">
+            AND a.beh_dept_name like CONCAT('%', #{filterVO.deptName}, '%')
         </if>
         GROUP BY
         a.beh_dept_id,
@@ -7239,8 +7240,8 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
             </if>
         </if>
-        <if test="name != null and name != ''">
-            AND a.beh_dept_name like CONCAT('%', #{name}, '%')
+        <if test="deptName != null and deptName != ''">
+            AND a.beh_dept_name like CONCAT('%', #{deptName}, '%')
         </if>
         <if test="casesEntryIds != null and casesEntryIds.size()>0">
             AND c.cases_entry_id IN
@@ -7372,8 +7373,8 @@
         <if test="qcResultPageVO.diagnose != null and qcResultPageVO.diagnose != ''">
             AND a.diagnose LIKE CONCAT( '%', #{qcResultPageVO.diagnose}, '%' )
         </if>
-        <if test="qcResultPageVO.behDeptName != null and qcResultPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultPageVO.behDeptName}
+        <if test="qcResultPageVO.deptName != null and qcResultPageVO.deptName != ''">
+            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultPageVO.deptName}, '%' )
         </if>
         <if test="qcResultPageVO.behospitalCode != null and qcResultPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultPageVO.behospitalCode}, '%' )
@@ -7472,10 +7473,9 @@
         <if test="qcResultPageVO.diagnose != null and qcResultPageVO.diagnose != ''">
             AND a.diagnose LIKE CONCAT( '%', #{qcResultPageVO.diagnose}, '%' )
         </if>
-        <if test="qcResultPageVO.behDeptName != null and qcResultPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultPageVO.behDeptName}
+        <if test="qcResultPageVO.deptName != null and qcResultPageVO.deptName != ''">
+            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultPageVO.deptName}, '%' )
         </if>
-
         <if test="qcResultPageVO.behospitalCode != null and qcResultPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultPageVO.behospitalCode}, '%' )
         </if>
@@ -7640,8 +7640,9 @@
         <if test="qcResultShortPageVO.diagnose != null and qcResultShortPageVO.diagnose != ''">
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultShortPageVO.behDeptName}
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
@@ -7879,8 +7880,8 @@
         <if test="qcResultShortPageVO.diagnose != null and qcResultShortPageVO.diagnose != ''">
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultShortPageVO.behDeptName}
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
         </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
@@ -8100,8 +8101,8 @@
         <if test="qcResultShortPageVO.diagnose != null and qcResultShortPageVO.diagnose != ''">
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultShortPageVO.behDeptName}
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
         </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
@@ -8343,8 +8344,8 @@
         <if test="qcResultShortPageVO.diagnose != null and qcResultShortPageVO.diagnose != ''">
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultShortPageVO.behDeptName}
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
@@ -8556,8 +8557,8 @@
         <if test="qcResultShortPageVO.diagnose != null and qcResultShortPageVO.diagnose != ''">
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultShortPageVO.behDeptName}
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
@@ -9126,8 +9127,8 @@
                 <![CDATA[ AND m1.leave_hospital_date <= #{qcResultShortPageVO.endDate}]]>
             </if>
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND m1.beh_dept_name like CONCAT('%', #{qcResultShortPageVO.behDeptName}, '%')
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND m1.beh_dept_name like CONCAT('%', #{qcResultShortPageVO.deptName}, '%')
         </if>
         GROUP BY
         m1.behospital_code
@@ -9173,8 +9174,8 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{qcResultShortPageVO.endDate}]]>
             </if>
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultShortPageVO.behDeptName}
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND c.`level` = #{qcResultShortPageVO.level}
@@ -9354,8 +9355,8 @@
         <if test="qcResultShortPageVO.diagnose != null and qcResultShortPageVO.diagnose != ''">
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultShortPageVO.behDeptName}
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND c.`level` = #{qcResultShortPageVO.level}
@@ -9584,8 +9585,8 @@
                 <![CDATA[ AND m1.leave_hospital_date <= #{qcResultShortPageVO.endDate}]]>
             </if>
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND m1.beh_dept_name like CONCAT('%', #{qcResultShortPageVO.behDeptName}, '%')
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND m1.beh_dept_name like CONCAT('%', #{qcResultShortPageVO.deptName}, '%')
         </if>
         GROUP BY
         m1.behospital_code
@@ -9631,8 +9632,8 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{qcResultShortPageVO.endDate}]]>
             </if>
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultShortPageVO.behDeptName}
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND c.`level` = #{qcResultShortPageVO.level}
@@ -9832,8 +9833,8 @@
                 <![CDATA[ AND m1.leave_hospital_date <= #{qcResultShortPageVO.endDate}]]>
             </if>
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND m1.beh_dept_name like CONCAT('%', #{qcResultShortPageVO.behDeptName}, '%')
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND m1.beh_dept_name like CONCAT('%', #{qcResultShortPageVO.deptName}, '%')
         </if>
         GROUP BY
         m1.behospital_code
@@ -9879,8 +9880,8 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{qcResultShortPageVO.endDate}]]>
             </if>
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultShortPageVO.behDeptName}
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND c.`level` = #{qcResultShortPageVO.level}
@@ -10107,8 +10108,9 @@
         <if test="qcResultShortPageVO.diagnose != null and qcResultShortPageVO.diagnose != ''">
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultShortPageVO.behDeptName}
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND c.`level` = #{qcResultShortPageVO.level}
@@ -10291,8 +10293,9 @@
         <if test="qcResultShortPageVO.diagnose != null and qcResultShortPageVO.diagnose != ''">
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultShortPageVO.behDeptName}
+        <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
+            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND c.`level` = #{qcResultShortPageVO.level}

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -493,7 +493,7 @@
             AND tt2.name like CONCAT('%', #{filterPageVO.name},'%')
         </if>
         <if test="filterPageVO.casesName != null and filterPageVO.casesName != ''">
-            AND tt2.cases_name = #{filterPageVO.casesName}
+            AND tt2.cases_name like CONCAT('%', #{filterPageVO.casesName},'%')
         </if>
 
     </select>
@@ -1542,8 +1542,8 @@
         WHERE
         e.is_deleted = 'N'
         AND d.casesId = e.id
-        <if test="filterPageVO.name != null and filterPageVO.name != ''">
-            AND e.name like CONCAT('%', #{filterPageVO.name},'%')
+        <if test="filterPageVO.casesName != null and filterPageVO.casesName != ''">
+            AND e.name like CONCAT('%', #{filterPageVO.casesName},'%')
         </if>
         ) t1,
         (
@@ -1596,8 +1596,8 @@
         a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND a.id = b.cases_id
-        <if test="filterPageVO.name != null and filterPageVO.name != ''">
-            AND a.name like CONCAT('%', #{filterPageVO.name},'%')
+        <if test="filterPageVO.casesName != null and filterPageVO.casesName != ''">
+            AND a.name like CONCAT('%', #{filterPageVO.casesName},'%')
         </if>
         GROUP BY
         a.id,
@@ -1693,7 +1693,7 @@
         AND tt1.cases_id = tt2.cases_id
         AND tt1.cases_entry_id = tt2.id
         <if test="filterPageVO.casesName != null and filterPageVO.casesName != ''">
-            AND tt2.cases_name = #{filterPageVO.casesName}
+            AND tt2.cases_name like CONCAT('%', #{filterPageVO.casesName},'%')
         </if>
         <if test="filterPageVO.name != null and filterPageVO.name != ''">
             AND tt2.name like CONCAT('%', #{filterPageVO.name},'%')
@@ -1749,7 +1749,7 @@
             AND d.cases_id = #{filterPageVO.casesId}
         </if>
         <if test="filterPageVO.casesName != null and filterPageVO.casesName != ''">
-            AND e.cases_name = #{filterPageVO.casesName}
+            AND e.cases_name like CONCAT('%', #{filterPageVO.casesName},'%')
         </if>
         <if test="filterPageVO.ruleType != null">
             AND e.rule_type = #{filterPageVO.ruleType}