diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java
index 16550ca..eb946e1 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java
@@ -3,18 +3,55 @@ package com.lyms.platform.permission.model;
import java.util.Date;
public class PatientService {
+
private String id;
+ /**
+ * 孕妇id
+ */
private String parentid;
+ /**
+ * personId
+ */
private String pid;
+ /**
+ * 服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
+ */
private Integer serType;
+ /**
+ * 开通医生
+ */
private String serDoct;
+ /**
+ * 创建时间
+ */
private Date createDate;
+ /**
+ * 创建用户名称
+ */
private String createUserName;
+ /**
+ * 创建用户id
+ */
private String createUser;
+ /**
+ * 服务状态(1-开通、2-退订、3-过期、4-暂停)
+ */
private Integer serStatus;
+ /**
+ * 修改时间
+ */
private Date updateDate;
+ /**
+ * 修改用户名称
+ */
private String updateUserName;
+ /**
+ * 修改用户id
+ */
private String updateUser;
+ /**
+ * 医院ID
+ */
private String hospitalId;
public String getHospitalId() {
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java
index ea5a7eb..03cc48b 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java
@@ -13,6 +13,8 @@ public class PatientServiceQuery extends BaseQuery {
private Integer serType;
private String serDoct;
private Date createDate;
+ private Date createStartDate;
+ private Date createEndDate;
private String createUserName;
private String createUser;
private Integer serStatus;
@@ -21,6 +23,22 @@ public class PatientServiceQuery extends BaseQuery {
private String updateUser;
private String hospitalId;
+ public Date getCreateStartDate() {
+ return createStartDate;
+ }
+
+ public void setCreateStartDate(Date createStartDate) {
+ this.createStartDate = createStartDate;
+ }
+
+ public Date getCreateEndDate() {
+ return createEndDate;
+ }
+
+ public void setCreateEndDate(Date createEndDate) {
+ this.createEndDate = createEndDate;
+ }
+
public String getHospitalId() {
return hospitalId;
}
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
index 98a6517..bcc0e87 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
@@ -2,156 +2,166 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
insert into patient_service (id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id) values (#{id},#{parentid},#{pid},#{serType},#{serDoct},#{createDate},#{createUserName},#{createUser},#{serStatus},#{updateDate},#{updateUserName},#{updateUser},#{hospitalId})
-
-
-update patient_service
-parentid = #{parentid,jdbcType=VARCHAR},
-
-
-pid = #{pid,jdbcType=VARCHAR},
-
-
-ser_type = #{serType,jdbcType=INTEGER},
-
-
-ser_doct = #{serDoct,jdbcType=VARCHAR},
-
-
-create_date = #{createDate,jdbcType=TIMESTAMP},
-
-
-create_user_name = #{createUserName,jdbcType=VARCHAR},
-
-
-create_user = #{createUser,jdbcType=VARCHAR},
-
-
-ser_status = #{serStatus,jdbcType=INTEGER},
-
-
-update_date = #{updateDate,jdbcType=TIMESTAMP},
-
-
-update_user_name = #{updateUserName,jdbcType=VARCHAR},
-
-
-update_user = #{updateUser,jdbcType=VARCHAR},
-
-
- hospital_id = #{hospitalId,jdbcType=VARCHAR},
-
-
-where id = #{id,jdbcType=VARCHAR}
-
-
-
-
+
+ update patient_service
+
+
+ parentid = #{parentid,jdbcType=VARCHAR},
+
+
+ pid = #{pid,jdbcType=VARCHAR},
+
+
+ ser_type = #{serType,jdbcType=INTEGER},
+
+
+ ser_doct = #{serDoct,jdbcType=VARCHAR},
+
+
+ create_date = #{createDate,jdbcType=TIMESTAMP},
+
+
+ create_user_name = #{createUserName,jdbcType=VARCHAR},
+
+
+ create_user = #{createUser,jdbcType=VARCHAR},
+
+
+ ser_status = #{serStatus,jdbcType=INTEGER},
+
+
+ update_date = #{updateDate,jdbcType=TIMESTAMP},
+
+
+ update_user_name = #{updateUserName,jdbcType=VARCHAR},
+
+
+ update_user = #{updateUser,jdbcType=VARCHAR},
+
+
+ hospital_id = #{hospitalId,jdbcType=VARCHAR},
+
+
+ where id = #{id,jdbcType=VARCHAR}
+
+
+
+
delete from patient_service where id = #{id,jdbcType=VARCHAR}
-
-
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java
index b280c53..f86a82a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java
@@ -3,18 +3,18 @@ package com.lyms.platform.operate.web.controller;
import com.lyms.platform.common.annotation.TokenRequired;
import com.lyms.platform.common.base.BaseController;
import com.lyms.platform.common.base.LoginContext;
+import com.lyms.platform.common.result.BaseListResponse;
import com.lyms.platform.common.result.BaseResponse;
import com.lyms.platform.common.utils.StringUtils;
import com.lyms.platform.operate.web.facade.PatientServiceFacade;
+import com.lyms.platform.operate.web.request.BasePageQueryRequest;
import com.lyms.platform.permission.model.PatientService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
/**
* @auther yangfei
@@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletRequest;
* @discription
*/
@Controller
-@RequestMapping("/patient")
public class PatientServiceController extends BaseController {
@Autowired
@@ -63,7 +62,7 @@ public class PatientServiceController extends BaseController {
@RequestMapping(value = "/patSer", method = RequestMethod.POST)
public BaseResponse addOrUpdatePatientService(PatientService ps, HttpServletRequest request){
LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
- if(StringUtils.isNotEmpty(ps.getId())){
+ if(StringUtils.isEmpty(ps.getId())){
return patientServiceFacade.addPatientService(ps,loginState.getId());
}else{
return patientServiceFacade.updatePatientService(ps,loginState.getId());
@@ -71,18 +70,39 @@ public class PatientServiceController extends BaseController {
}
/**
- * 根据Id获取开通继续
+ * 根据Id获取开通记录
* @param id 开通服务id
- * @param request
* @return
*/
@ResponseBody
@TokenRequired
@RequestMapping(value = "/patSer/{id}", method = RequestMethod.GET)
- public BaseResponse findOnePatientService(@PathVariable String id, HttpServletRequest request){
+ public BaseResponse findOnePatientService(@PathVariable String id){
return patientServiceFacade.findOnePatientService(id);
}
-
+ /**
+ * 根据条件查询开通服务记录
+ * @param serType 服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
+ * @param serDoct 服务医生
+ * @param createStartDate 开通开始时间
+ * @param createEndDate 开通结束时间
+ * @param serStatus 开通状态(1-开通、2-退订、3-过期、4-暂停)
+ * @return
+ */
+ @ResponseBody
+ @TokenRequired
+ @RequestMapping(value = "/patSer/list", method = RequestMethod.GET)
+ public BaseListResponse getPatientService(@RequestParam(value = "serType",required = false) Integer serType,
+ @RequestParam(value = "serDoct",required = false) String serDoct,
+ @RequestParam(value = "createStartDate",required = false) Date createStartDate,
+ @RequestParam(value = "createEndDate",required = false) Date createEndDate,
+ @RequestParam(value = "serStatus",required = false) Integer serStatus,
+ BasePageQueryRequest pageInfo,
+ HttpServletRequest request
+ ){
+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+ return patientServiceFacade.getPatientService(serType,serDoct,createStartDate,createEndDate,serStatus,pageInfo,loginState.getId());
+ }
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
index 1a93fe3..270da23 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
@@ -2,9 +2,11 @@ package com.lyms.platform.operate.web.facade;
import com.lyms.platform.common.constants.ErrorCodeConstants;
import com.lyms.platform.common.enums.PatientSerEnums;
+import com.lyms.platform.common.result.BaseListResponse;
import com.lyms.platform.common.result.BaseObjectResponse;
import com.lyms.platform.common.result.BaseResponse;
import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.operate.web.request.BasePageQueryRequest;
import com.lyms.platform.operate.web.result.PatientSerResult;
import com.lyms.platform.permission.model.PatientService;
import com.lyms.platform.permission.model.PatientServiceQuery;
@@ -37,7 +39,7 @@ public class PatientServiceFacade {
public BaseResponse patientServiceInit() {
Map map = new HashMap();
//服务类型
- map.put("serType", PatientSerEnums.getSerType());
+ map.put("serTypes", PatientSerEnums.getSerType());
//服务状态
map.put("serStatus", PatientSerEnums.getSerStatus());
return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(map);
@@ -93,9 +95,10 @@ public class PatientServiceFacade {
* @param id
* @return
*/
- public BaseResponse addPatientService(PatientService ps,Integer id){
+ public BaseResponse addPatientService(PatientService ps, Integer id){
//根据用户id获取医院ID
String hospitalId = autoMatchFacade.getHospitalId(id);
+ ps.setId(UUID.randomUUID().toString().replace("-",""));
ps.setHospitalId(hospitalId);
ps.setCreateDate(new Date());
ps.setCreateUser(String.valueOf(id));
@@ -132,6 +135,9 @@ public class PatientServiceFacade {
* @return
*/
public PatientSerResult convertToResult(PatientService ps){
+ if(ps==null){
+ return null;
+ }
PatientSerResult result = new PatientSerResult();
result.setId(ps.getId());
result.setParentid(ps.getParentid());
@@ -154,4 +160,45 @@ public class PatientServiceFacade {
result.setSerDoct(ps.getSerDoct());
return result;
}
+
+ /**
+ * 根据条件查询开通服务记录
+ * @param serType 服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
+ * @param serDoct 服务医生
+ * @param createStartDate 开通开始时间
+ * @param createEndDate 开通结束时间
+ * @param pageInfo 分页信息
+ * @param serStatus 开通状态(1-开通、2-退订、3-过期、4-暂停)
+ * @return
+ */
+ public BaseListResponse getPatientService(Integer serType, String serDoct, Date createStartDate, Date createEndDate, Integer serStatus, BasePageQueryRequest pageInfo,Integer id) {
+//根据用户id获取医院ID
+ String hospitalId = autoMatchFacade.getHospitalId(id);
+ PatientServiceQuery patientQuery = new PatientServiceQuery();
+ patientQuery.setHospitalId(hospitalId);
+ patientQuery.setSerType(serType);
+ patientQuery.setSerDoct(serDoct);
+ patientQuery.setCreateStartDate(createStartDate);
+ patientQuery.setCreateEndDate(createEndDate);
+ patientQuery.setSerStatus(serStatus);
+ patientQuery.setSort("create_date");
+ patientQuery.setNeed("y");
+ patientQuery.setOffset((pageInfo.getPage()-1)*pageInfo.getLimit());
+ patientQuery.setLimit(pageInfo.getLimit());
+ patientQuery.setPage(pageInfo.getPage());
+ List patientServices = patientServiceService.queryPatientService(patientQuery);
+
+ List patientSerResults = new ArrayList<>();
+ for(PatientService ps : patientServices){
+ PatientSerResult patientSerResult = convertToResult(ps);
+ patientSerResults.add(patientSerResult);
+ }
+
+ BaseListResponse baseResponse = new BaseListResponse();
+ baseResponse.setData(patientSerResults);
+ baseResponse.setPageInfo(patientQuery.getPageInfo());
+ baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
+ baseResponse.setErrormsg("成功");
+ return baseResponse;
+ }
}