From 59a11ceaafc7a3723af28f90672fc6d1aebf91e3 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 3 Aug 2016 15:27:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=90=8E?= =?UTF-8?q?=20=E5=8F=98=E6=88=90=E4=BA=A7=E5=A6=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/pojo/SieveApplyOrderModel.java | 9 ++++++++ .../java/com/lyms/platform/pojo/SieveModel.java | 10 +++++++++ .../lyms/platform/query/SieveApplyOrderQuery.java | 12 +++++++++++ .../java/com/lyms/platform/query/SieveQuery.java | 12 +++++++++++ .../web/controller/ApplyOrderController.java | 5 +++-- .../operate/web/controller/SieveController.java | 25 +++++++++++++++------- .../operate/web/facade/ApplyOrderFacade.java | 5 ++++- .../operate/web/facade/AutoMatchFacade.java | 8 +++++++ .../platform/operate/web/facade/SieveFacade.java | 12 ++++++++--- 9 files changed, 84 insertions(+), 14 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java index 2502305..4aeb264 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java @@ -24,10 +24,19 @@ public class SieveApplyOrderModel { private String applyDoctor; //标识是否同步过数据 0 表示未同步 1表示已同步 private Integer status; + private String hospitalId; private Integer yn; private Date modified; + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + public Date getModified() { return modified; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java index 5b79ca6..4a16b24 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java @@ -16,6 +16,8 @@ public class SieveModel extends BaseModel { private String id; //患者id private String parentId; + + private String hospitalId; //姓名 private String name; //末次月经 @@ -48,6 +50,14 @@ public class SieveModel extends BaseModel { private Date modified; private Integer yn; + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + public Integer getYn() { return yn; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.java index 472d7b3..386bd4f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.java @@ -18,6 +18,15 @@ public class SieveApplyOrderQuery extends BaseQuery implements IConvertToNativeQ private Integer yn; private String id; + private String hospitalId; + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } public String getId() { return id; @@ -49,6 +58,9 @@ public class SieveApplyOrderQuery extends BaseQuery implements IConvertToNativeQ if(null!=parentId){ condition= condition.and("parentId",parentId, MongoOper.IS); } + if(null!=hospitalId){ + condition= condition.and("hospitalId",hospitalId, MongoOper.IS); + } if(null!=yn){ condition= condition.and("yn",yn, MongoOper.IS); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java index 9a744a0..f296d46 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java @@ -17,6 +17,7 @@ import java.util.Date; public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { private String id; + private String hospitalId; //患者id private String parentId; //姓名 @@ -49,6 +50,14 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { //是否通知 private Integer isNotify; + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + public Integer getIsNotify() { return isNotify; } @@ -95,6 +104,9 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { if (null != id) { condition = condition.and("id", id, MongoOper.IS); } + if (null != hospitalId) { + condition = condition.and("hospitalId", hospitalId, MongoOper.IS); + } if (null != parentId) { condition = condition.and("parentId", parentId, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java index 0fe2d57..fa59c00 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java @@ -65,8 +65,9 @@ public class ApplyOrderController extends BaseController { @ResponseBody @TokenRequired //增加产筛申请单 - public BaseResponse addSieveApplyOrder(@Valid @RequestBody SieveApplyOrderAddRequest applyOrderAddRequest) { - return applyOrderFacade.addOneSieveApplyOrder(applyOrderAddRequest); + public BaseResponse addSieveApplyOrder(@Valid @RequestBody SieveApplyOrderAddRequest applyOrderAddRequest,HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return applyOrderFacade.addOneSieveApplyOrder(applyOrderAddRequest,loginState.getId()); } @RequestMapping(method = RequestMethod.GET,value = "/sieveapply") @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java index 1f2503f..0a3ec4e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java @@ -1,5 +1,7 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.platform.common.annotation.TokenRequired; +import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.ChanQResultEnums; import com.lyms.platform.common.enums.FuZhongEnums; @@ -15,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.util.ArrayList; import java.util.HashMap; @@ -39,8 +42,10 @@ public class SieveController { */ @ResponseBody @RequestMapping(value = "/sieve",method = RequestMethod.POST) - public BaseResponse addOneSieve(@RequestBody @Valid SieveAddRequest sieveAddRequest) { - return sieveFacade.addOneSieve(sieveAddRequest); + @TokenRequired + public BaseResponse addOneSieve(@RequestBody @Valid SieveAddRequest sieveAddRequest,HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return sieveFacade.addOneSieve(sieveAddRequest,loginState.getId()); } @@ -52,6 +57,7 @@ public class SieveController { */ @ResponseBody @RequestMapping(value = "/sieves",method = RequestMethod.GET) + @TokenRequired public BaseResponse getOneSieve(@RequestParam("parentId")String parentId) { return sieveFacade.getOneSieve(parentId); } @@ -63,8 +69,9 @@ public class SieveController { */ @ResponseBody @RequestMapping(value = "/cqsieve",method = RequestMethod.POST) - public BaseResponse addOneChanQianDiaSieve(@RequestBody @Valid ChanQianDiaAddRequest chanQianDiaAddRequest) { - return sieveFacade.addOneChanQianDiaSieve(chanQianDiaAddRequest); + public BaseResponse addOneChanQianDiaSieve(@RequestBody @Valid ChanQianDiaAddRequest chanQianDiaAddRequest,HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return sieveFacade.addOneChanQianDiaSieve(chanQianDiaAddRequest/*,loginState.getId()*/); } /** @@ -74,8 +81,9 @@ public class SieveController { */ @ResponseBody @RequestMapping(value = "/cqsieve",method = RequestMethod.GET) - public BaseResponse getOneChanQianDiaSieve(@RequestParam("id")String id) { - return sieveFacade.getOneChanQianDiaSieve(id); + public BaseResponse getOneChanQianDiaSieve(@RequestParam("id")String id,HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return sieveFacade.getOneChanQianDiaSieve(id/*,loginState.getId()*/); } @@ -153,7 +161,8 @@ public class SieveController { */ @ResponseBody @RequestMapping(value = "/cqsieves",method = RequestMethod.GET) - public BaseResponse queryChanQianSieve(@Valid CqSieveQueryRequest cqSieveQueryRequest){ - return sieveFacade.queryList(cqSieveQueryRequest); + public BaseResponse queryChanQianSieve(@Valid CqSieveQueryRequest cqSieveQueryRequest,HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return sieveFacade.queryList(cqSieveQueryRequest,loginState.getId()); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 3d91d40..edb910e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -108,9 +108,11 @@ public class ApplyOrderFacade { * @param sieveApplyOrderAddRequest * @return */ - public BaseResponse addOneSieveApplyOrder(SieveApplyOrderAddRequest sieveApplyOrderAddRequest) { + public BaseResponse addOneSieveApplyOrder(SieveApplyOrderAddRequest sieveApplyOrderAddRequest,Integer userId) { SieveApplyOrderModel sieveApplyOrderModel = sieveApplyOrderAddRequest.convertToDataModel(); sieveApplyOrderModel.setCreated(new Date()); + String hospitalId= autoMatchFacade.getHospitalId(userId); + sieveApplyOrderModel.setHospitalId(hospitalId); //增加产筛 applyOrderService.addOneSieveApplyOrder(sieveApplyOrderModel); @@ -127,6 +129,7 @@ public class ApplyOrderFacade { Patients patients = patientsService.findOnePatientById(orderModel.getParentId()); if (null != patients) { SieveModel sieveModel = patientsService.convertToModel(patients); + sieveModel.setHospitalId(orderModel.getHospitalId()); sieveService.addChanQianSieve(sieveModel); } idList.add(orderModel.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java index 94bd071..046df20 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java @@ -86,4 +86,12 @@ public class AutoMatchFacade { } return data; } + public String getHospitalId(Integer userId){ + List list = matchOrgId(userId); + if(null==list + ){ + return null; + } + return list.get(0)+""; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 4395e5e..86b7bc9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -37,6 +37,9 @@ public class SieveFacade { private SieveService sieveService; @Autowired private PatientsService patientsService; + @Autowired + private AutoMatchFacade autoMatchFacade; + /** * 增加一条产筛结果记录 @@ -44,15 +47,18 @@ public class SieveFacade { * @param sieveAddRequest * @return */ - public BaseResponse addOneSieve(SieveAddRequest sieveAddRequest) { + public BaseResponse addOneSieve(SieveAddRequest sieveAddRequest,Integer userId) { sieveService.addSieve(sieveAddRequest.convertToDataModel()); SieveQuery sieveQuery=new SieveQuery(); sieveQuery.setParentId(sieveAddRequest.getParentId()); + String hospitalId = autoMatchFacade.getHospitalId(userId); + sieveQuery.setHospitalId(hospitalId); List list = sieveService.queryList(sieveQuery); SieveModel sieveModel=new SieveModel(); sieveModel.setStatus(3); sieveModel.setId(list.get(0).getId()); + sieveModel.setHospitalId(hospitalId); sieveService.updateOneChanQianDiaSieve(sieveModel); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -111,7 +117,7 @@ public class SieveFacade { * @param cqSieveQueryRequest * @return */ - public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest) { + public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest,Integer userId) { SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setYn(YnEnums.YES.getId()); sieveQuery.setPhone(cqSieveQueryRequest.getPhone()); @@ -127,7 +133,7 @@ public class SieveFacade { sieveQuery.setPage(cqSieveQueryRequest.getPage()); sieveQuery.setLimit(cqSieveQueryRequest.getLimit()); sieveQuery.setNeed("1"); - + sieveQuery.setHospitalId(autoMatchFacade.getHospitalId(userId)); //查询产筛list List list = sieveService.queryList(sieveQuery); List data = new ArrayList<>(); -- 1.8.3.1