医生病例模板优化

icss-service/src/main/java/com/diagbot/dto/TemplateInfoPageDTO.java

@@ -0,0 +1,28 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年7月24日 上午11:07:57
+ */
+@Getter
+@Setter
+public class TemplateInfoPageDTO {
+	 private Long id;//模板id
+	 private Date  gmtCreate;//创建时间
+	 private String creator;//创建人id
+	 private String name;//模板名字
+	 private Long doctorId;//医生id
+	 private Long hospitalId;//医院id
+	 private Long hospitalDeptId;//部门id
+	 private Integer sex;//性别
+	 private String type;//模板类型
+	 private String  preview;//预览文字
+	 private String remark;//备注
+}

icss-service/src/main/java/com/diagbot/facade/TemplateInfoFacade.java

@@ -1,27 +1,35 @@
 package com.diagbot.facade;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 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.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.TemplateInfoDTO;
+import com.diagbot.dto.TemplateInfoPageDTO;
 import com.diagbot.entity.TemplateInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.service.TemplateInfoService;
 import com.diagbot.service.impl.TemplateInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.GsonUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.vo.TemplateIdVO;
+import com.diagbot.vo.TemplateInfoPageVO;
 import com.diagbot.vo.TemplateInfoRevampVO;
 import com.diagbot.vo.TemplateInfoVO;
 import com.diagbot.vo.TemplateInfosIdVO;
 import com.diagbot.vo.TemplateInfosVO;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author wangfeng
@@ -168,4 +176,54 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
         return res;
     }
 
+    /**
+     * 
+     * @param page
+     * @param templateInfoPageVO
+     * @return
+     */
+	public IPage<TemplateInfoPageDTO> getTemplatePageAlls(Page page, TemplateInfoPageVO templateInfoPageVO) {
+/*		  //根据传入的医生id和部门id还有医院id在数据表中查出相应的模板数据
+
+        QueryWrapper<TemplateInfo> templateInfoQuery = new QueryWrapper<>();
+        Map<String, Object> mapAll = new HashMap<>();
+        mapAll.put("hospital_dept_id", templateInfoPageVO.getHospitalDeptId());
+        mapAll.put("doctor_id", templateInfoPageVO.getDoctorId());
+        mapAll.put("hospital_id", templateInfoPageVO.getHospitalId());
+        mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
+        mapAll.put("type", templateInfoPageVO.getType());
+        if (templateInfoPageVO.getSex() != null) {
+            templateInfoQuery.allEq(mapAll).in("sex", 3, templateInfoPageVO.getSex()).orderByDesc("gmt_create");
+        } else {
+            templateInfoQuery.allEq(mapAll).orderByDesc("gmt_create");
+        }
+        IPage<TemplateInfoPageDTO> TemplateInfoData =page(page, templateInfoQuery);
+        List<TemplateInfoPageDTO> datas = TemplateInfoData.getRecords();
+        List<TemplateInfoPageDTO> data = new ArrayList<TemplateInfoPageDTO>();
+        //过滤
+        data = BeanUtil.listCopyTo(datas, TemplateInfoPageDTO.class);
+        
+		return TemplateInfoData.setRecords(data);*/
+		IPage<TemplateInfoPageDTO> TemplateInfoData = getTemplatePages(templateInfoPageVO);
+		return TemplateInfoData;
+	}
+
+	/**
+	 * 
+	 * @param templateIdVO
+	 * @return
+	 */
+	public TemplateInfoDTO getTemplateIdAlls(TemplateIdVO templateIdVO) {
+		 //根据传入的医生id和部门id还有医院id在数据表中查出相应的模板数据
+        QueryWrapper<TemplateInfo> templateInfoQuery = new QueryWrapper<>();
+        Map<String, Object> mapAll = new HashMap<>();
+        mapAll.put("id", templateIdVO.getId());
+        mapAll.put("is_deleted", IsDeleteEnum.N.getKey());     
+        TemplateInfoDTO data = new TemplateInfoDTO();
+        TemplateInfo datas = getOne(templateInfoQuery);
+        //过滤
+        BeanUtil.copyProperties(datas, data);
+        return data;
+	}
+
 }

icss-service/src/main/java/com/diagbot/mapper/TemplateInfoMapper.java

@@ -1,10 +1,17 @@
 package com.diagbot.mapper;
 
 import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.TemplateInfoDTO;
+import com.diagbot.dto.TemplateInfoPageDTO;
 import com.diagbot.entity.TemplateInfo;
+import com.diagbot.vo.TemplateInfoPageVO;
 
 /**
  * <p>
@@ -19,4 +26,6 @@ public interface TemplateInfoMapper extends BaseMapper<TemplateInfo> {
 	//根据医生id查询该医生保存的病历模板
 	public List<TemplateInfoDTO> findByDoctorIdTemplate(TemplateInfo templateInfo);
 
+	public IPage<TemplateInfoPageDTO> getTemplatePages(TemplateInfoPageVO templateInfoPageVO);
+
 }

icss-service/src/main/java/com/diagbot/service/TemplateInfoService.java

@@ -1,10 +1,15 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.TemplateInfoDTO;
+import com.diagbot.dto.TemplateInfoPageDTO;
 import com.diagbot.entity.TemplateInfo;
+import com.diagbot.vo.TemplateInfoPageVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +26,8 @@ public interface TemplateInfoService extends IService<TemplateInfo> {
 
     public boolean updateById(TemplateInfo templateInfo);
 
+	public IPage<TemplateInfoPageDTO> getTemplatePages(TemplateInfoPageVO templateInfoPageVO );
+    
+
+
 }

icss-service/src/main/java/com/diagbot/service/impl/TemplateInfoServiceImpl.java

@@ -1,13 +1,19 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.TemplateInfoDTO;
+import com.diagbot.dto.TemplateInfoPageDTO;
 import com.diagbot.entity.TemplateInfo;
 import com.diagbot.mapper.TemplateInfoMapper;
 import com.diagbot.service.TemplateInfoService;
+import com.diagbot.vo.TemplateInfoPageVO;
+
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,5 +35,10 @@ public class TemplateInfoServiceImpl extends ServiceImpl<TemplateInfoMapper, Tem
         return baseMapper.findByDoctorIdTemplate(templateInfo);
     }
 
+	@Override
+	public IPage<TemplateInfoPageDTO> getTemplatePages(TemplateInfoPageVO templateInfoPageVO) {
+		return baseMapper.getTemplatePages(templateInfoPageVO);
+	}
+
 
 }

icss-service/src/main/java/com/diagbot/vo/TemplateIdVO.java

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年7月24日 下午1:20:52
+ */
+@Getter
+@Setter
+public class TemplateIdVO {
+
+	@NotBlank(message = "请输入模板id")
+	private String id;
+}

icss-service/src/main/java/com/diagbot/vo/TemplateInfoPageVO.java

@@ -0,0 +1,44 @@
+package com.diagbot.vo;
+
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年7月24日 上午11:06:33
+ */
+@Getter
+@Setter
+public class TemplateInfoPageVO extends Page{
+
+	/**
+     * 医生id
+     */
+	@NotNull(message = "请输入医生id")
+    private Long doctorId;
+
+    /**
+     * 医院编码
+     */
+	@NotNull(message = "请输入医院Id")
+    private Long hospitalId;
+	/**
+	 * 部门id
+	 */
+	@NotNull(message = "请输入部门id")
+	private Long hospitalDeptId;//部门id
+	
+	@NotBlank(message = "请输入模板类型")
+	private String type;//模板类型
+	
+	private List<Integer> sex;//性别
+}

icss-service/src/main/java/com/diagbot/web/TemplateInfoController.java

@@ -1,26 +1,33 @@
 package com.diagbot.web;
 
 
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.TemplateInfoDTO;
+import com.diagbot.dto.TemplateInfoPageDTO;
 import com.diagbot.entity.TemplateInfo;
 import com.diagbot.facade.TemplateInfoFacade;
+import com.diagbot.vo.TemplateIdVO;
+import com.diagbot.vo.TemplateInfoPageVO;
 import com.diagbot.vo.TemplateInfoRevampVO;
 import com.diagbot.vo.TemplateInfoVO;
 import com.diagbot.vo.TemplateInfosIdVO;
 import com.diagbot.vo.TemplateInfosVO;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.List;
 
 /**
  * @author wangfeng
@@ -83,5 +90,26 @@ public class TemplateInfoController {
 
         return RespDTO.onSuc(res);
     }
+    
+    @ApiOperation(value = "分页查询病历模板内容[by:wangfeng]",
+            notes = "doctorId: 医生id<br>" + "dospitalId：医院编码<br>" + "deptId:部门id<br>" + "type:模式<br>")
+    @PostMapping("/getTemplatePageAlls")
+    @SysLogger("getTemplatePageAlls")
+    public RespDTO<IPage<TemplateInfoPageDTO>> getTemplatePageAll(@Valid @RequestBody TemplateInfoPageVO templateInfoPageVO) {
+
+    	IPage<TemplateInfoPageDTO> data = templateInfoFacade.getTemplatePageAlls(templateInfoPageVO,templateInfoPageVO);
 
+        return RespDTO.onSuc(data);
+    }
+    
+    @ApiOperation(value = "根据模板id获取病历模板内容[by:wangfeng]",
+            notes = "doctorId: 医生id<br>" + "dospitalId：医院编码<br>" + "deptId:部门id<br>" + "type:模式<br>")
+    @PostMapping("/getTemplateIdAlls")
+    @SysLogger("getTemplateIdAlls")
+    public RespDTO<TemplateInfoDTO> getTemplateIdAll(@Valid @RequestBody TemplateIdVO templateIdVO) {
+
+    	TemplateInfoDTO data = templateInfoFacade.getTemplateIdAlls(templateIdVO);
+
+        return RespDTO.onSuc(data);
+    }
 }

icss-service/src/main/resources/mapper/TemplateInfoMapper.xml

@@ -2,39 +2,41 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.diagbot.mapper.TemplateInfoMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.TemplateInfo">
-        <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="doctor_id" property="doctorId" />
-        <result column="hospital_dept_id" property="hospitalDeptId" />
-        <result column="hospital_id" property="hospitalId" />
-        <result column="sex" property="sex" />
-        <result column="type" property="type" />
-        <result column="preview" property="preview" />
-        <result column="data_json" property="dataJson" />
-        <result column="remark" property="remark" />
-    </resultMap>
-    <!--根据医生id查询该医生保存的病历模板 -->
+	<!-- 通用查询映射结果 -->
+	<resultMap id="BaseResultMap" type="com.diagbot.entity.TemplateInfo">
+		<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="doctor_id" property="doctorId" />
+		<result column="hospital_dept_id" property="hospitalDeptId" />
+		<result column="hospital_id" property="hospitalId" />
+		<result column="sex" property="sex" />
+		<result column="type" property="type" />
+		<result column="preview" property="preview" />
+		<result column="data_json" property="dataJson" />
+		<result column="remark" property="remark" />
+	</resultMap>
+	<!--根据医生id查询该医生保存的病历模板 -->
 	<select id="findByDoctorIdTemplate" resultType="com.diagbot.dto.TemplateInfoDTO">
-	SELECT
+		SELECT
 		id AS id,
 		gmt_create AS gmtCreate,
 		creator AS creator,
-		NAME AS modeName,
+		NAME AS
+		modeName,
 		doctor_id AS doctorId,
 		hospital_id AS hospitalId,
 		hospital_dept_id As hospitalDeptId,
 		TYPE AS modeType,
-		preview AS preview,
+		preview AS
+		preview,
 		data_json AS dataJson,
 		remark AS remark
-	FROM
+		FROM
 		icss_template_info WHERE is_deleted = "N"
 		<if test="id != null and id != ''">
 			and id = #{id}
@@ -42,7 +44,7 @@
 		<if test="name != null and name != ''">
 			and name = #{name}
 		</if>
-	    <if test="hospitalDeptId != null and hospitalDeptId != ''">
+		<if test="hospitalDeptId != null and hospitalDeptId != ''">
 			and hospital_dept_id = #{hospitalDeptId}
 		</if>
 		<if test="doctorId != null and doctorId != ''">
@@ -57,4 +59,42 @@
 		ORDER BY gmt_create DESC
 
 	</select>
+	<select id="getTemplatePages" resultType="com.diagbot.dto.TemplateInfoPageDTO">
+		SELECT
+		id AS id,
+		gmt_create AS gmtCreate,
+		creator AS creator,
+		NAME AS
+		name,
+		doctor_id AS doctorId,
+		hospital_id AS hospitalId,
+		hospital_dept_id
+		As hospitalDeptId,
+		TYPE AS type,
+		sex AS sex,
+		preview AS preview,
+		remark AS
+		remark
+		FROM
+		icss_template_info WHERE is_deleted = "N"
+		<if test="hospitalDeptId != null ">
+			and hospital_dept_id = #{hospitalDeptId}
+		</if>
+		<if test="doctorId != null ">
+			and doctor_id = #{doctorId}
+		</if>
+		<if test="hospitalId != null">
+			and hospital_id = #{hospitalId}
+		</if>
+		<if test="type != null and type != ''">
+			and type = #{type}
+		</if>
+		and sex in
+		<foreach collection="sex" item="sexNew" open="(" close=")"
+			separator=",">
+			#{sexNew}
+		</foreach>
+		ORDER BY gmt_create DESC
+
+	</select>
 </mapper>