From 036ec0c760dba5ac8f652f488367958c114fb297 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 12 Sep 2017 15:33:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E7=AE=A1=E7=90=86=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E9=A2=86=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/permission/model/PatientService.java  |  48 ++++++++
 .../permission/model/PatientServiceQuery.java      |  71 ++++++++++++
 .../resources/mainOrm/master/PatientService.xml    |  44 +++++++-
 .../platform/common/enums/PatientSerEnums.java     |   6 +-
 .../web/controller/PatientServiceController.java   |  88 +++++++++++----
 .../operate/web/facade/PatientServiceFacade.java   | 125 ++++++++++++++++++++-
 .../operate/web/result/PatientSerResult.java       |  70 ++++++++++++
 7 files changed, 422 insertions(+), 30 deletions(-)

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 eb946e1..46e215b 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
@@ -53,6 +53,54 @@ public class PatientService {
      * 医院ID
      */
     private String hospitalId;
+    /**
+     * 验证码
+     */
+    private String serCode;
+    /**
+     * 领取状态 1-待领取、2-已领取
+     */
+    private Integer status;
+    /**
+     * 领取时间
+     */
+    private Date receiveDate;
+    /**
+     * 领取医生id
+     */
+    private String receiveUser;
+
+    public String getSerCode() {
+        return serCode;
+    }
+
+    public void setSerCode(String serCode) {
+        this.serCode = serCode;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getReceiveDate() {
+        return receiveDate;
+    }
+
+    public void setReceiveDate(Date receiveDate) {
+        this.receiveDate = receiveDate;
+    }
+
+    public String getReceiveUser() {
+        return receiveUser;
+    }
+
+    public void setReceiveUser(String receiveUser) {
+        this.receiveUser = receiveUser;
+    }
 
     public String getHospitalId() {
         return hospitalId;
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 03cc48b..4e9a1da 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
@@ -9,6 +9,10 @@ import java.util.Date;
 public class PatientServiceQuery extends BaseQuery {
     private String id;
     private String parentid;
+    /**
+     * 孕妇集合，根据关键字模糊查询
+     */
+    private String[] parentIds;
     private String pid;
     private Integer serType;
     private String serDoct;
@@ -22,7 +26,66 @@ public class PatientServiceQuery extends BaseQuery {
     private String updateUserName;
     private String updateUser;
     private String hospitalId;
+    /**
+     * 验证码
+     */
+    private String serCode;
+    /**
+     * sql(用于查询短信不为空的数据)
+     */
+    private String sql;
+    /**
+     * 领取状态 1-待领取、2-已领取
+     */
+    private Integer status;
+    /**
+     * 领取时间
+     */
+    private Date receiveDate;
+    /**
+     * 领取医生id
+     */
+    private String receiveUser;
 
+    public String getSql() {
+        return sql;
+    }
+
+    public void setSql(String sql) {
+        this.sql = sql;
+    }
+
+    public String getSerCode() {
+        return serCode;
+    }
+
+    public void setSerCode(String serCode) {
+        this.serCode = serCode;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getReceiveDate() {
+        return receiveDate;
+    }
+
+    public void setReceiveDate(Date receiveDate) {
+        this.receiveDate = receiveDate;
+    }
+
+    public String getReceiveUser() {
+        return receiveUser;
+    }
+
+    public void setReceiveUser(String receiveUser) {
+        this.receiveUser = receiveUser;
+    }
     public Date getCreateStartDate() {
         return createStartDate;
     }
@@ -166,4 +229,12 @@ public class PatientServiceQuery extends BaseQuery {
         this.updateUser = updateUser;
 
     }
+
+    public String[] getParentIds() {
+        return parentIds;
+    }
+
+    public void setParentIds(String[] parentIds) {
+        this.parentIds = parentIds;
+    }
 }
\ No newline at end of file
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 bcc0e87..3711e7a 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
@@ -16,11 +16,15 @@
         <result column="update_user_name" property="updateUserName" jdbcType="VARCHAR"/>
         <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
         <result column="hospital_id" property="hospitalId" jdbcType="VARCHAR"/>
+        <result column="ser_code" property="serCode" jdbcType="VARCHAR"/>
+        <result column="status" property="status" jdbcType="INTEGER"/>
+        <result column="receive_date" property="receiveDate" jdbcType="TIMESTAMP"/>
+        <result column="receive_user" property="receiveUser" jdbcType="VARCHAR"/>
     </resultMap>
 
 
     <insert id="addPatientService" parameterType="com.lyms.platform.permission.model.PatientService">
-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})
+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,ser_code,status,receive_date,receive_user) values (#{id},#{parentid},#{pid},#{serType},#{serDoct},#{createDate},#{createUserName},#{createUser},#{serStatus},#{updateDate},#{updateUserName},#{updateUser},#{hospitalId},#{serCode},#{status},#{receiveDate},#{receiveUser})
 </insert>
 
 
@@ -63,6 +67,18 @@ insert into patient_service (id,parentid,pid,ser_type,ser_doct,create_date,creat
             <if test="hospitalId != null and hospitalId != ''">
                 hospital_id = #{hospitalId,jdbcType=VARCHAR},
             </if>
+            <if test="serCode != null and serCode != ''">
+                ser_code = #{serCode,jdbcType=VARCHAR},
+            </if>
+            <if test="status != null and status >= 0">
+                status = #{status,jdbcType=INTEGER},
+            </if>
+            <if test="receiveDate != null">
+                receive_date = #{receiveDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="receiveUser != null and receiveUser != ''">
+                receive_user = #{receiveUser,jdbcType=VARCHAR},
+            </if>
         </set>
         where id = #{id,jdbcType=VARCHAR}
     </update>
@@ -74,7 +90,7 @@ delete from patient_service where id = #{id,jdbcType=VARCHAR}
 
 
     <select id="getPatientService" resultMap="PatientServiceResultMap" parameterType="java.lang.String">
-select 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
+select 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,ser_code,status,receive_date,receive_user
  from patient_service where id = #{id,jdbcType=VARCHAR}
 </select>
 
@@ -98,6 +114,13 @@ select id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_use
             <if test="parentid != null and parentid != ''">
                 and parentid = #{parentid,jdbcType=VARCHAR}
             </if>
+            <if test="parentIds!=null">
+                and parentid in (
+                <foreach item="parentid" collection="parentIds" separator=",">
+                    #{parentid}
+                </foreach>
+                )
+            </if>
             <if test="pid != null and pid != ''">
                 and pid = #{pid,jdbcType=VARCHAR}
             </if>
@@ -143,6 +166,21 @@ select id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_use
             <if test="hospitalId != null and hospitalId != ''">
                 and hospital_id = #{hospitalId,jdbcType=VARCHAR}
             </if>
+            <if test="serCode != null and serCode != ''">
+                and ser_code = #{serCode,jdbcType=VARCHAR}
+            </if>
+            <if test="status != null and status >= 0">
+                and status = #{status,jdbcType=INTEGER}
+            </if>
+            <if test="receiveDate != null">
+                and receive_date = #{receiveDate,jdbcType=TIMESTAMP}
+            </if>
+            <if test="receiveUser != null and receiveUser != ''">
+                and receive_user = #{receiveUser,jdbcType=VARCHAR}
+            </if>
+            <if test="sql != null and sql != ''">
+                ${sql}
+            </if>
         </where>
     </sql>
 
@@ -150,7 +188,7 @@ select id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_use
     <select id="queryPatientService" resultMap="PatientServiceResultMap"
             parameterType="com.lyms.platform.permission.model.PatientServiceQuery">
         select
-        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
+        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,ser_code,status,receive_date,receive_user
         from patient_service
         <include refid="PatientServiceCondition"/>
         <include refid="orderAndLimit"/>
diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java
index f715062..85bcd29 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java
@@ -14,9 +14,9 @@ public class PatientSerEnums {
     //服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
     public enum SerTypeEnums{
         gwjzzd(1,"高危精准指导"),
-        tz(2,"体重"),
-        xt(3, "血糖"),
-        xy(4, "血压"),
+        tz(2,"体重管理"),
+        xt(3, "血糖管理"),
+        xy(4, "血压管理"),
         zjzx(5, "专家咨询");
         private Integer id;
         private String title;
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 f86a82a..d7fb74f 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
@@ -29,80 +29,124 @@ public class PatientServiceController extends BaseController {
 
     /**
      * 初始化接口
+     *
      * @return
      */
     @ResponseBody
     @TokenRequired
     @RequestMapping(value = "/patSer/init", method = RequestMethod.GET)
-    public BaseResponse patientServiceInit(){
+    public BaseResponse patientServiceInit() {
         return patientServiceFacade.patientServiceInit();
     }
+
     /**
      * 根据孕妇Id查询在当前医院的服务开通记录
-     * @param pid 孕妇Id
+     *
+     * @param pid     孕妇Id
      * @param request
      * @return
      */
     @ResponseBody
     @TokenRequired
     @RequestMapping(value = "/patSer", method = RequestMethod.GET)
-    public BaseResponse findPatientServiceList(String pid,HttpServletRequest request){
+    public BaseResponse findPatientServiceList(String pid, HttpServletRequest request) {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-        return patientServiceFacade.findPatientServiceList(pid,loginState.getId());
+        return patientServiceFacade.findPatientServiceList(pid, loginState.getId());
     }
 
     /**
      * 新增或修改服务开通记录
-     * @param ps 服务开通记录
+     *
+     * @param ps      服务开通记录
      * @param request
      * @return
      */
     @ResponseBody
     @TokenRequired
     @RequestMapping(value = "/patSer", method = RequestMethod.POST)
-    public BaseResponse addOrUpdatePatientService(PatientService ps, HttpServletRequest request){
+    public BaseResponse addOrUpdatePatientService(PatientService ps, HttpServletRequest request) {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-        if(StringUtils.isEmpty(ps.getId())){
-            return patientServiceFacade.addPatientService(ps,loginState.getId());
-        }else{
-            return patientServiceFacade.updatePatientService(ps,loginState.getId());
+        if (StringUtils.isEmpty(ps.getId())) {
+            return patientServiceFacade.addPatientService(ps, loginState.getId());
+        } else {
+            return patientServiceFacade.updatePatientService(ps, loginState.getId());
         }
     }
 
     /**
      * 根据Id获取开通记录
+     *
      * @param id 开通服务id
      * @return
      */
     @ResponseBody
     @TokenRequired
     @RequestMapping(value = "/patSer/{id}", method = RequestMethod.GET)
-    public BaseResponse findOnePatientService(@PathVariable String id){
+    public BaseResponse findOnePatientService(@PathVariable String id) {
         return patientServiceFacade.findOnePatientService(id);
     }
 
     /**
      * 根据条件查询开通服务记录
-     * @param serType 服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
-     * @param serDoct 服务医生
+     *
+     * @param serType         服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
+     * @param serDoct         服务医生
      * @param createStartDate 开通开始时间
-     * @param createEndDate 开通结束时间
-     * @param serStatus 开通状态(1-开通、2-退订、3-过期、4-暂停)
+     * @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,
+    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());
+    }
+
+    /**
+     * 根据条件查询验证码列表
+     *
+     * @param serType         服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
+     * @param queryNo         查询关键字（姓名/证件号/联系方式/就诊卡号）
+     * @param cDueWeekStart   开始当前孕周
+     * @param cDueWeekEnd   结束当前孕周
+     * @return
+     */
+    @ResponseBody
+    @TokenRequired
+    @RequestMapping(value = "/patSer/codes", method = RequestMethod.GET)
+    public BaseListResponse ptientServiceCodeList(@RequestParam(value = "serType", required = false) Integer serType,
+                                                  @RequestParam(value = "queryNo", required = false) String queryNo,
+                                                  @RequestParam(value = "cDueWeekStart", required = false) Integer cDueWeekStart,
+                                                  @RequestParam(value = "cDueWeekEnd", required = false) Integer cDueWeekEnd,
+                                                  BasePageQueryRequest pageInfo,
+                                                  HttpServletRequest request
+    ) {
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        return patientServiceFacade.ptientServiceCodeList(serType, queryNo, cDueWeekStart, cDueWeekEnd, pageInfo, loginState.getId());
+    }
+
+    /**
+     * 确认领取（修改状态为领取）
+     *
+     * @param psId    服务开通记录id
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @TokenRequired
+    @RequestMapping(value = "/patSer/receive", method = RequestMethod.POST)
+    public BaseResponse receivePatientService(String psId, HttpServletRequest request) {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-        return patientServiceFacade.getPatientService(serType,serDoct,createStartDate,createEndDate,serStatus,pageInfo,loginState.getId());
+        return patientServiceFacade.receivePatientService(psId, 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 9a41ccc..eb540f0 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
@@ -1,11 +1,13 @@
 package com.lyms.platform.operate.web.facade;
 
+import com.lyms.platform.biz.service.PatientsService;
 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.common.utils.StringUtils;
 import com.lyms.platform.operate.web.request.BasePageQueryRequest;
 import com.lyms.platform.operate.web.result.PatientSerResult;
 import com.lyms.platform.permission.model.PatientService;
@@ -14,6 +16,8 @@ import com.lyms.platform.permission.model.Users;
 import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.permission.service.PatientServiceService;
 import com.lyms.platform.permission.service.UsersService;
+import com.lyms.platform.pojo.Patients;
+import com.lyms.platform.query.PatientsQuery;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -36,6 +40,8 @@ public class PatientServiceFacade {
     private OrganizationService organizationService;
     @Autowired
     private UsersService usersService;
+    @Autowired
+    private PatientsService patientsService;
 
     public BaseResponse patientServiceInit() {
         Map map = new HashMap();
@@ -120,7 +126,7 @@ public class PatientServiceFacade {
             if (users != null) {
                 serDoct = users.getName();
             }
-            baseResponse.setErrormsg("该孕妇已开通"+serDoct+"医生的" + serType + "服务，请勿重复开通");
+            baseResponse.setErrormsg("该孕妇已开通" + serDoct + "医生的" + serType + "服务，请勿重复开通");
             return baseResponse;
         }
 
@@ -128,6 +134,12 @@ public class PatientServiceFacade {
         ps.setHospitalId(hospitalId);
         ps.setCreateDate(new Date());
         ps.setCreateUser(String.valueOf(id));
+        //默认已经领取
+        ps.setStatus(2);
+        //领取时间
+        ps.setReceiveDate(new Date());
+        //领取操作医生id
+        ps.setReceiveUser(String.valueOf(id));
         patientServiceService.addPatientService(ps);
 
         BaseResponse baseResponse = new BaseResponse();
@@ -168,6 +180,18 @@ public class PatientServiceFacade {
         }
         PatientSerResult result = new PatientSerResult();
         result.setId(ps.getId());
+        Patients patients = patientsService.findOnePatientById(ps.getParentid());
+        if (null != patients) {
+            String weekDesc = DateUtil.getWeekDesc(patients.getLastMenses(),new Date());
+            result.setcDueWeek(weekDesc);
+            if (null != patients.getDueStatus() && 1 == patients.getDueStatus())
+                result.setcDueWeek("终止妊娠");
+            else if (patients.getType() == 3) {
+                result.setcDueWeek("已分娩");
+            }
+            result.setAge(DateUtil.getAge(patients.getBirth()) + "岁");
+            result.setName(patients.getUsername());
+        }
         result.setParentid(ps.getParentid());
         result.setCreateDate(DateUtil.getyyyy_MM_dd(ps.getCreateDate()));
         result.setPid(ps.getPid());
@@ -178,7 +202,9 @@ public class PatientServiceFacade {
         String serStatus = PatientSerEnums.SerStatusEnums.getTitle(ps.getSerStatus());
         result.setSerStatusStr(serStatus);
         result.setSerDoct(ps.getSerDoct());
-
+        result.setStatus(ps.getStatus());
+        result.setStatusStr(ps.getStatus()==1?"待领取":"已领取");
+        result.setSerCode(ps.getSerCode());
         Users users = usersService.getUsers(Integer.parseInt(ps.getSerDoct()));
         if (users != null) {
             result.setSerDoctStr(users.getName());
@@ -230,4 +256,99 @@ public class PatientServiceFacade {
         baseResponse.setErrormsg("成功");
         return baseResponse;
     }
+
+    public BaseListResponse ptientServiceCodeList(Integer serType, String queryNo, Integer cDueWeekStart, Integer cDueWeekEnd, BasePageQueryRequest pageInfo, Integer id) {
+
+        //根据用户id获取医院ID
+        String hospitalId = autoMatchFacade.getHospitalId(id);
+        PatientServiceQuery patientQuery = new PatientServiceQuery();
+        patientQuery.setHospitalId(hospitalId);
+        patientQuery.setSerType(serType);
+        patientQuery.setSort("create_date");
+        patientQuery.setNeed("y");
+        patientQuery.setOffset((pageInfo.getPage() - 1) * pageInfo.getLimit());
+        patientQuery.setLimit(pageInfo.getLimit());
+        patientQuery.setPage(pageInfo.getPage());
+        patientQuery.setSql("and ser_code is not null");
+
+        PatientsQuery patientsQuery = new PatientsQuery();
+        List<Patients> patientses = null;
+        //根据查询号、当前孕周进行查询
+        if (StringUtils.isNotEmpty(queryNo)||null != cDueWeekStart||null != cDueWeekEnd) {
+            if (null != cDueWeekStart) {
+                patientsQuery.setLastMensesEnd(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cDueWeekStart * 7)));
+            }
+            if (null != cDueWeekEnd) {
+                patientsQuery.setLastMensesStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cDueWeekEnd * 7) - 6));
+            }
+            if(StringUtils.isNotEmpty(queryNo)){
+                patientsQuery.setQueryNo(queryNo);
+            }
+            patientsQuery.setHospitalId(hospitalId);
+            patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified");
+        }
+
+        if (CollectionUtils.isNotEmpty(patientses)) {
+            List<String> parentIds = new LinkedList<>();
+            for (Patients pa : patientses) {
+                parentIds.add(pa.getId());
+            }
+            patientQuery.setParentIds((String[]) parentIds.toArray(new String[parentIds.size()]));
+        } else if (StringUtils.isNotEmpty(queryNo)||StringUtils.isNotEmpty(queryNo)||null != cDueWeekStart||null != cDueWeekEnd) {
+            return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(patientQuery.getPageInfo());
+        }
+
+        List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery);
+
+        List<PatientSerResult> 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;
+    }
+
+    /**
+     * 修改状态为领取
+     *
+     * @param psId 服务记录Id
+     * @param id 用户id
+     * @return
+     */
+    public BaseResponse receivePatientService(String psId, Integer id) {
+
+        PatientService ps = patientServiceService.getPatientService(psId);
+        if(ps==null){
+            BaseResponse baseResponse = new BaseResponse();
+            baseResponse.setErrorcode(ErrorCodeConstants.NO_DATA);
+            baseResponse.setErrormsg("没有找到对应的数据");
+            return baseResponse;
+        }
+        //已经领取
+        if(ps.getStatus()==2){
+            BaseResponse baseResponse = new BaseResponse();
+            baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
+            baseResponse.setErrormsg("已经领取，请勿重复领取");
+            return baseResponse;
+        }
+        //设置为领取状态
+        ps.setStatus(2);
+        //根据用户id获取医院ID
+        ps.setReceiveDate(new Date());
+        ps.setReceiveUser(String.valueOf(id));
+        patientServiceService.updatePatientService(ps);
+
+        BaseResponse baseResponse = new BaseResponse();
+        baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
+        baseResponse.setErrormsg("成功");
+        return baseResponse;
+    }
+
+
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java
index 776b2f4..e71d4b0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java
@@ -16,6 +16,19 @@ public class PatientSerResult {
      */
     private String pid;
     /**
+     * 孕妇姓名
+     */
+
+    private String name;
+    /**
+     * 孕妇年龄
+     */
+    private String age;
+    /**
+     * 当前孕周
+     */
+    private String cDueWeek;
+    /**
      * 服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
      */
     private Integer serType;
@@ -37,6 +50,63 @@ public class PatientSerResult {
      */
     private Integer serStatus;
     private String serStatusStr;
+    /**
+     * 验证码
+     */
+    private String serCode;
+    /**
+     * 领取状态 1-待领取、2-已领取
+     */
+    private Integer status;
+    private String statusStr;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+
+    public String getcDueWeek() {
+        return cDueWeek;
+    }
+
+    public void setcDueWeek(String cDueWeek) {
+        this.cDueWeek = cDueWeek;
+    }
+
+    public String getSerCode() {
+        return serCode;
+    }
+
+    public void setSerCode(String serCode) {
+        this.serCode = serCode;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getStatusStr() {
+        return statusStr;
+    }
+
+    public void setStatusStr(String statusStr) {
+        this.statusStr = statusStr;
+    }
 
     public String getId() {
         return id;
-- 
1.8.3.1