查体模板

icssman-service/src/main/java/com/diagbot/facade/DeptVitalFacade.java

@@ -192,49 +192,19 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
      * @param deptVitalPageVO
      * @return
      */
-    public IPage<DeptVitalDTO> getDeptVitalPage(DeptVitalPageVO deptVitalPageVO) {
-        /*QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<>();
-        deptVitalQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                select("dept_id", "gmt_create", "creator", "gmt_modified", "modifier").
-                groupBy("dept_id", "gmt_create", "creator", "gmt_modified", "modifier");
-        List<DeptVital> deptVitalList = this.list(deptVitalQueryWrapper);
-        Map<Long, DeptVital> deptVitalMap = EntityUtil.makeEntityMap(deptVitalList, "deptId");
-        List<Long> deptIds = deptVitalList.stream().map(deptVital -> deptVital.getDeptId()).collect(Collectors.toList());
-
-        QueryWrapper<DeptInfo> deptInfoQueryWrapper = new QueryWrapper<>();
-        deptInfoQueryWrapper.like("name", deptVitalPageVO.getDeptName()).
-                eq("is_deleted", IsDeleteEnum.N.getKey()).
-                in("id", deptIds);
-        IPage<DeptVitalDTO> page = deptInfoFacade.page(deptVitalPageVO, deptInfoQueryWrapper);
-
-        List<DeptVitalDTO> deptVitalDTOListRet = Lists.newLinkedList();
+    public IPage<DeptVitalDTO> getDeptVitalPageByMap(DeptVitalPageVO deptVitalPageVO) {
+        IPage<DeptVitalDTO> page = this.getDeptVitalPage(deptVitalPageVO);
         List<DeptVitalDTO> deptVitalDTOList = page.getRecords();
-        for (DeptInfo deptInfo : deptVitalDTOList) {
-            DeptVitalDTO deptVitalDTO = new DeptVitalDTO();
-            BeanUtil.copyProperties(deptInfo, deptVitalDTO);
-            //取映射关系维护时间，不取科室维护时间
-            if (deptVitalMap.get(deptInfo.getId()) != null) {
-                DeptVital deptVital = deptVitalMap.get(deptInfo.getId());
-                deptVitalDTO.setGmtCreate(deptVital.getGmtCreate());
-                deptVitalDTO.setGmtModified(deptVital.getGmtModified());
-                deptVitalDTO.setCreator(deptVital.getCreator());
-                deptVitalDTO.setModifier(deptVital.getModifier());
-                deptVitalDTO.setGmtOperate(deptVitalDTO.getGmtModified());
-                deptVitalDTO.setOperator(deptVitalDTO.getModifier());
-            }
-            deptVitalDTOListRet.add(deptVitalDTO);
-        }
-        List<String> userIds = deptVitalDTOListRet.stream().map(deptVitalDTO -> deptVitalDTO.getModifier()).collect(Collectors.toList());
+        List<String> userIds = deptVitalDTOList.stream().map(deptVitalDTO -> deptVitalDTO.getOperator()).collect(Collectors.toList());
         RespDTO<Map<String, String>> data = userServiceClient.getUserInfoByIds(userIds);
         Map<String, String> userInfos = data.data;
-        for (DeptVitalDTO deptVitalDTO : deptVitalDTOListRet) {
+        for (DeptVitalDTO deptVitalDTO : deptVitalDTOList) {
             if (userInfos.get(deptVitalDTO.getOperator()) != null) {
                 deptVitalDTO.setOperatorName(userInfos.get(deptVitalDTO.getOperator()));
             }
         }
-        page.setRecords(deptVitalDTOListRet);
-        return page;*/
-        return null;
+        page.setRecords(deptVitalDTOList);
+        return page;
     }
 
     /**

icssman-service/src/main/java/com/diagbot/mapper/DeptVitalMapper.java

@@ -1,7 +1,11 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.DeptVital;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.DeptVitalDTO;
+import com.diagbot.entity.DeptVital;
+import com.diagbot.vo.DeptVitalPageVO;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -12,5 +16,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2018-11-22
  */
 public interface DeptVitalMapper extends BaseMapper<DeptVital> {
-
+    /**
+     * 查体模板分页信息
+     *
+     * @param deptVitalPageVO
+     * @return
+     */
+    IPage<DeptVitalDTO> getDeptVitalPage(@Param("deptVitalPageVO") DeptVitalPageVO deptVitalPageVO);
 }

icssman-service/src/main/java/com/diagbot/service/impl/DeptVitalServiceImpl.java

@@ -1,13 +1,14 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.DeptVitalDTO;
 import com.diagbot.entity.DeptVital;
 import com.diagbot.mapper.DeptVitalMapper;
 import com.diagbot.service.DeptVitalService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.DeptVitalPageVO;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * <p>
  * 科室查体对应表 服务实现类
@@ -18,10 +19,13 @@ import java.util.List;
  */
 @Service
 public class DeptVitalServiceImpl extends ServiceImpl<DeptVitalMapper, DeptVital> implements DeptVitalService {
-
-    public Boolean saveRecords(List<DeptVital> deptVitalList){
-        super.saveBatch(deptVitalList);
-        return true;
+    /**
+     * 查体模板分页信息
+     *
+     * @param deptVitalPageVO
+     * @return
+     */
+    public IPage<DeptVitalDTO> getDeptVitalPage(DeptVitalPageVO deptVitalPageVO) {
+        return baseMapper.getDeptVitalPage(deptVitalPageVO);
     }
-
 }

icssman-service/src/main/java/com/diagbot/vo/DeptVitalPageVO.java

@@ -12,5 +12,5 @@ import lombok.Setter;
 @Getter
 @Setter
 public class DeptVitalPageVO extends Page {
-    String deptName;
+    private String deptName;
 }

icssman-service/src/main/java/com/diagbot/web/DeptVitalController.java

@@ -92,7 +92,7 @@ public class DeptVitalController {
     @PostMapping("/getDeptVitalPage")
     @SysLogger("getDeptVitalPage")
     public RespDTO getDeptVitalPage(@RequestBody DeptVitalPageVO deptVitalPageVO) {
-        IPage<DeptVitalDTO> infoIPage = deptVitalFacade.getDeptVitalPage(deptVitalPageVO);
+        IPage<DeptVitalDTO> infoIPage = deptVitalFacade.getDeptVitalPageByMap(deptVitalPageVO);
         return RespDTO.onSuc(infoIPage);
     }
 

icssman-service/src/main/resources/mapper/DeptVitalMapper.xml

@@ -15,4 +15,30 @@
         <result column="remark" property="remark" />
     </resultMap>
 
+    <!-- 通用查询映射结果 -->
+    <resultMap id="DeptVitalDTOMap" type="com.diagbot.dto.DeptVitalDTO">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="name" property="name" />
+        <result column="remark" property="remark" />
+        <result column="operator" property="operator" />
+        <result column="gmtOperate" property="gmt_operate" />
+    </resultMap>
+
+    <!--查询已有模板分页-->
+    <select id="getDeptVitalPage" resultMap="DeptVitalDTOMap">
+        SELECT DISTINCT a.*, b.modifier AS operator,b.gmt_modified AS gmt_operate
+        FROM icss_dept_info a,icss_dept_vital b
+        WHERE a.id = b.dept_id
+          AND a.is_deleted = 'N'
+          AND b.is_deleted = 'N'
+          <if test="deptVitalPageVO.deptName!=null and deptVitalPageVO.deptName!=''">
+              AND a.name like CONCAT("%",#{deptVitalPageVO.deptName},"%")
+          </if>
+    </select>
+
 </mapper>