From 21a71a6b2de42e5bf93411697393ba79ab4d8a76 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 12 Aug 2020 15:24:35 +0800
Subject: [PATCH] 修改医生模板获取
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IDoctorTempleteService.java | 7 +++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DoctorTempleteServiceImpl.java | 24 +++++++----
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java | 16 ++++++++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml | 32 +++++++++++++++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/DoctorTempleteMapper.java | 9 ++++
5 files changed, 76 insertions(+), 12 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/DoctorTempleteMapper.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/DoctorTempleteMapper.java
index ab31cba..031ae38 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/DoctorTempleteMapper.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/DoctorTempleteMapper.java
@@ -21,9 +21,16 @@
* 分页查询医生的模板列表
* @param page
* @param params
- * @return
+ * @returnfindDoctorList
*/
List<DoctorTemplete> findList(Page<DoctorTemplete> page, @Param("p") Map<String, Object> params);
+ /**
+ * 分页查询医生的模板列表
+ * @param page
+ * @param params
+ * @returnfindDoctorList
+ */
+ List<DoctorTemplete> findDoctorList(Page<DoctorTemplete> page, @Param("p") Map<String, Object> params);
/**
* 根据DoctorTemplete对象当做查询条件进行查询
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IDoctorTempleteService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IDoctorTempleteService.java
index ec7af0c..7285034 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IDoctorTempleteService.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IDoctorTempleteService.java
@@ -22,7 +22,12 @@
* @return
*/
PageResult findList(Map<String, Object> params);
-
+ /**
+ * 列表
+ * @param params
+ * @return
+ */
+ PageResult findDoctorList(Map<String, Object> params);
/**
* 根据DoctorTemplete对象当做查询条件进行查询
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DoctorTempleteServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DoctorTempleteServiceImpl.java
index 6375f4d..1fb7660 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DoctorTempleteServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DoctorTempleteServiceImpl.java
@@ -1,19 +1,18 @@
package com.kidgrow.oprationcenter.service.impl;
-import com.kidgrow.common.model.ResultBody;
-import org.springframework.stereotype.Service;
-import com.kidgrow.common.model.PageResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.service.impl.SuperServiceImpl;
+import com.kidgrow.oprationcenter.mapper.DoctorTempleteMapper;
+import com.kidgrow.oprationcenter.model.DoctorTemplete;
+import com.kidgrow.oprationcenter.service.IDoctorTempleteService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.MapUtils;
+import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
-import org.apache.commons.collections4.MapUtils;
-import lombok.extern.slf4j.Slf4j;
-
-import com.kidgrow.oprationcenter.model.DoctorTemplete;
-import com.kidgrow.oprationcenter.mapper.DoctorTempleteMapper;
-import com.kidgrow.oprationcenter.service.IDoctorTempleteService;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -38,6 +37,13 @@
return PageResult.<DoctorTemplete>builder().data(list).code(0).count(page.getTotal()).build();
}
+ @Override
+ public PageResult findDoctorList(Map<String, Object> params) {
+ Page<DoctorTemplete> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
+ List<DoctorTemplete> list = baseMapper.findDoctorList(page, params);
+ return PageResult.<DoctorTemplete>builder().data(list).code(0).count(page.getTotal()).build();
+ }
+
/**
* 根据DoctorTemplete对象当做查询条件进行查询
* @param doctorTemplete
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml
index 429a1cd..c6abb7f 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml
@@ -40,7 +40,7 @@
and templete_type = #{p.templeteType}
</if>
<if test="p.templeteTitle != null and p.templeteTitle !=''">
- and templete_title like '%${p.templeteTitle}%'
+ and templete_title like '%${p.templeteTitle}%'
</if>
<if test="p.templeteNote != null and p.templeteNote !=''">
and templete_note = #{p.templeteNote}
@@ -90,4 +90,34 @@
<include refid="where"/>
order by id desc
</select>
+ <select id="findDoctorList" resultType="com.kidgrow.oprationcenter.model.DoctorTemplete">
+ SELECT
+ id,
+ doctor_id,
+ doctor_name,
+ public_type,
+ templete_type,
+ templete_title,
+ create_time
+FROM
+ doctor_templete
+WHERE
+ is_del = 0
+ AND enabled = 1
+ AND templete_type = #{p.templeteType}
+ AND((
+ hospital_id IS NULL
+ AND hospital_id IS NULL
+ AND doctor_id IS NULL
+ )
+ OR (
+ hospital_id =#{p.hospitalId}
+ AND department_id =#{p.departmentId}
+ AND (
+ public_type = 0
+ OR (
+ doctor_id =#{p.doctorId} AND public_type = 1))))
+ ORDER BY public_type DESC,id desc
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java
index b890f89..c81c49c 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java
@@ -53,6 +53,22 @@
}
return doctorTempleteService.findList(params);
}
+ /**
+ * 医生的模板列表
+ */
+ @ApiOperation(value = "查询列表")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
+ @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
+ })
+ @GetMapping("/doctorTempleteList")
+ public PageResult doctorList(@RequestParam Map<String, Object> params) {
+ if(params.size()==0){
+ params.put("page",1);
+ params.put("limit",10);
+ }
+ return doctorTempleteService.findDoctorList(params);
+ }
/**
* 查询
--
Gitblit v1.8.0