jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 036ec0c760dba5ac8f652f488367958c114fb297

Authored by yangfei
1 parent 2091ebcf7f
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

短信管理确认领取

Showing 7 changed files with 422 additions and 30 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java View file @ 036ec0c
... ... @@ -53,6 +53,54 @@
53 53 * 医院ID
54 54 */
55 55 private String hospitalId;
  56 + /**
  57 + * 验证码
  58 + */
  59 + private String serCode;
  60 + /**
  61 + * 领取状态 1-待领取、2-已领取
  62 + */
  63 + private Integer status;
  64 + /**
  65 + * 领取时间
  66 + */
  67 + private Date receiveDate;
  68 + /**
  69 + * 领取医生id
  70 + */
  71 + private String receiveUser;
  72 +
  73 + public String getSerCode() {
  74 + return serCode;
  75 + }
  76 +
  77 + public void setSerCode(String serCode) {
  78 + this.serCode = serCode;
  79 + }
  80 +
  81 + public Integer getStatus() {
  82 + return status;
  83 + }
  84 +
  85 + public void setStatus(Integer status) {
  86 + this.status = status;
  87 + }
  88 +
  89 + public Date getReceiveDate() {
  90 + return receiveDate;
  91 + }
  92 +
  93 + public void setReceiveDate(Date receiveDate) {
  94 + this.receiveDate = receiveDate;
  95 + }
  96 +
  97 + public String getReceiveUser() {
  98 + return receiveUser;
  99 + }
  100 +
  101 + public void setReceiveUser(String receiveUser) {
  102 + this.receiveUser = receiveUser;
  103 + }
56 104  
57 105 public String getHospitalId() {
58 106 return hospitalId;
platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java View file @ 036ec0c
... ... @@ -9,6 +9,10 @@
9 9 public class PatientServiceQuery extends BaseQuery {
10 10 private String id;
11 11 private String parentid;
  12 + /**
  13 + * 孕妇集合，根据关键字模糊查询
  14 + */
  15 + private String[] parentIds;
12 16 private String pid;
13 17 private Integer serType;
14 18 private String serDoct;
15 19  
... ... @@ -22,7 +26,66 @@
22 26 private String updateUserName;
23 27 private String updateUser;
24 28 private String hospitalId;
  29 + /**
  30 + * 验证码
  31 + */
  32 + private String serCode;
  33 + /**
  34 + * sql(用于查询短信不为空的数据)
  35 + */
  36 + private String sql;
  37 + /**
  38 + * 领取状态 1-待领取、2-已领取
  39 + */
  40 + private Integer status;
  41 + /**
  42 + * 领取时间
  43 + */
  44 + private Date receiveDate;
  45 + /**
  46 + * 领取医生id
  47 + */
  48 + private String receiveUser;
25 49  
  50 + public String getSql() {
  51 + return sql;
  52 + }
  53 +
  54 + public void setSql(String sql) {
  55 + this.sql = sql;
  56 + }
  57 +
  58 + public String getSerCode() {
  59 + return serCode;
  60 + }
  61 +
  62 + public void setSerCode(String serCode) {
  63 + this.serCode = serCode;
  64 + }
  65 +
  66 + public Integer getStatus() {
  67 + return status;
  68 + }
  69 +
  70 + public void setStatus(Integer status) {
  71 + this.status = status;
  72 + }
  73 +
  74 + public Date getReceiveDate() {
  75 + return receiveDate;
  76 + }
  77 +
  78 + public void setReceiveDate(Date receiveDate) {
  79 + this.receiveDate = receiveDate;
  80 + }
  81 +
  82 + public String getReceiveUser() {
  83 + return receiveUser;
  84 + }
  85 +
  86 + public void setReceiveUser(String receiveUser) {
  87 + this.receiveUser = receiveUser;
  88 + }
26 89 public Date getCreateStartDate() {
27 90 return createStartDate;
28 91 }
... ... @@ -165,6 +228,14 @@
165 228 public void setUpdateUser(String updateUser) {
166 229 this.updateUser = updateUser;
167 230  
  231 + }
  232 +
  233 + public String[] getParentIds() {
  234 + return parentIds;
  235 + }
  236 +
  237 + public void setParentIds(String[] parentIds) {
  238 + this.parentIds = parentIds;
168 239 }
169 240 }
platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml View file @ 036ec0c
... ... @@ -16,11 +16,15 @@
16 16 <result column="update_user_name" property="updateUserName" jdbcType="VARCHAR"/>
17 17 <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
18 18 <result column="hospital_id" property="hospitalId" jdbcType="VARCHAR"/>
  19 + <result column="ser_code" property="serCode" jdbcType="VARCHAR"/>
  20 + <result column="status" property="status" jdbcType="INTEGER"/>
  21 + <result column="receive_date" property="receiveDate" jdbcType="TIMESTAMP"/>
  22 + <result column="receive_user" property="receiveUser" jdbcType="VARCHAR"/>
19 23 </resultMap>
20 24  
21 25  
22 26 <insert id="addPatientService" parameterType="com.lyms.platform.permission.model.PatientService">
23   -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})
  27 +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})
24 28 </insert>
25 29  
26 30  
... ... @@ -63,6 +67,18 @@
63 67 <if test="hospitalId != null and hospitalId != ''">
64 68 hospital_id = #{hospitalId,jdbcType=VARCHAR},
65 69 </if>
  70 + <if test="serCode != null and serCode != ''">
  71 + ser_code = #{serCode,jdbcType=VARCHAR},
  72 + </if>
  73 + <if test="status != null and status >= 0">
  74 + status = #{status,jdbcType=INTEGER},
  75 + </if>
  76 + <if test="receiveDate != null">
  77 + receive_date = #{receiveDate,jdbcType=TIMESTAMP},
  78 + </if>
  79 + <if test="receiveUser != null and receiveUser != ''">
  80 + receive_user = #{receiveUser,jdbcType=VARCHAR},
  81 + </if>
66 82 </set>
67 83 where id = #{id,jdbcType=VARCHAR}
68 84 </update>
... ... @@ -74,7 +90,7 @@
74 90  
75 91  
76 92 <select id="getPatientService" resultMap="PatientServiceResultMap" parameterType="java.lang.String">
77   -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
  93 +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
78 94 from patient_service where id = #{id,jdbcType=VARCHAR}
79 95 </select>
80 96  
... ... @@ -98,6 +114,13 @@
98 114 <if test="parentid != null and parentid != ''">
99 115 and parentid = #{parentid,jdbcType=VARCHAR}
100 116 </if>
  117 + <if test="parentIds!=null">
  118 + and parentid in (
  119 + <foreach item="parentid" collection="parentIds" separator=",">
  120 + #{parentid}
  121 + </foreach>
  122 + )
  123 + </if>
101 124 <if test="pid != null and pid != ''">
102 125 and pid = #{pid,jdbcType=VARCHAR}
103 126 </if>
... ... @@ -143,6 +166,21 @@
143 166 <if test="hospitalId != null and hospitalId != ''">
144 167 and hospital_id = #{hospitalId,jdbcType=VARCHAR}
145 168 </if>
  169 + <if test="serCode != null and serCode != ''">
  170 + and ser_code = #{serCode,jdbcType=VARCHAR}
  171 + </if>
  172 + <if test="status != null and status >= 0">
  173 + and status = #{status,jdbcType=INTEGER}
  174 + </if>
  175 + <if test="receiveDate != null">
  176 + and receive_date = #{receiveDate,jdbcType=TIMESTAMP}
  177 + </if>
  178 + <if test="receiveUser != null and receiveUser != ''">
  179 + and receive_user = #{receiveUser,jdbcType=VARCHAR}
  180 + </if>
  181 + <if test="sql != null and sql != ''">
  182 + ${sql}
  183 + </if>
146 184 </where>
147 185 </sql>
148 186  
... ... @@ -150,7 +188,7 @@
150 188 <select id="queryPatientService" resultMap="PatientServiceResultMap"
151 189 parameterType="com.lyms.platform.permission.model.PatientServiceQuery">
152 190 select
153   - 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
  191 + 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
154 192 from patient_service
155 193 <include refid="PatientServiceCondition"/>
156 194 <include refid="orderAndLimit"/>
platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java View file @ 036ec0c
... ... @@ -14,9 +14,9 @@
14 14 //服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
15 15 public enum SerTypeEnums{
16 16 gwjzzd(1,"高危精准指导"),
17   - tz(2,"体重"),
18   - xt(3, "血糖"),
19   - xy(4, "血压"),
  17 + tz(2,"体重管理"),
  18 + xt(3, "血糖管理"),
  19 + xy(4, "血压管理"),
20 20 zjzx(5, "专家咨询");
21 21 private Integer id;
22 22 private String title;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java View file @ 036ec0c
... ... @@ -29,80 +29,124 @@
29 29  
30 30 /**
31 31 * 初始化接口
  32 + *
32 33 * @return
33 34 */
34 35 @ResponseBody
35 36 @TokenRequired
36 37 @RequestMapping(value = "/patSer/init", method = RequestMethod.GET)
37   - public BaseResponse patientServiceInit(){
  38 + public BaseResponse patientServiceInit() {
38 39 return patientServiceFacade.patientServiceInit();
39 40 }
  41 +
40 42 /**
41 43 * 根据孕妇Id查询在当前医院的服务开通记录
42   - * @param pid 孕妇Id
  44 + *
  45 + * @param pid 孕妇Id
43 46 * @param request
44 47 * @return
45 48 */
46 49 @ResponseBody
47 50 @TokenRequired
48 51 @RequestMapping(value = "/patSer", method = RequestMethod.GET)
49   - public BaseResponse findPatientServiceList(String pid,HttpServletRequest request){
  52 + public BaseResponse findPatientServiceList(String pid, HttpServletRequest request) {
50 53 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
51   - return patientServiceFacade.findPatientServiceList(pid,loginState.getId());
  54 + return patientServiceFacade.findPatientServiceList(pid, loginState.getId());
52 55 }
53 56  
54 57 /**
55 58 * 新增或修改服务开通记录
56   - * @param ps 服务开通记录
  59 + *
  60 + * @param ps 服务开通记录
57 61 * @param request
58 62 * @return
59 63 */
60 64 @ResponseBody
61 65 @TokenRequired
62 66 @RequestMapping(value = "/patSer", method = RequestMethod.POST)
63   - public BaseResponse addOrUpdatePatientService(PatientService ps, HttpServletRequest request){
  67 + public BaseResponse addOrUpdatePatientService(PatientService ps, HttpServletRequest request) {
64 68 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
65   - if(StringUtils.isEmpty(ps.getId())){
66   - return patientServiceFacade.addPatientService(ps,loginState.getId());
67   - }else{
68   - return patientServiceFacade.updatePatientService(ps,loginState.getId());
  69 + if (StringUtils.isEmpty(ps.getId())) {
  70 + return patientServiceFacade.addPatientService(ps, loginState.getId());
  71 + } else {
  72 + return patientServiceFacade.updatePatientService(ps, loginState.getId());
69 73 }
70 74 }
71 75  
72 76 /**
73 77 * 根据Id获取开通记录
  78 + *
74 79 * @param id 开通服务id
75 80 * @return
76 81 */
77 82 @ResponseBody
78 83 @TokenRequired
79 84 @RequestMapping(value = "/patSer/{id}", method = RequestMethod.GET)
80   - public BaseResponse findOnePatientService(@PathVariable String id){
  85 + public BaseResponse findOnePatientService(@PathVariable String id) {
81 86 return patientServiceFacade.findOnePatientService(id);
82 87 }
83 88  
84 89 /**
85 90 * 根据条件查询开通服务记录
86   - * @param serType 服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
87   - * @param serDoct 服务医生
  91 + *
  92 + * @param serType 服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
  93 + * @param serDoct 服务医生
88 94 * @param createStartDate 开通开始时间
89   - * @param createEndDate 开通结束时间
90   - * @param serStatus 开通状态(1-开通、2-退订、3-过期、4-暂停)
  95 + * @param createEndDate 开通结束时间
  96 + * @param serStatus 开通状态(1-开通、2-退订、3-过期、4-暂停)
91 97 * @return
92 98 */
93 99 @ResponseBody
94 100 @TokenRequired
95 101 @RequestMapping(value = "/patSer/list", method = RequestMethod.GET)
96   - public BaseListResponse getPatientService(@RequestParam(value = "serType",required = false) Integer serType,
97   - @RequestParam(value = "serDoct",required = false) String serDoct,
98   - @RequestParam(value = "createStartDate",required = false) Date createStartDate,
99   - @RequestParam(value = "createEndDate",required = false) Date createEndDate,
100   - @RequestParam(value = "serStatus",required = false) Integer serStatus,
  102 + public BaseListResponse getPatientService(@RequestParam(value = "serType", required = false) Integer serType,
  103 + @RequestParam(value = "serDoct", required = false) String serDoct,
  104 + @RequestParam(value = "createStartDate", required = false) Date createStartDate,
  105 + @RequestParam(value = "createEndDate", required = false) Date createEndDate,
  106 + @RequestParam(value = "serStatus", required = false) Integer serStatus,
101 107 BasePageQueryRequest pageInfo,
102 108 HttpServletRequest request
103   - ){
  109 + ) {
104 110 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
105   - return patientServiceFacade.getPatientService(serType,serDoct,createStartDate,createEndDate,serStatus,pageInfo,loginState.getId());
  111 + return patientServiceFacade.getPatientService(serType, serDoct, createStartDate, createEndDate, serStatus, pageInfo, loginState.getId());
  112 + }
  113 +
  114 + /**
  115 + * 根据条件查询验证码列表
  116 + *
  117 + * @param serType 服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
  118 + * @param queryNo 查询关键字（姓名/证件号/联系方式/就诊卡号）
  119 + * @param cDueWeekStart 开始当前孕周
  120 + * @param cDueWeekEnd 结束当前孕周
  121 + * @return
  122 + */
  123 + @ResponseBody
  124 + @TokenRequired
  125 + @RequestMapping(value = "/patSer/codes", method = RequestMethod.GET)
  126 + public BaseListResponse ptientServiceCodeList(@RequestParam(value = "serType", required = false) Integer serType,
  127 + @RequestParam(value = "queryNo", required = false) String queryNo,
  128 + @RequestParam(value = "cDueWeekStart", required = false) Integer cDueWeekStart,
  129 + @RequestParam(value = "cDueWeekEnd", required = false) Integer cDueWeekEnd,
  130 + BasePageQueryRequest pageInfo,
  131 + HttpServletRequest request
  132 + ) {
  133 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  134 + return patientServiceFacade.ptientServiceCodeList(serType, queryNo, cDueWeekStart, cDueWeekEnd, pageInfo, loginState.getId());
  135 + }
  136 +
  137 + /**
  138 + * 确认领取（修改状态为领取）
  139 + *
  140 + * @param psId 服务开通记录id
  141 + * @param request
  142 + * @return
  143 + */
  144 + @ResponseBody
  145 + @TokenRequired
  146 + @RequestMapping(value = "/patSer/receive", method = RequestMethod.POST)
  147 + public BaseResponse receivePatientService(String psId, HttpServletRequest request) {
  148 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  149 + return patientServiceFacade.receivePatientService(psId, loginState.getId());
106 150 }
107 151  
108 152 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java View file @ 036ec0c
1 1 package com.lyms.platform.operate.web.facade;
2 2  
  3 +import com.lyms.platform.biz.service.PatientsService;
3 4 import com.lyms.platform.common.constants.ErrorCodeConstants;
4 5 import com.lyms.platform.common.enums.PatientSerEnums;
5 6 import com.lyms.platform.common.result.BaseListResponse;
6 7 import com.lyms.platform.common.result.BaseObjectResponse;
7 8 import com.lyms.platform.common.result.BaseResponse;
8 9 import com.lyms.platform.common.utils.DateUtil;
  10 +import com.lyms.platform.common.utils.StringUtils;
9 11 import com.lyms.platform.operate.web.request.BasePageQueryRequest;
10 12 import com.lyms.platform.operate.web.result.PatientSerResult;
11 13 import com.lyms.platform.permission.model.PatientService;
... ... @@ -14,6 +16,8 @@
14 16 import com.lyms.platform.permission.service.OrganizationService;
15 17 import com.lyms.platform.permission.service.PatientServiceService;
16 18 import com.lyms.platform.permission.service.UsersService;
  19 +import com.lyms.platform.pojo.Patients;
  20 +import com.lyms.platform.query.PatientsQuery;
17 21 import org.apache.commons.collections.CollectionUtils;
18 22 import org.springframework.beans.factory.annotation.Autowired;
19 23 import org.springframework.stereotype.Component;
... ... @@ -36,6 +40,8 @@
36 40 private OrganizationService organizationService;
37 41 @Autowired
38 42 private UsersService usersService;
  43 + @Autowired
  44 + private PatientsService patientsService;
39 45  
40 46 public BaseResponse patientServiceInit() {
41 47 Map map = new HashMap();
... ... @@ -120,7 +126,7 @@
120 126 if (users != null) {
121 127 serDoct = users.getName();
122 128 }
123   - baseResponse.setErrormsg("该孕妇已开通"+serDoct+"医生的" + serType + "服务，请勿重复开通");
  129 + baseResponse.setErrormsg("该孕妇已开通" + serDoct + "医生的" + serType + "服务，请勿重复开通");
124 130 return baseResponse;
125 131 }
126 132  
... ... @@ -128,6 +134,12 @@
128 134 ps.setHospitalId(hospitalId);
129 135 ps.setCreateDate(new Date());
130 136 ps.setCreateUser(String.valueOf(id));
  137 + //默认已经领取
  138 + ps.setStatus(2);
  139 + //领取时间
  140 + ps.setReceiveDate(new Date());
  141 + //领取操作医生id
  142 + ps.setReceiveUser(String.valueOf(id));
131 143 patientServiceService.addPatientService(ps);
132 144  
133 145 BaseResponse baseResponse = new BaseResponse();
... ... @@ -168,6 +180,18 @@
168 180 }
169 181 PatientSerResult result = new PatientSerResult();
170 182 result.setId(ps.getId());
  183 + Patients patients = patientsService.findOnePatientById(ps.getParentid());
  184 + if (null != patients) {
  185 + String weekDesc = DateUtil.getWeekDesc(patients.getLastMenses(),new Date());
  186 + result.setcDueWeek(weekDesc);
  187 + if (null != patients.getDueStatus() && 1 == patients.getDueStatus())
  188 + result.setcDueWeek("终止妊娠");
  189 + else if (patients.getType() == 3) {
  190 + result.setcDueWeek("已分娩");
  191 + }
  192 + result.setAge(DateUtil.getAge(patients.getBirth()) + "岁");
  193 + result.setName(patients.getUsername());
  194 + }
171 195 result.setParentid(ps.getParentid());
172 196 result.setCreateDate(DateUtil.getyyyy_MM_dd(ps.getCreateDate()));
173 197 result.setPid(ps.getPid());
... ... @@ -178,7 +202,9 @@
178 202 String serStatus = PatientSerEnums.SerStatusEnums.getTitle(ps.getSerStatus());
179 203 result.setSerStatusStr(serStatus);
180 204 result.setSerDoct(ps.getSerDoct());
181   -
  205 + result.setStatus(ps.getStatus());
  206 + result.setStatusStr(ps.getStatus()==1?"待领取":"已领取");
  207 + result.setSerCode(ps.getSerCode());
182 208 Users users = usersService.getUsers(Integer.parseInt(ps.getSerDoct()));
183 209 if (users != null) {
184 210 result.setSerDoctStr(users.getName());
... ... @@ -230,5 +256,100 @@
230 256 baseResponse.setErrormsg("成功");
231 257 return baseResponse;
232 258 }
  259 +
  260 + public BaseListResponse ptientServiceCodeList(Integer serType, String queryNo, Integer cDueWeekStart, Integer cDueWeekEnd, BasePageQueryRequest pageInfo, Integer id) {
  261 +
  262 + //根据用户id获取医院ID
  263 + String hospitalId = autoMatchFacade.getHospitalId(id);
  264 + PatientServiceQuery patientQuery = new PatientServiceQuery();
  265 + patientQuery.setHospitalId(hospitalId);
  266 + patientQuery.setSerType(serType);
  267 + patientQuery.setSort("create_date");
  268 + patientQuery.setNeed("y");
  269 + patientQuery.setOffset((pageInfo.getPage() - 1) * pageInfo.getLimit());
  270 + patientQuery.setLimit(pageInfo.getLimit());
  271 + patientQuery.setPage(pageInfo.getPage());
  272 + patientQuery.setSql("and ser_code is not null");
  273 +
  274 + PatientsQuery patientsQuery = new PatientsQuery();
  275 + List<Patients> patientses = null;
  276 + //根据查询号、当前孕周进行查询
  277 + if (StringUtils.isNotEmpty(queryNo)||null != cDueWeekStart||null != cDueWeekEnd) {
  278 + if (null != cDueWeekStart) {
  279 + patientsQuery.setLastMensesEnd(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cDueWeekStart * 7)));
  280 + }
  281 + if (null != cDueWeekEnd) {
  282 + patientsQuery.setLastMensesStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cDueWeekEnd * 7) - 6));
  283 + }
  284 + if(StringUtils.isNotEmpty(queryNo)){
  285 + patientsQuery.setQueryNo(queryNo);
  286 + }
  287 + patientsQuery.setHospitalId(hospitalId);
  288 + patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified");
  289 + }
  290 +
  291 + if (CollectionUtils.isNotEmpty(patientses)) {
  292 + List<String> parentIds = new LinkedList<>();
  293 + for (Patients pa : patientses) {
  294 + parentIds.add(pa.getId());
  295 + }
  296 + patientQuery.setParentIds((String[]) parentIds.toArray(new String[parentIds.size()]));
  297 + } else if (StringUtils.isNotEmpty(queryNo)||StringUtils.isNotEmpty(queryNo)||null != cDueWeekStart||null != cDueWeekEnd) {
  298 + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(patientQuery.getPageInfo());
  299 + }
  300 +
  301 + List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery);
  302 +
  303 + List<PatientSerResult> patientSerResults = new ArrayList<>();
  304 + for (PatientService ps : patientServices) {
  305 + PatientSerResult patientSerResult = convertToResult(ps);
  306 + patientSerResults.add(patientSerResult);
  307 + }
  308 +
  309 + BaseListResponse baseResponse = new BaseListResponse();
  310 + baseResponse.setData(patientSerResults);
  311 + baseResponse.setPageInfo(patientQuery.getPageInfo());
  312 + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  313 + baseResponse.setErrormsg("成功");
  314 + return baseResponse;
  315 + }
  316 +
  317 + /**
  318 + * 修改状态为领取
  319 + *
  320 + * @param psId 服务记录Id
  321 + * @param id 用户id
  322 + * @return
  323 + */
  324 + public BaseResponse receivePatientService(String psId, Integer id) {
  325 +
  326 + PatientService ps = patientServiceService.getPatientService(psId);
  327 + if(ps==null){
  328 + BaseResponse baseResponse = new BaseResponse();
  329 + baseResponse.setErrorcode(ErrorCodeConstants.NO_DATA);
  330 + baseResponse.setErrormsg("没有找到对应的数据");
  331 + return baseResponse;
  332 + }
  333 + //已经领取
  334 + if(ps.getStatus()==2){
  335 + BaseResponse baseResponse = new BaseResponse();
  336 + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  337 + baseResponse.setErrormsg("已经领取，请勿重复领取");
  338 + return baseResponse;
  339 + }
  340 + //设置为领取状态
  341 + ps.setStatus(2);
  342 + //根据用户id获取医院ID
  343 + ps.setReceiveDate(new Date());
  344 + ps.setReceiveUser(String.valueOf(id));
  345 + patientServiceService.updatePatientService(ps);
  346 +
  347 + BaseResponse baseResponse = new BaseResponse();
  348 + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  349 + baseResponse.setErrormsg("成功");
  350 + return baseResponse;
  351 + }
  352 +
  353 +
233 354 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java View file @ 036ec0c
... ... @@ -16,6 +16,19 @@
16 16 */
17 17 private String pid;
18 18 /**
  19 + * 孕妇姓名
  20 + */
  21 +
  22 + private String name;
  23 + /**
  24 + * 孕妇年龄
  25 + */
  26 + private String age;
  27 + /**
  28 + * 当前孕周
  29 + */
  30 + private String cDueWeek;
  31 + /**
19 32 * 服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
20 33 */
21 34 private Integer serType;
... ... @@ -37,6 +50,63 @@
37 50 */
38 51 private Integer serStatus;
39 52 private String serStatusStr;
  53 + /**
  54 + * 验证码
  55 + */
  56 + private String serCode;
  57 + /**
  58 + * 领取状态 1-待领取、2-已领取
  59 + */
  60 + private Integer status;
  61 + private String statusStr;
  62 +
  63 + public String getName() {
  64 + return name;
  65 + }
  66 +
  67 + public void setName(String name) {
  68 + this.name = name;
  69 + }
  70 +
  71 + public String getAge() {
  72 + return age;
  73 + }
  74 +
  75 + public void setAge(String age) {
  76 + this.age = age;
  77 + }
  78 +
  79 + public String getcDueWeek() {
  80 + return cDueWeek;
  81 + }
  82 +
  83 + public void setcDueWeek(String cDueWeek) {
  84 + this.cDueWeek = cDueWeek;
  85 + }
  86 +
  87 + public String getSerCode() {
  88 + return serCode;
  89 + }
  90 +
  91 + public void setSerCode(String serCode) {
  92 + this.serCode = serCode;
  93 + }
  94 +
  95 + public Integer getStatus() {
  96 + return status;
  97 + }
  98 +
  99 + public void setStatus(Integer status) {
  100 + this.status = status;
  101 + }
  102 +
  103 + public String getStatusStr() {
  104 + return statusStr;
  105 + }
  106 +
  107 + public void setStatusStr(String statusStr) {
  108 + this.statusStr = statusStr;
  109 + }
40 110  
41 111 public String getId() {
42 112 return id;