ai病例质控后台维护修改2

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

@@ -1,13 +1,8 @@
 package com.diagbot.dto;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.diagbot.entity.QcHospitalInfo;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.time.LocalDateTime;
-
 /**
  * @author wangfeng
  * @Description:

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

@@ -15,8 +15,8 @@ import java.util.Date;
  * @author wangfeng
  * @since 2020-03-17
  */
-@TableName("qc_hospital_info")
-public class QcHospitalInfo implements Serializable {
+@TableName("bas_hospital_info")
+public class BasHospitalInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -1,9 +1,9 @@
 package com.diagbot.facade;
 
 import com.diagbot.dto.QcHospitalInfoAllDTO;
-import com.diagbot.entity.QcHospitalInfo;
-import com.diagbot.service.QcHospitalInfoService;
-import com.diagbot.service.impl.QcHospitalInfoServiceImpl;
+import com.diagbot.entity.BasHospitalInfo;
+import com.diagbot.service.BasHospitalInfoService;
+import com.diagbot.service.impl.BasHospitalInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -17,17 +17,17 @@ import java.util.List;
  * @date 2020-03-17 13:47
  */
 @Component
-public class QcHospitalInfoFacade extends QcHospitalInfoServiceImpl {
+public class BasHospitalInfoFacade extends BasHospitalInfoServiceImpl {
 
     @Autowired
-    QcHospitalInfoService qcHospitalInfoService;
+    BasHospitalInfoService qcHospitalInfoService;
 
     /**
      *
      * @return
      */
     public List<QcHospitalInfoAllDTO> getHospitalInfoAll() {
-        List<QcHospitalInfo> data = qcHospitalInfoService.list();
+        List<BasHospitalInfo> data = qcHospitalInfoService.list();
         List<QcHospitalInfoAllDTO> dataNew = new ArrayList<QcHospitalInfoAllDTO>();
         dataNew = BeanUtil.listCopyTo(data, QcHospitalInfoAllDTO.class);
         return dataNew;

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

@@ -3,6 +3,7 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.GetAllByHospitalDTO;
 import com.diagbot.dto.GetAllByHospitalDetialDTO;
+import com.diagbot.dto.QcCasesEntryDTO;
 import com.diagbot.entity.CasesEntryHospital;
 import com.diagbot.entity.QcCases;
 import com.diagbot.entity.QcCasesEntry;
@@ -55,9 +56,9 @@ public class CasesEntryHospitalFacade extends CasesEntryHospitalServiceImpl {
         List<Long> casesEntryIds = new ArrayList<>();
         casesEntryIds = casesEntryHospitals.stream().map(CasesEntryHospital::getCasesEntryId).collect(Collectors.toList());
         //获取病例条目
-        List<QcCasesEntry> qcCasesEntries = new ArrayList<>();
+        List<QcCasesEntryDTO> qcCasesEntries = new ArrayList<>();
         if(ListUtil.isNotEmpty(casesEntryIds)){
-            qcCasesEntries = new ArrayList<>(qcCacesEntryFacade.listByIds(casesEntryIds));
+            qcCasesEntries = new ArrayList<QcCasesEntryDTO>(qcCacesEntryFacade.getByCasesEntryId(casesEntryIds));
         }
         //获取病例
         QueryWrapper<QcCases> qcCasesQueryWrapper = new QueryWrapper<>();
@@ -73,14 +74,14 @@ public class CasesEntryHospitalFacade extends CasesEntryHospitalServiceImpl {
             getAllByHospitalDTO.setCasesName(qcCases_new.getName());
             getAllByHospitalDTO.setRemark(qcCases_new.getRemark());
             getAllByHospitalDetialDTOS = new ArrayList<>();
-            for (QcCasesEntry qcCasesEntry : qcCasesEntries) {
+            for (QcCasesEntryDTO qcCasesEntry : qcCasesEntries) {
                 if(getAllByHospitalDTO.getCasesName().equals(qcCasesEntry.getCasesName())){
                     getAllByHospitalDetialDTO = new GetAllByHospitalDetialDTO();
                     getAllByHospitalDetialDTO.setCasesEntryId(qcCasesEntry.getId());
                     getAllByHospitalDetialDTO.setCasesName(qcCasesEntry.getCasesName());
                     getAllByHospitalDetialDTO.setCode(qcCasesEntry.getCode());
                     getAllByHospitalDetialDTO.setModeId(qcCasesEntry.getModeId());
-                    //getAllByHospitalDetialDTO.setModeName(qcCasesEntry.getModeName());
+                    getAllByHospitalDetialDTO.setModeName(qcCasesEntry.getModeName());
                     getAllByHospitalDetialDTO.setMsg(casesEntryHospitalMap.get(qcCasesEntry.getId()).getMsg());
                     getAllByHospitalDetialDTO.setIsUsed(casesEntryHospitalMap.get(qcCasesEntry.getId()).getIsUsed());
                     getAllByHospitalDetialDTO.setScore(casesEntryHospitalMap.get(qcCasesEntry.getId()).getScore());

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

@@ -33,7 +33,7 @@ public class QcCacesEntryFacade extends QcCasesEntryServiceImpl {
     @Autowired
     private CasesEntryHospitalFacade casesEntryHospitalFacade;
     @Autowired
-    private QcHospitalInfoFacade qcHospitalInfoFacade;
+    private BasHospitalInfoFacade qcHospitalInfoFacade;
     /**
      * 分页获取病例条目
      *

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

@@ -48,7 +48,7 @@ public class QcCasesFacade extends QcCasesServiceImpl {
         QueryWrapper<QcCasesEntry> qcCasesEntryQuery = new QueryWrapper<>();
         qcCasesEntryQuery
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .orderByDesc("");
+                .orderByDesc("order_no");
         List<QcCasesEntry> dataEntry = qcCasesEntryService.list(qcCasesEntryQuery);
         List<QcCasesEntryDTO> dataEntryDTO = new ArrayList<>();
         dataEntryDTO = BeanUtil.listCopyTo(dataEntry,QcCasesEntryDTO.class);

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

@@ -4,12 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.ModuleMappingDTO;
 import com.diagbot.dto.QcAllInputcasesDTO;
-import com.diagbot.dto.QcInputcasesAllDTO;
 import com.diagbot.dto.QcInputcasesMappingDTO;
 import com.diagbot.entity.CasesNumber;
 import com.diagbot.entity.Mode;
 import com.diagbot.entity.ModelMapping;
-import com.diagbot.entity.QcHospitalInfo;
+import com.diagbot.entity.BasHospitalInfo;
 import com.diagbot.entity.QcInputcases;
 import com.diagbot.entity.QcInputcasesMapping;
 import com.diagbot.enums.IsDeleteEnum;
@@ -33,7 +32,6 @@ import com.diagbot.vo.QcInputcasesSaveVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -59,7 +57,7 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
     @Autowired
     ModeService modeService;
     @Autowired
-    QcHospitalInfoFacade qcHospitalInfoFacade;
+    BasHospitalInfoFacade qcHospitalInfoFacade;
 
    /* public List<QcInputcasesAllDTO> getInputcasesAlls(Long textId) {
         //查出所有病例
@@ -228,10 +226,10 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
     public List<QcAllInputcasesDTO> getAllInputcases(QcInputcasesAllVO qcInputcasesAllVO){
         List<Long> hospitalIds = new ArrayList<>();
         if (StringUtil.isNotEmpty(qcInputcasesAllVO.getHospitalName())){
-            QueryWrapper<QcHospitalInfo> qcHospitalInfoQueryWrapper = new QueryWrapper<>();
+            QueryWrapper<BasHospitalInfo> qcHospitalInfoQueryWrapper = new QueryWrapper<>();
             qcHospitalInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
                     .like("name",qcInputcasesAllVO.getHospitalName());
-            hospitalIds = qcHospitalInfoFacade.list(qcHospitalInfoQueryWrapper).stream().map(QcHospitalInfo::getId).collect(Collectors.toList());
+            hospitalIds = qcHospitalInfoFacade.list(qcHospitalInfoQueryWrapper).stream().map(BasHospitalInfo::getId).collect(Collectors.toList());
         }
         //病例
         QueryWrapper<CasesNumber> casesNumberQueryWrapper = new QueryWrapper<>();
@@ -251,11 +249,11 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
         List<CasesNumber> casesNumbers = casesNumberService.list(casesNumberQueryWrapper);
         //将病例内容放入出参
         List<QcAllInputcasesDTO> res = new ArrayList<>();
-        QueryWrapper<QcHospitalInfo> hospitalInfoQueryWrapper = new QueryWrapper<>();
+        QueryWrapper<BasHospitalInfo> hospitalInfoQueryWrapper = new QueryWrapper<>();
         hospitalInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
-        List<QcHospitalInfo> qcHospitalInfos = qcHospitalInfoFacade.list();
+        List<BasHospitalInfo> qcHospitalInfos = qcHospitalInfoFacade.list();
         Map<Long,String> hospitalMap = new HashMap<>();
-        hospitalMap = qcHospitalInfos.stream().collect(Collectors.toMap(QcHospitalInfo::getId,hospitalInfo -> hospitalInfo.getName()));
+        hospitalMap = qcHospitalInfos.stream().collect(Collectors.toMap(BasHospitalInfo::getId, hospitalInfo -> hospitalInfo.getName()));
         res = BeanUtil.listCopyTo(casesNumbers,QcAllInputcasesDTO.class);
         for (QcAllInputcasesDTO qcAllInputcasesDTO : res) {
             qcAllInputcasesDTO.setHospitalName(hospitalMap.get(Long.parseLong(qcAllInputcasesDTO.getHospitalId())));
@@ -286,11 +284,11 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
         modelQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
         List<Mode> modes = modeService.list();
         //病例列表
-        QueryWrapper<QcHospitalInfo> hospitalInfoQueryWrapper = new QueryWrapper<>();
+        QueryWrapper<BasHospitalInfo> hospitalInfoQueryWrapper = new QueryWrapper<>();
         hospitalInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
-        List<QcHospitalInfo> qcHospitalInfos = qcHospitalInfoFacade.list();
+        List<BasHospitalInfo> qcHospitalInfos = qcHospitalInfoFacade.list();
         Map<Long,String> hospitalMap = new HashMap<>();
-        hospitalMap = qcHospitalInfos.stream().collect(Collectors.toMap(QcHospitalInfo::getId,hospitalInfo -> hospitalInfo.getName()));
+        hospitalMap = qcHospitalInfos.stream().collect(Collectors.toMap(BasHospitalInfo::getId, hospitalInfo -> hospitalInfo.getName()));
         List<ModuleMappingDTO> moduleMappingDTOS = new ArrayList<>();
         ModuleMappingDTO moduleMappingDTO = new ModuleMappingDTO();
         List<String> modeList = new ArrayList();

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

@@ -1,6 +1,6 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.QcHospitalInfo;
+import com.diagbot.entity.BasHospitalInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author wangfeng
  * @since 2020-03-17
  */
-public interface QcHospitalInfoMapper extends BaseMapper<QcHospitalInfo> {
+public interface BasHospitalInfoMapper extends BaseMapper<BasHospitalInfo> {
 
 }

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

@@ -3,8 +3,12 @@ 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.dto.QcCasesEntryDTO;
 import com.diagbot.entity.QcCasesEntry;
 import com.diagbot.vo.QcCasesEntryAllVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -23,4 +27,6 @@ public interface QcCasesEntryMapper extends BaseMapper<QcCasesEntry> {
      * @return
      */
     IPage<QcCasesEntryAllDTO> getAllQcCasesEntry(QcCasesEntryAllVO qcCasesEntryAllVO);
+
+    List<QcCasesEntryDTO> getByCasesEntryId( @Param("ids") List<Long> ids);
 }

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

@@ -1,6 +1,6 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.QcHospitalInfo;
+import com.diagbot.entity.BasHospitalInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author wangfeng
  * @since 2020-03-17
  */
-public interface QcHospitalInfoService extends IService<QcHospitalInfo> {
+public interface BasHospitalInfoService extends IService<BasHospitalInfo> {
 
 }

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

@@ -3,9 +3,12 @@ package com.diagbot.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.QcCasesEntryAllDTO;
+import com.diagbot.dto.QcCasesEntryDTO;
 import com.diagbot.entity.QcCasesEntry;
 import com.diagbot.vo.QcCasesEntryAllVO;
 
+import java.util.List;
+
 /**
  * <p>
  * 病历条目 服务类
@@ -24,4 +27,6 @@ public interface QcCasesEntryService extends IService<QcCasesEntry> {
      * @return
      */
     IPage<QcCasesEntryAllDTO> getAllQcCasesEntry(QcCasesEntryAllVO qcCasesEntryAllVO);
+
+    List<QcCasesEntryDTO> getByCasesEntryId(List<Long> ids);
 }

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

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.BasHospitalInfo;
+import com.diagbot.mapper.BasHospitalInfoMapper;
+import com.diagbot.service.BasHospitalInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 医院信息表 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-17
+ */
+@Service
+public class BasHospitalInfoServiceImpl extends ServiceImpl<BasHospitalInfoMapper, BasHospitalInfo> implements BasHospitalInfoService {
+
+}

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

@@ -3,12 +3,15 @@ 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.dto.QcCasesEntryDTO;
 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;
 
+import java.util.List;
+
 /**
  * <p>
  * 病历条目 服务实现类
@@ -24,4 +27,9 @@ public class QcCasesEntryServiceImpl extends ServiceImpl<QcCasesEntryMapper, QcC
     public IPage<QcCasesEntryAllDTO> getAllQcCasesEntry(QcCasesEntryAllVO qcCasesEntryAllVO) {
         return baseMapper.getAllQcCasesEntry(qcCasesEntryAllVO);
     }
+
+    @Override
+    public List<QcCasesEntryDTO> getByCasesEntryId(List<Long> ids) {
+        return baseMapper.getByCasesEntryId(ids);
+    }
 }

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

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.diagbot.entity.QcHospitalInfo;
-import com.diagbot.mapper.QcHospitalInfoMapper;
-import com.diagbot.service.QcHospitalInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 医院信息表 服务实现类
- * </p>
- *
- * @author wangfeng
- * @since 2020-03-17
- */
-@Service
-public class QcHospitalInfoServiceImpl extends ServiceImpl<QcHospitalInfoMapper, QcHospitalInfo> implements QcHospitalInfoService {
-
-}

mrman-service/src/main/java/com/diagbot/web/QcHospitalInfoController.java

@@ -3,16 +3,14 @@ package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.QcHospitalInfoAllDTO;
-import com.diagbot.dto.QcInputcasesAllDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.QcHospitalInfoFacade;
+import com.diagbot.facade.BasHospitalInfoFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -29,10 +27,10 @@ import java.util.List;
 @RestController
 @RequestMapping("/qcHospitalInfo")
 @Api(value = "医院信息相关接口", tags = { "医院信息相关接口" })
-public class QcHospitalInfoController {
+public class BasHospitalInfoController {
 
     @Autowired
-    QcHospitalInfoFacade qcHospitalInfoFacade;
+    BasHospitalInfoFacade qcHospitalInfoFacade;
 
     @ApiOperation(value = "获取医院信息[by:wangfeng]",
             notes = "获取医院信息")

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.QcHospitalInfoMapper">
+<mapper namespace="com.diagbot.mapper.BasHospitalInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.QcHospitalInfo">
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.BasHospitalInfo">
         <id column="id" property="id" />
         <result column="is_deleted" property="isDeleted" />
         <result column="gmt_create" property="gmtCreate" />

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

@@ -38,4 +38,13 @@
         </if>
         ORDER BY a.cases_id,a.id
     </select>
+    <select id="getByCasesEntryId"  resultType="com.diagbot.dto.QcCasesEntryDTO">
+        SELECT a.*,b.name as modeName FROM qc_cases_entry a
+        LEFT JOIN  qc_mode b ON b.id= a.mode_id
+        WHERE a.is_deleted = 'N' AND   a.id
+        IN
+        <foreach collection="ids" item="ids" open="(" close=")" separator=",">
+            #{ids}
+        </foreach>
+    </select>
 </mapper>

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

@@ -35,7 +35,7 @@
 
     </select>
 
-    <select id="getCasesEntryByHospitalId" resultType="com.diagbot.entity.QcCasesEntryDTO">
+    <select id="getCasesEntryByHospitalId" resultType="com.diagbot.dto.QcCasesEntryDTO">
         SELECT * FROM `qc_cases_entry` a
         LEFT JOIN qc_cases_entry_hospital b on a.id = b.cases_entry_id
         WHERE a.is_deleted='N' AND b.is_deleted='N'