配合演示的历史评分分页

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

@@ -2589,13 +2589,13 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
     /**
      * 评分历史
-     * @param behospitalCode
+     * @param historyAnalyzePageVO
      * @return
      */
-    public List<QcCasesHistoryDTO> getHistoryAnalyze(String behospitalCode) {
+    public IPage<QcCasesHistoryDTO> getHistoryAnalyze(HistoryAnalyzePageVO historyAnalyzePageVO) {
         Long hospitalID =Long.valueOf(SysUserUtils.getCurrentHospitalID());
-        List<QcCasesHistoryDTO> medQcresultResultList = qcresultInfoFacade.getMedQcresultResultList(hospitalID, behospitalCode);
-
+        historyAnalyzePageVO.setHospitalId(hospitalID);
+        IPage<QcCasesHistoryDTO> medQcresultResultList = qcresultInfoFacade.getMedQcresultResultList(historyAnalyzePageVO);
         return medQcresultResultList;
     }
 

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

@@ -2,6 +2,7 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.AlgorithmDTO;
 import com.diagbot.dto.AnalyzeDTO;
 import com.diagbot.dto.QcCasesHistoryDTO;
@@ -21,12 +22,7 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
-import com.diagbot.vo.AlgorithmVO;
-import com.diagbot.vo.AnalyzeVO;
-import com.diagbot.vo.GetDetailVO;
-import com.diagbot.vo.MedQcresultCasesVO;
-import com.diagbot.vo.QcResultAlgVO;
-import com.diagbot.vo.QcresultVO;
+import com.diagbot.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
@@ -428,11 +424,10 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
 
     /**
      * 历史评分
-     * @param hospitalId
-     * @param behospitalCode
+     * @param historyAnalyzePageVO
      * @return
      */
-    public List<QcCasesHistoryDTO> getMedQcresultResultList(Long hospitalId ,String behospitalCode){
-        return getMedQcresultResult(hospitalId,behospitalCode);
+    public IPage<QcCasesHistoryDTO> getMedQcresultResultList(HistoryAnalyzePageVO historyAnalyzePageVO){
+        return getMedQcresultResult(historyAnalyzePageVO);
     }
 }

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

@@ -4,16 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.*;
 import com.diagbot.entity.QcresultInfo;
-import com.diagbot.vo.FilterPageByDeptVO;
-import com.diagbot.vo.FilterPageVO;
-import com.diagbot.vo.FilterPageXYVO;
-import com.diagbot.vo.FilterVO;
-import com.diagbot.vo.QcresultFilterVO;
+import com.diagbot.vo.*;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -210,9 +204,8 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
 
     /**
      * 历史评分
-     * @param hospitalId
-     * @param behospitalCode
+     * @param historyAnalyzePageVO
      * @return
      */
-    public List<QcCasesHistoryDTO> getMedQcresultResult(@Param("hospitalId") Long hospitalId, @Param("behospitalCode") String behospitalCode);
+    public IPage<QcCasesHistoryDTO> getMedQcresultResult(HistoryAnalyzePageVO historyAnalyzePageVO);
 }

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

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.*;
 import com.diagbot.entity.QcresultInfo;
-import com.diagbot.vo.FilterPageByDeptVO;
-import com.diagbot.vo.FilterPageVO;
-import com.diagbot.vo.FilterVO;
-import com.diagbot.vo.QcresultFilterVO;
+import com.diagbot.vo.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -185,9 +182,8 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
 
     /**
      * 历史评分
-     * @param hospitalId
-     * @param behospitalInfo
+     * @param historyAnalyzePageVO
      * @return
      */
-    public List<QcCasesHistoryDTO> getMedQcresultResult(Long hospitalId , String behospitalInfo);
+    public IPage<QcCasesHistoryDTO> getMedQcresultResult(HistoryAnalyzePageVO historyAnalyzePageVO);
 }

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

@@ -6,12 +6,8 @@ import com.diagbot.dto.*;
 import com.diagbot.entity.QcresultInfo;
 import com.diagbot.mapper.QcresultInfoMapper;
 import com.diagbot.service.QcresultInfoService;
-import com.diagbot.vo.FilterPageByDeptVO;
-import com.diagbot.vo.FilterPageVO;
-import com.diagbot.vo.FilterVO;
-import com.diagbot.vo.QcresultFilterVO;
+import com.diagbot.vo.*;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
@@ -286,12 +282,11 @@ public class QcresultInfoServiceImpl extends ServiceImpl<QcresultInfoMapper, Qcr
 
     /**
      * 历史评分
-     * @param hospitalId
-     * @param behospitalCode
+     * @param historyAnalyzePageVO
      * @return
      */
     @Override
-    public List<QcCasesHistoryDTO> getMedQcresultResult(Long hospitalId , String behospitalCode){
-        return baseMapper.getMedQcresultResult(hospitalId,behospitalCode);
+    public IPage<QcCasesHistoryDTO> getMedQcresultResult(HistoryAnalyzePageVO historyAnalyzePageVO){
+        return baseMapper.getMedQcresultResult(historyAnalyzePageVO);
     }
 }

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

@@ -0,0 +1,28 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 住院病历信息
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@Data
+public class HistoryAnalyzePageVO extends Page implements Serializable {
+    /**
+     * 医院ID
+     */
+    @ApiModelProperty(hidden = true)
+    private Long hospitalId;
+    /**
+     * 病人住院ID
+     */
+    private String behospitalCode;
+}

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

@@ -289,8 +289,8 @@ public class BehospitalInfoController {
     @PostMapping("/historyAnalyze")
     @SysLogger("historyAnalyze")
     @Transactional
-    public RespDTO<List<QcCasesHistoryDTO>> historyAnalyze(@RequestBody String behospitalCode) {
-        return RespDTO.onSuc(behospitalInfoFacade.getHistoryAnalyze(behospitalCode));
+    public RespDTO<IPage<QcCasesHistoryDTO>> historyAnalyze(@RequestBody  HistoryAnalyzePageVO historyAnalyzePageVO) {
+        return RespDTO.onSuc(behospitalInfoFacade.getHistoryAnalyze(historyAnalyzePageVO));
     }
 
     @ApiOperation(value = "操作日志[by:zhanghang]",