From bc9d4b814952557f4aa87ede8fa2f90221a279cc Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 25 Jun 2018 10:12:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/pojo/SieveApplyOrderModel.java | 12 ++++----- .../java/com/lyms/platform/pojo/SieveModel.java | 22 +++++++++++++++ .../java/com/lyms/platform/query/SieveQuery.java | 31 ++++++++++++++++++++++ .../operate/web/controller/SieveController.java | 18 ++++++++++++- .../operate/web/facade/ApplyOrderFacade.java | 6 +++-- .../platform/operate/web/facade/SieveFacade.java | 21 +++++++++++---- .../operate/web/request/CqSieveQueryRequest.java | 10 +++++++ .../web/request/SieveApplyOrderAddRequest.java | 14 +++++----- 8 files changed, 113 insertions(+), 21 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 a3bf351..b5443d9 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 @@ -70,8 +70,8 @@ public class SieveApplyOrderModel extends BaseModel { //既往史 private String pastHistory; - //申请医院 - private String applyHospitalId; + //产筛医院 + private String sieveHospitalId; //送检医生 private String sendDoctor; @@ -204,12 +204,12 @@ public class SieveApplyOrderModel extends BaseModel { this.pastHistory = pastHistory; } - public String getApplyHospitalId() { - return applyHospitalId; + public String getSieveHospitalId() { + return sieveHospitalId; } - public void setApplyHospitalId(String applyHospitalId) { - this.applyHospitalId = applyHospitalId; + public void setSieveHospitalId(String sieveHospitalId) { + this.sieveHospitalId = sieveHospitalId; } public Date getApplyTime() { 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 9f31ab2..d17a130 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 @@ -75,6 +75,28 @@ public class SieveModel extends BaseModel { //接收状态 1未接收 2接收 private Integer reviceStatus; + //产筛医院 + private String sieveHospitalId; + + //申请医院 + private String applyHospitalId; + + public String getSieveHospitalId() { + return sieveHospitalId; + } + + public void setSieveHospitalId(String sieveHospitalId) { + this.sieveHospitalId = sieveHospitalId; + } + + public String getApplyHospitalId() { + return applyHospitalId; + } + + public void setApplyHospitalId(String applyHospitalId) { + this.applyHospitalId = applyHospitalId; + } + public Integer getReviceStatus() { return reviceStatus; } 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 c0bba6d..435d411 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 @@ -76,6 +76,28 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { private Date applyTimeStart; private Date applyTimeEnd; + //产筛医院 + private String sieveHospitalId; + + //申请医院 + private String applyHospitalId; + + public String getSieveHospitalId() { + return sieveHospitalId; + } + + public void setSieveHospitalId(String sieveHospitalId) { + this.sieveHospitalId = sieveHospitalId; + } + + public String getApplyHospitalId() { + return applyHospitalId; + } + + public void setApplyHospitalId(String applyHospitalId) { + this.applyHospitalId = applyHospitalId; + } + public Date getApplyTimeStart() { return applyTimeStart; } @@ -225,6 +247,15 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { if (null != hospitalId) { condition = condition.and("hospitalId", hospitalId, MongoOper.IS); } + + if (null != sieveHospitalId) { + condition = condition.and("sieveHospitalId", sieveHospitalId, MongoOper.IS); + } + + if (null != applyHospitalId) { + condition = condition.and("applyHospitalId", applyHospitalId, 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/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java index cf83a52..6cc23b4 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 @@ -226,11 +226,27 @@ public class SieveController extends BaseController { @TokenRequired public BaseResponse queryChanQianSieve(@Valid CqSieveQueryRequest cqSieveQueryRequest,HttpServletRequest request){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return sieveFacade.queryList(cqSieveQueryRequest,loginState.getId(),"true"); + return sieveFacade.queryList(cqSieveQueryRequest,loginState.getId(),"true",false); } /** + * 实验室产筛管理 + * @param cqSieveQueryRequest + * @param request + * @return + */ + @ResponseBody + @RequestMapping(value = "/sieveLabManage",method = RequestMethod.GET) + @TokenRequired + public BaseResponse sieveLabManage(@Valid CqSieveQueryRequest cqSieveQueryRequest,HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return sieveFacade.queryList(cqSieveQueryRequest,loginState.getId(),"true",true); + } + + + + /** * 导出产筛列表 * @param cqSieveQueryRequest * @param request 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 4aed219..724963e 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 @@ -424,6 +424,8 @@ public class ApplyOrderFacade { SieveModel sieveModel = patientsService.convertToModel(patients); sieveModel.setReviceStatus(1); sieveModel.setFrom("2"); + sieveModel.setSieveHospitalId(sieveApplyOrderAddRequest.getSieveHospitalId()); + sieveModel.setApplyHospitalId(hospitalId); sieveModel.setHospitalId(orderModel.getHospitalId()); SieveService.handOrder(sieveModel); sieveService.addChanQianSieve(sieveModel); @@ -454,9 +456,9 @@ public class ApplyOrderFacade { if (CollectionUtils.isNotEmpty(sieveModels)) { SieveModel sieveModel = sieveModels.get(0); - sieveModel.setReviceStatus(1); - + sieveModel.setSieveHospitalId(sieveApplyOrderAddRequest.getSieveHospitalId()); + sieveModel.setApplyHospitalId(hospitalId); sieveModel.setApplyTime(sieveApplyOrderModel.getApplyTime()); sieveModel.setStatus(2); if (StringUtils.isNotEmpty(sieveApplyOrderModel.getCheckDate())) { 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 918525c..576962e 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 @@ -339,7 +339,7 @@ public class SieveFacade { * @param cqSieveQueryRequest * @return */ - public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage) { + public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage,boolean isSieveLagManage) { SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setQueryNo(cqSieveQueryRequest.getQueryNo()); @@ -397,7 +397,18 @@ public class SieveFacade { sieveQuery.setLimit(cqSieveQueryRequest.getLimit()); sieveQuery.setNeed(needPage); String hospitalId = autoMatchFacade.getHospitalId(userId); - sieveQuery.setHospitalId(hospitalId); + + if(isSieveLagManage) + { + sieveQuery.setApplyHospitalId(hospitalId); + sieveQuery.setSieveHospitalId(hospitalId); + } + else + { + sieveQuery.setHospitalId(hospitalId); + } + + //查询产筛list List list = sieveService.queryList1(sieveQuery, "order"); List data = new ArrayList<>(); @@ -424,7 +435,7 @@ public class SieveFacade { public void exportCqsieves(CqSieveQueryRequest cqSieveQueryRequest, Integer id, HttpServletResponse response) { try { - BaseListResponse listResponse = (BaseListResponse) queryList(cqSieveQueryRequest, id, null); + BaseListResponse listResponse = (BaseListResponse) queryList(cqSieveQueryRequest, id, null,false); List list = listResponse.getData(); List> datas = new ArrayList<>(); @@ -713,7 +724,7 @@ public class SieveFacade { result.put("bcCheckDate",DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate())); result.put("historyBirth",sieveApply.getHistoryBirth()); result.put("pastHistory",sieveApply.getPastHistory()); - result.put("applyHospitalId",sieveApply.getApplyHospitalId()); + result.put("sieveHospitalId",sieveApply.getSieveHospitalId()); result.put("sendDoctor",sieveApply.getSendDoctor()); result.put("sendTime",DateUtil.getyyyy_MM_dd(sieveApply.getSendTime())); result.put("age",DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated())); @@ -734,7 +745,7 @@ public class SieveFacade { String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(),usersService); viewInfo.put("sendDoctorName",sendDoctorName); - String applyHospitalName = CommonsHelper.getHospitalName(sieveApply.getApplyHospitalId(),organizationService); + String applyHospitalName = CommonsHelper.getHospitalName(sieveApply.getSieveHospitalId(),organizationService); viewInfo.put("applyHospitalName", applyHospitalName); String currentHospitalName = CommonsHelper.getHospitalName(sieveApply.getHospitalId(),organizationService); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java index 319c15d..5965e9b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java @@ -57,6 +57,16 @@ public class CqSieveQueryRequest extends BasePageQueryRequest{ //申请时间 private String applyTime; + //申请医院 + private String applyHospitalId; + + public String getApplyHospitalId() { + return applyHospitalId; + } + + public void setApplyHospitalId(String applyHospitalId) { + this.applyHospitalId = applyHospitalId; + } public String getApplyTime() { return applyTime; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java index 7ed4f1b..dbb14c7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java @@ -66,8 +66,8 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert