病例质控指定医院病例条目相关bug修正

mrman-service/src/main/java/com/diagbot/dto/QcCasesAllDTO.java

@@ -44,6 +44,8 @@ public class QcCasesAllDTO {
      */
     private String name;
 
+    private String prefix;
+
     /**
      * 备注
      */

mrman-service/src/main/java/com/diagbot/dto/QcCasesDTO.java

@@ -13,5 +13,6 @@ import lombok.Setter;
 public class QcCasesDTO  {
     private Long Id ;
     private String name;
+    private String prefix;
     private String remark;
 }

mrman-service/src/main/java/com/diagbot/entity/QcCases.java

@@ -54,6 +54,16 @@ public class QcCases implements Serializable {
      */
     private String name;
 
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public void setPrefix(String prefix) {
+        this.prefix = prefix;
+    }
+
+    private String prefix;
+
     /**
      * 备注
      */
@@ -127,6 +137,7 @@ public class QcCases implements Serializable {
             ", modifier=" + modifier +
             ", name=" + name +
             ", remark=" + remark +
+                ", prefix=" + prefix +
         "}";
     }
 }

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

@@ -1,21 +1,12 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.QcCasesEntryAllDTO;
-import com.diagbot.entity.QcCases;
-import com.diagbot.entity.QcCasesEntry;
-import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.QcCasesEntryServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.StringUtil;
 import com.diagbot.vo.QcCasesEntryAllVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -28,7 +19,7 @@ public class QcCacesEntryFacade extends QcCasesEntryServiceImpl {
     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");
@@ -44,10 +35,10 @@ public class QcCacesEntryFacade extends QcCasesEntryServiceImpl {
         if(StringUtil.isNotEmpty(qcCasesEntryAllVO.getLevelNo())){
             qcCasesEntryQueryWrapper.eq("level_no", qcCasesEntryAllVO.getLevelNo());
         }
-        List<QcCasesEntry> qcCasesEntryS = this.list(qcCasesEntryQueryWrapper);
-        List<QcCasesEntryAllDTO> qcCasesEntryAllDTOS = new ArrayList<>();
-        qcCasesEntryAllDTOS = BeanUtil.listCopyTo(qcCasesEntryS,QcCasesEntryAllDTO.class);
-        //获取所有模块信息
+        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));
@@ -55,7 +46,7 @@ public class QcCacesEntryFacade extends QcCasesEntryServiceImpl {
             if (qcCasesMap.get(qcCasesEntryAllDTO.getCasesId()) != null){
                 qcCasesEntryAllDTO.setCaseName(qcCasesMap.get(qcCasesEntryAllDTO.getCasesId()).getName());
             }
-        }
+        }*/
         return qcCasesEntryAllDTOS;
     }
 }

mrman-service/src/main/java/com/diagbot/facade/QcInputcasesFacade.java

@@ -242,8 +242,6 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
         }
         if(ListUtil.isNotEmpty(hospitalIds)){
             casesNumberQueryWrapper.in("hospital_id",hospitalIds);
-        }else {
-            casesNumberQueryWrapper.in("hospital_id","-10");
         }
         List<CasesNumber> casesNumbers = casesNumberService.list(casesNumberQueryWrapper);
         List<QcAllInputcasesDTO> res = new ArrayList<>();

mrman-service/src/main/java/com/diagbot/mapper/QcCasesEntryMapper.java

@@ -1,7 +1,10 @@
 package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.QcCasesEntryAllDTO;
 import com.diagbot.entity.QcCasesEntry;
+import com.diagbot.vo.QcCasesEntryAllVO;
 
 /**
  * <p>
@@ -13,4 +16,11 @@ import com.diagbot.entity.QcCasesEntry;
  */
 public interface QcCasesEntryMapper extends BaseMapper<QcCasesEntry> {
 
+    /**
+     * 分页获取病例条目
+     *
+     * @param qcCasesEntryAllVO
+     * @return
+     */
+    IPage<QcCasesEntryAllDTO> getAllQcCasesEntry(QcCasesEntryAllVO qcCasesEntryAllVO);
 }

mrman-service/src/main/java/com/diagbot/service/QcCasesEntryService.java

@@ -1,8 +1,10 @@
 package com.diagbot.service;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.QcCasesEntryAllDTO;
 import com.diagbot.entity.QcCasesEntry;
+import com.diagbot.vo.QcCasesEntryAllVO;
 
 /**
  * <p>
@@ -15,4 +17,11 @@ import com.diagbot.entity.QcCasesEntry;
 
 public interface QcCasesEntryService extends IService<QcCasesEntry> {
 
+    /**
+     * 分页获取病例条目
+     *
+     * @param qcCasesEntryAllVO
+     * @return
+     */
+    IPage<QcCasesEntryAllDTO> getAllQcCasesEntry(QcCasesEntryAllVO qcCasesEntryAllVO);
 }

mrman-service/src/main/java/com/diagbot/service/impl/QcCasesEntryServiceImpl.java

@@ -1,9 +1,12 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.QcCasesEntryAllDTO;
 import com.diagbot.entity.QcCasesEntry;
 import com.diagbot.mapper.QcCasesEntryMapper;
 import com.diagbot.service.QcCasesEntryService;
+import com.diagbot.vo.QcCasesEntryAllVO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +20,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class QcCasesEntryServiceImpl extends ServiceImpl<QcCasesEntryMapper, QcCasesEntry> implements QcCasesEntryService {
 
+    @Override
+    public IPage<QcCasesEntryAllDTO> getAllQcCasesEntry(QcCasesEntryAllVO qcCasesEntryAllVO) {
+        return baseMapper.getAllQcCasesEntry(qcCasesEntryAllVO);
+    }
 }

mrman-service/src/main/java/com/diagbot/vo/QcCasesEntryAllVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,7 +11,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class QcCasesEntryAllVO {
+public class QcCasesEntryAllVO extends Page {
 
     /**
      * 病历id

mrman-service/src/main/resources/mapper/QcCasesEntryMapper.xml

@@ -15,4 +15,23 @@
         <result column="remark" property="remark" />
     </resultMap>
 
+    <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'
+        <if test="casesId != null">
+            AND a.cases_id = #{casesId}
+        </if>
+        <if test="levelNo">
+            AND a.level_no = #{levelNo}
+        </if>
+        <if test="name">
+            AND a.`name` LIKE CONCAT('%',#{name},'%')
+        </if>
+        <if test="code">
+            AND a.`code` = #{code}
+        </if>
+        ORDER BY a.cases_id,a.id,a.level_no
+    </select>
 </mapper>