Forráskód Böngészése

病例质控指定医院病例条目分页查询

wangyu 5 éve
szülő
commit
2ccf632b95

+ 9 - 35
mrman-service/src/main/java/com/diagbot/facade/QcCacesEntryFacade.java

@@ -1,13 +1,11 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.QcCasesEntryAllDTO;
 import com.diagbot.service.impl.QcCasesEntryServiceImpl;
 import com.diagbot.vo.QcCasesEntryAllVO;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Description:
  * @author: wangyu
@@ -15,38 +13,14 @@ import java.util.List;
  */
 @Component
 public class QcCacesEntryFacade extends QcCasesEntryServiceImpl {
-    @Autowired
-    private QcCasesFacade qcCasesFacade;
 
-    public List<QcCasesEntryAllDTO> getAll(QcCasesEntryAllVO qcCasesEntryAllVO){
-       /* //获取所有条目信息
-        QueryWrapper<QcCasesEntry> qcCasesEntryQueryWrapper = new QueryWrapper<>();
-        qcCasesEntryQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .orderByAsc("cases_id","id","level_no");
-        if(qcCasesEntryAllVO.getCasesId() != null){
-            qcCasesEntryQueryWrapper.eq("cases_id", qcCasesEntryAllVO.getCasesId());
-        }
-        if(StringUtil.isNotEmpty(qcCasesEntryAllVO.getName())){
-            qcCasesEntryQueryWrapper.like("name", qcCasesEntryAllVO.getName());
-        }
-        if(StringUtil.isNotEmpty(qcCasesEntryAllVO.getCode())){
-            qcCasesEntryQueryWrapper.eq("cede", qcCasesEntryAllVO.getCode());
-        }
-        if(StringUtil.isNotEmpty(qcCasesEntryAllVO.getLevelNo())){
-            qcCasesEntryQueryWrapper.eq("level_no", qcCasesEntryAllVO.getLevelNo());
-        }
-        List<QcCasesEntry> qcCasesEntryS = this.list(qcCasesEntryQueryWrapper);*/
-        List<QcCasesEntryAllDTO> qcCasesEntryAllDTOS = this.getAllQcCasesEntry(qcCasesEntryAllVO).getRecords();
-        /*qcCasesEntryAllDTOS = BeanUtil.listCopyTo(qcCasesEntryS,QcCasesEntryAllDTO.class);*/
-       /* //获取所有模块信息
-        QueryWrapper<QcCases> qcCasesQueryWrapper = new QueryWrapper<>();
-        qcCasesQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
-        Map<Long,QcCases> qcCasesMap = qcCasesFacade.list(qcCasesQueryWrapper).stream().collect(Collectors.toMap(QcCases::getId,qcCases -> qcCases));
-        for (QcCasesEntryAllDTO qcCasesEntryAllDTO : qcCasesEntryAllDTOS) {
-            if (qcCasesMap.get(qcCasesEntryAllDTO.getCasesId()) != null){
-                qcCasesEntryAllDTO.setCaseName(qcCasesMap.get(qcCasesEntryAllDTO.getCasesId()).getName());
-            }
-        }*/
-        return qcCasesEntryAllDTOS;
+    /**
+     * 分页获取病例条目
+     *
+     * @param qcCasesEntryAllVO
+     * @return
+     */
+    public IPage<QcCasesEntryAllDTO> getAll(QcCasesEntryAllVO qcCasesEntryAllVO){
+        return this.getAllQcCasesEntry(qcCasesEntryAllVO);
     }
 }

+ 3 - 4
mrman-service/src/main/java/com/diagbot/web/QcCasesEntryController.java

@@ -1,6 +1,7 @@
 package com.diagbot.web;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.QcCasesEntryAllDTO;
 import com.diagbot.dto.RespDTO;
@@ -14,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * <p>
  * 病历条目 前端控制器
@@ -36,8 +35,8 @@ public class QcCasesEntryController {
             notes = "获取全部条目")
     @PostMapping("/getAll")
     @SysLogger("getAll")
-    public RespDTO<List<QcCasesEntryAllDTO>> getAll(@RequestBody QcCasesEntryAllVO qcCasesEntryAllVO) {
-        List<QcCasesEntryAllDTO> data =qcCacesEntryFacade.getAll(qcCasesEntryAllVO);
+    public RespDTO<IPage<QcCasesEntryAllDTO>> getAll(@RequestBody QcCasesEntryAllVO qcCasesEntryAllVO) {
+        IPage<QcCasesEntryAllDTO> data =qcCacesEntryFacade.getAll(qcCasesEntryAllVO);
         return RespDTO.onSuc(data);
     }
 }

+ 1 - 3
mrman-service/src/main/resources/mapper/QcCasesEntryMapper.xml

@@ -17,9 +17,7 @@
 
     <select id="getAllQcCasesEntry" parameterType="com.diagbot.vo.QcCasesEntryAllVO" resultType="com.diagbot.dto.QcCasesEntryAllDTO">
         SELECT a.*,c.`name` cases_name FROM `qc_cases_entry` a
-        LEFT JOIN qc_cases_entry_hospital b ON a.id = b.cases_entry_id
-        LEFT JOIN qc_cases c ON a.cases_id = c.id
-        WHERE a.is_deleted = 'N' AND b.is_deleted = 'N' AND c.is_deleted = 'N'
+        WHERE a.is_deleted = 'N'
         <if test="casesId != null and casesId != ''">
             AND a.cases_id = #{casesId}
         </if>