医嘱缺陷类别查询/检查信息新增/检验信息新增

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -156,6 +156,9 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/data/sendHomeOperation").permitAll()
                 .antMatchers("/qc/data/sendCrisis").permitAll()
                 .antMatchers("/qc/doctoradvice/getPage").permitAll()
+                .antMatchers("/qc/medPacsInfo/getCheckPage").permitAll()
+                .antMatchers("/qc/medLisInfo/getExaminePage").permitAll()
+                .antMatchers("/qc/medLisInfo/getExamineSonPage").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }
@@ -187,4 +190,4 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
         log.info("Created jwtTokenEnhancerClient success");
         return converter;
     }
-}
+}

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -200,6 +200,8 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/data/sendCrisis", request)
                 || matchers("/qc/doctoradvice/getPage", request)
                 || matchers("/qc/medPacsInfo/getCheckPage", request)
+                || matchers("/qc/medLisInfo/getExaminePage", request)
+                || matchers("/qc/medLisInfo/getExamineSonPage", request)
                 || matchers("/", request)) {
             return true;
         }

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

@@ -17,22 +17,6 @@ import java.util.Date;
 @Getter
 @Setter
 public class CheckInfoDTO {
-    /**
-     * 医院id
-     */
-    @ApiModelProperty(hidden = true)
-    private Long hospitalId;
-
-    /**
-     * 检查项类型缺陷判别(0-全部检查项 1缺陷检查项  2非缺陷检查项 )
-     */
-    private Integer checkType = 0;
-
-    /**
-     * 病历号
-     */
-    @NotBlank(message = "请输入病历号")
-    private String behospitalCode;
 
     /**
      * 检查类型判别
@@ -49,7 +33,6 @@ public class CheckInfoDTO {
      */
     private String checkResult;
 
-
     /**
      * 检查时间
      */

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

@@ -0,0 +1,59 @@
+package com.diagbot.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/07 15:00
+ */
+@Getter
+@Setter
+public class ExamineInfoDTO {
+    /**
+     * 医院id
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 检验类型判别
+     */
+    private String examineItemType;
+
+    /**
+     * 检验项目名称
+     */
+    private String examineItemName;
+
+    /**
+     * 检查时间
+     */
+    private Date cTime;
+
+    /**
+     * 报告时间
+     */
+    private Date rTime;
+
+    /**
+     * 开单医生
+     */
+    private String doctorName;
+
+    /**
+     * 质检提示信息
+     */
+    @JsonIgnore
+    private String info;
+}

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

@@ -0,0 +1,44 @@
+package com.diagbot.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/07 15:00
+ */
+@Getter
+@Setter
+public class ExamineSonInfoDTO {
+    /**
+     * 检验项目名称
+     */
+    private String examineItemName;
+
+    /**
+     * 检验结果
+     */
+    private String examineItemResult;
+
+    /**
+     * 检查时间
+     */
+    private Date cTime;
+
+    /**
+     * 报告时间
+     */
+    private Date rTime;
+
+    /**
+     * 开单医生
+     */
+    private String doctorName;
+
+}

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

@@ -1,13 +1,68 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.*;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.MedLisInfoServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.SysUserUtils;
+import com.diagbot.vo.CheckInfoVO;
+import com.diagbot.vo.ExamineInfoVO;
+import com.diagbot.vo.ExamineSonInfoVO;
 import org.springframework.stereotype.Component;
 
+
+import com.diagbot.dto.DoctorAdviceDTO;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+
 /**
  * @Description:
- * @author: rengb
- * @time: 2020/7/28 15:48
+ * @author: cy
+ * @time: 2020/9/7 15:48
  */
+
 @Component
 public class MedLisInfoFacade extends MedLisInfoServiceImpl {
+/**
+     * 获取检验信息翻页
+     *
+     * @param examineInfoVO 获取检验信息入参
+     * @return
+     */
+
+    public IPage<ExamineInfoDTO> getExaminePage(ExamineInfoVO examineInfoVO) {
+        //examineInfoVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
+        examineInfoVO.setHospitalId(2l);
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+        if (null != examineInfoVO.getJyDateStart()) {
+
+            String jyDateStart = simpleDateFormat.format(examineInfoVO.getJyDateStart());
+            examineInfoVO.setJyNewDateStart(jyDateStart); }
+        if (null != examineInfoVO.getJyDateEnd()) {
+            String jyDateEnd = simpleDateFormat.format(examineInfoVO.getJyDateEnd());
+            examineInfoVO.setJyNewDateEnd(jyDateEnd);
+        }
+        if (null != examineInfoVO.getJyDateStart() && null != examineInfoVO.getJyDateEnd()) {
+            if (DateUtil.after(examineInfoVO.getJyDateStart(), examineInfoVO.getJyDateEnd())) {
+                throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "开始时间必须小于结束时间！");
+            }
+        }
+        return this.getExamineInfo(examineInfoVO);
+    }
+
+    /**
+     * 获取检验子项信息
+     * @param examineSonInfoVO 获取检验子项信息入参
+     * @return
+     */
+
+    public IPage<ExamineSonInfoDTO> getExamineSonPage(ExamineSonInfoVO examineSonInfoVO) {
+//        examineSonInfoVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
+        examineSonInfoVO.setHospitalId(2l);
+        return this.getExamineSonInfo(examineSonInfoVO);
+    }
+
 }

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

@@ -21,11 +21,11 @@ public class MedPacsInfoFacade extends MedPacsInfoServiceImpl {
     /**
      * 获取检查信息翻页
      * @param checkInfoVO 获取检查信息入参
-     * @return 医嘱翻页信息
+     * @return 检查翻页信息
      */
     public IPage<CheckInfoDTO> getCheckPage(CheckInfoVO checkInfoVO) {
-        checkInfoVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
-
+        //checkInfoVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
+        checkInfoVO.setHospitalId(2l);
         if (null != checkInfoVO.getJxDateStart()) {
             checkInfoVO.setJxDateStart(DateUtil.getFirstTimeOfDay(checkInfoVO.getJxDateStart()));
         }

src/main/java/com/diagbot/mapper/MedLisInfoMapper.java

@@ -1,7 +1,18 @@
 package com.diagbot.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.CheckInfoDTO;
+import com.diagbot.dto.ExamineInfoDTO;
+import com.diagbot.dto.ExamineSonInfoDTO;
 import com.diagbot.entity.MedLisInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.CheckInfoVO;
+import com.diagbot.vo.ExamineInfoVO;
+import com.diagbot.vo.ExamineSonInfoVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Set;
 
 /**
  * <p>
@@ -12,5 +23,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2020-07-28
  */
 public interface MedLisInfoMapper extends BaseMapper<MedLisInfo> {
-
+    IPage<ExamineInfoDTO> getExamineInfo(@Param("examineInfoVO") ExamineInfoVO examineInfoVO, @Param("infos") Set<String> infos);
+    List<String> getInfo(@Param("hospitalId")Long hospitalId, @Param("behospitalCode")String behospitalCode);
+    IPage<ExamineSonInfoDTO> getExamineSonInfo(@Param("examineSonInfoVO") ExamineSonInfoVO examineSonInfoVO);
 }

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

@@ -1,11 +1,24 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.CheckInfoDTO;
+import com.diagbot.dto.DoctorAdviceDTO;
+import com.diagbot.dto.ExamineInfoDTO;
+import com.diagbot.dto.ExamineSonInfoDTO;
 import com.diagbot.entity.MedLisInfo;
 import com.diagbot.mapper.MedLisInfoMapper;
 import com.diagbot.service.MedLisInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.CheckInfoVO;
+import com.diagbot.vo.DoctorAdviceVO;
+import com.diagbot.vo.ExamineInfoVO;
+import com.diagbot.vo.ExamineSonInfoVO;
 import org.springframework.stereotype.Service;
 
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 /**
  * <p>
  *  服务实现类
@@ -14,7 +27,39 @@ import org.springframework.stereotype.Service;
  * @author zhoutg
  * @since 2020-07-28
  */
+
 @Service
 public class MedLisInfoServiceImpl extends ServiceImpl<MedLisInfoMapper, MedLisInfo> implements MedLisInfoService {
 
+
+    public IPage<ExamineInfoDTO> getExamineInfo(ExamineInfoVO examineInfoVO) {
+
+        List<String> infos = this.baseMapper.getInfo(examineInfoVO.getHospitalId(), examineInfoVO.getBehospitalCode());
+
+        Set<String> infoSet = new HashSet<>();
+        for (String s : infos) {
+            if (s.contains("检验")) {
+                String[] split = s.split("、");
+                for (String info : split) {
+                    String[] targetInfos = info.split(":");
+                    for (String targetInfo : targetInfos) {
+                        if (!targetInfo.contains("检验")) {
+                            String[] target = targetInfo.split(",");
+                            infoSet.add(target[0] + ")");
+                        }
+
+                    }
+
+                }
+            }
+        }
+
+        IPage<ExamineInfoDTO> page = this.baseMapper.getExamineInfo(examineInfoVO, infoSet);
+        return page;
+    }
+
+    public IPage<ExamineSonInfoDTO> getExamineSonInfo(ExamineSonInfoVO examineSonInfoVO) {
+        IPage<ExamineSonInfoDTO> page = this.baseMapper.getExamineSonInfo(examineSonInfoVO);
+        return page;
+    }
 }

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

@@ -24,7 +24,7 @@ public class CheckInfoVO extends Page {
     private Long hospitalId;
 
     /**
-     * 检查项类型缺陷判别(0-全部检查项 1缺陷检查项  2非缺陷检查项 )
+     * 检查项类型缺陷判别(0-全部检查项 1-缺陷检查项  2-非缺陷检查项 )
      */
     private Integer checkType = 0;
 

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

@@ -24,7 +24,7 @@ public class DoctorAdviceVO extends Page {
     private Long hospitalId;
 
     /**
-     * 医嘱类型缺陷判别(0-全部医嘱 1缺陷医嘱 2非缺陷医嘱)
+     * 医嘱类型缺陷判别(0-全部医嘱 1-缺陷医嘱 2-非缺陷医嘱)
      */
     private Integer adviceType = 0;
 

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

@@ -0,0 +1,79 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/7 14:59
+ */
+@Getter
+@Setter
+public class ExamineInfoVO extends Page {
+    /**
+     * 医院id
+     */
+    @ApiModelProperty(hidden = true)
+    private Long hospitalId;
+
+    /**
+     * 检验项类型缺陷判别(0-全部检验项 1-缺陷检验项  2-非缺陷检验项 )
+     */
+    private Integer examineType = 0;
+
+    /**
+     * 病历号
+     */
+    @NotBlank(message = "请输入病历号")
+    private String behospitalCode;
+
+    /**
+     * 检验类型判别
+     */
+    private String examineItemType;
+
+    /**
+     * 检验项目名称
+     */
+    private String examineItemName;
+
+    /**
+     * 检验时间开始
+     */
+    private Date jyDateStart;
+
+    /**
+     * 转化后检验时间开始
+     */
+    @ApiModelProperty(hidden = true)
+    private String jyNewDateStart;
+
+
+    /**
+     * 检验时间结束
+     */
+    private Date jyDateEnd;
+
+
+    /**
+     * 转化后检验时间结束
+     */
+    @ApiModelProperty(hidden = true)
+    private String jyNewDateEnd;
+
+    /**
+     *
+     *
+     * 提示信息
+     */
+    @JsonIgnore
+    private String info;
+
+}

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

@@ -0,0 +1,38 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/7 14:59
+ */
+@Getter
+@Setter
+public class ExamineSonInfoVO extends Page {
+    /**
+     * 医院id
+     */
+    @ApiModelProperty(hidden = true)
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @NotBlank(message = "请输入病历号")
+    private String behospitalCode;
+
+    /**
+     * 报告单号
+     */
+    private String repNo;
+
+
+}

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

@@ -0,0 +1,59 @@
+package com.diagbot.web;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DoctorAdviceDTO;
+import com.diagbot.dto.ExamineInfoDTO;
+import com.diagbot.dto.ExamineSonInfoDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.DoctorAdviceFacade;
+import com.diagbot.facade.MedLisInfoFacade;
+import com.diagbot.vo.CheckInfoVO;
+import com.diagbot.vo.ExamineInfoVO;
+import com.diagbot.vo.ExamineSonInfoVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author cy
+ * @since 2020-09-07
+ */
+
+@RestController
+@RequestMapping("qc/medLisInfo")
+@Api(value = "检验信息API", tags = { "检验信息API" })
+public class MedLisInfoController {
+    @Autowired
+    private MedLisInfoFacade medLisInfoFacade;
+
+    @ApiOperation(value = "获取检验信息[by:cy]",
+            notes = "behospitalCode：病人住院序号<br>" +
+                    "checkType：检验类型（模糊搜索）<br>" +
+                    "daItemName：检验项目名称（模糊搜索）<br>" +
+                    "daStartDateStart：检验开始时间<br>" +
+                    "daStartDateEnd：检验结束时间<br>")
+    @PostMapping("/getExaminePage")
+    @SysLogger("getExaminePage")
+    public RespDTO<IPage<ExamineInfoDTO>> getExaminePage(@RequestBody @Valid ExamineInfoVO examineInfoVO) {
+        return RespDTO.onSuc(medLisInfoFacade.getExaminePage(examineInfoVO));
+    }
+
+    @ApiOperation(value = "获取检验子项信息[by:cy]",
+            notes = "behospitalCode：病人住院序号<br>" +
+                    "repNo：报告单号<br>")
+    @PostMapping("/getExamineSonPage")
+    @SysLogger("getExamineSonPage")
+    public RespDTO<IPage<ExamineSonInfoDTO>> getExamineSonPage(@RequestBody @Valid ExamineSonInfoVO examineSonInfoVO) {
+        return RespDTO.onSuc(medLisInfoFacade.getExamineSonPage(examineSonInfoVO));
+    }
+
+}

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

@@ -14,20 +14,21 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author cy
  * @since 2020-09-04
  */
-@Controller
+@RestController
 @RequestMapping("qc/medPacsInfo")
-@Api(value = "检查信息API", tags = { "检查信息API" })
+@Api(value = "检查信息API", tags = {"检查信息API"})
 public class MedPacsInfoController {
     @Autowired
     private MedPacsInfoFacade medPacsInfoFacade;

src/main/resources/mapper/DoctorAdviceMapper.xml

@@ -85,7 +85,7 @@
                     '${item}'
                 </foreach>
             </if>
-            <if test="infos = null and infos.size() == 0">
+            <if test="infos = null || infos.size() == 0">
                 and b.info in('000000ASDQWEZXC@#$%')
             </if>
         </if>
@@ -96,7 +96,7 @@
                     '${item}'
                 </foreach>
             </if>
-            <if test="infos = null and infos.size() == 0">
+            <if test="infos = null || infos.size() == 0">
                 and 1=1
             </if>
         </if>

src/main/resources/mapper/MedLisInfoMapper.xml

@@ -23,5 +23,113 @@
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
     </resultMap>
+<!--获取检验信息-->
+    <select id="getExamineInfo"  resultType="com.diagbot.dto.ExamineInfoDTO">
+        select b.*
+        from(
+        SELECT
+        t1.rep_name as examineItemName,
+        t1.rep_type_name as examineItemType,
+        CONCAT( t1.rep_name, '(',DATE_FORMAT( t1.check_date,'%Y-%m-%d'),')')as info,
+        t1.rep_date as rTime,
+        t1.check_date as cTime,
+        t1.apply_doctor as doctorName,
+        t1.hospital_id as hospitalId,
+        t1.behospital_code as behospitalCode
+        FROM
+        med_lis_info t1
+        WHERE
+        t1.is_deleted = "N"
+        AND t1.check_date IS NOT NULL
+        <if test="examineInfoVO.hospitalId != null">
+            and t1.hospital_id = #{examineInfoVO.hospitalId}
+        </if>
+        <if test="examineInfoVO.behospitalCode != null and examineInfoVO.behospitalCode != ''">
+            and t1.behospital_code = #{examineInfoVO.behospitalCode}
+        </if>
+        <if test="examineInfoVO.examineItemType != null and examineInfoVO.examineItemType != ''">
+            and t1.rep_type_name like CONCAT('%',#{examineInfoVO.examineItemType},'%')
+        </if>
+        <if test="examineInfoVO.examineItemName != null and examineInfoVO.examineItemName != ''">
+            and t1.rep_name like CONCAT('%',#{examineInfoVO.examineItemName},'%')
+        </if>
+        <if test="examineInfoVO.jyNewDateStart != null">
+            <![CDATA[ AND t1.check_date >= #{examineInfoVO.jyNewDateStart}]]>
+        </if>
+        <if test="examineInfoVO.jyNewDateEnd != null">
+            <![CDATA[ AND t1.check_date <= #{examineInfoVO.jyNewDateEnd}]]>
+        </if>) b
+        where 1=1
+        <if test="examineInfoVO.examineType != null and examineInfoVO.examineType == 1">
+            <if test="infos != null and infos.size() > 0">
+                and b.info in
+                <foreach collection="infos" open="(" separator="," close=")" item="item">
+                    '${item}'
+                </foreach>
+            </if>
+            <if test="infos = null || infos.size() == 0">
+                and b.info in('000000ASDQWEZXC@#$%')
+            </if>
+        </if>
+        <if test="examineInfoVO.examineType != null and examineInfoVO.examineType == 2 ">
+            <if test="infos != null and infos.size() > 0">
+                and b.info not in
+                <foreach collection="infos" open="(" separator="," close=")" item="item">
+                    '${item}'
+                </foreach>
+            </if>
+            <if test="infos = null || infos.size() == 0">
+                and 1=1
+            </if>
+        </if>
+    </select>
+
+    <!--    获取质控提示信息-->
+    <select id="getInfo" resultType="java.lang.String">
+        select b.info
+        from
+        med_behospital_info a,
+        med_qcresult_detail b
+        where
+        a.is_deleted = 'N'
+        and b.is_deleted = 'N'
+        and a.hospital_id = b.hospital_id
+        and a.behospital_code = b.behospital_code
+        <if test="hospitalId != null">
+            and a.hospital_id = #{hospitalId}
+        </if>
+        <if test="behospitalCode != null and behospitalCode != ''">
+            and a.behospital_code = #{behospitalCode}
+        </if>
+    </select>
+
+    <!--    获取检验子项信息-->
+    <select id="getExamineSonInfo" resultType="com.diagbot.dto.ExamineSonInfoDTO">
+        SELECT
+        t2.item_name AS examineItemName,
+        CONCAT( t2.result, t2.unit ) AS examineItemResult,
+        t1.rep_date AS rTime,
+        t1.check_date AS cTime,
+        t1.apply_doctor AS doctorName
+        FROM
+        med_lis_info t1,
+        med_lis_result t2
+        where
+        t1.is_deleted = "N"
+        AND t2.is_deleted = "N"
+        AND t1.check_date IS NOT NULL
+        AND t1.hospital_id = t2.hospital_id
+        AND t1.behospital_code = t2.behospital_code
+        AND t1.rep_no = t2.rep_no
+        <if test="examineSonInfoVO.hospitalId != null">
+            and t1.hospital_id = #{examineSonInfoVO.hospitalId}
+        </if>
+        <if test="examineSonInfoVO.hbehospitalCode != null and examineSonInfoVO.hbehospitalCode != ''">
+            and t1.behospital_code = #{examineSonInfoVO.behospitalCode}
+        </if>
+        <if test="examineSonInfoVO.repNo != null and examineSonInfoVO.repNo != ''">
+            and t1.rep_no = #{examineSonInfoVO.repNo}
+        </if>
+    </select>
 
 </mapper>

src/main/resources/mapper/MedPacsInfoMapper.xml

@@ -75,7 +75,7 @@
                     '${item}'
                 </foreach>
             </if>
-            <if test="infos = null and infos.size() == 0">
+            <if test="infos = null || infos.size() == 0">
                 and b.info in('000000ASDQWEZXC@#$%')
             </if>
         </if>
@@ -86,7 +86,7 @@
                     '${item}'
                 </foreach>
             </if>
-            <if test="infos = null and infos.size() == 0">
+            <if test="infos = null || infos.size() == 0">
                 and 1=1
             </if>
         </if>