diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java index f52747e..b544b8a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java @@ -34,6 +34,9 @@ public class ReferralApplyOrderModel { private Integer score; //转入医院 private String transferredHospital; + //转出医院id + private String outHospitalId; + //转入科室 private String transferredDepartment; //病情描述 @@ -53,6 +56,13 @@ public class ReferralApplyOrderModel { //申请单状态 0 已接收 1 已转出 2 建议转诊 private Integer status; + public String getOutHospitalId() { + return outHospitalId; + } + + public void setOutHospitalId(String outHospitalId) { + this.outHospitalId = outHospitalId; + } public Integer getAge() { return age; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java index 4bfd939..b2f6666 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java @@ -34,7 +34,25 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati private String rLevel; private Integer score; private String riskFactor; + //转入医院 + private String transferredHospital; + private String outHospitalId; + public String getOutHospitalId() { + return outHospitalId; + } + + public void setOutHospitalId(String outHospitalId) { + this.outHospitalId = outHospitalId; + } + + public String getTransferredHospital() { + return transferredHospital; + } + + public void setTransferredHospital(String transferredHospital) { + this.transferredHospital = transferredHospital; + } @Override public MongoQuery convertToQuery() { @@ -51,6 +69,12 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati if(null!=age){ condition=condition.and("age",age, MongoOper.IS); } + if(null!=transferredHospital){ + condition=condition.and("transferredHospital",transferredHospital, MongoOper.IS); + } + if(null!=outHospitalId){ + condition=condition.and("outHospitalId",outHospitalId, MongoOper.IS); + } if(null!=dueWeek){ condition=condition.and("dueWeek",dueWeek, 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 5401214..0ff2ee4 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 @@ -1,6 +1,8 @@ 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.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; @@ -13,6 +15,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; /** @@ -42,8 +45,10 @@ public class ApplyOrderController extends BaseController { //增加转诊申请单 @RequestMapping(method = RequestMethod.POST,value = "/referralapply") @ResponseBody - public BaseResponse addReferralApplyOrder(@Valid @RequestBody ReferralApplyOrderAddRequest applyOrderAddRequest) { - return applyOrderFacade.addOneReferralApplyOrder(applyOrderAddRequest); + @TokenRequired + public BaseResponse addReferralApplyOrder(@Valid @RequestBody ReferralApplyOrderAddRequest applyOrderAddRequest,HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return applyOrderFacade.addOneReferralApplyOrder(applyOrderAddRequest,loginState.getId()); } @RequestMapping(method = RequestMethod.POST,value = "/sieveapply") 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 33ce0a5..8261fb1 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 @@ -10,6 +10,8 @@ import com.lyms.platform.operate.web.request.ApplyOrderQueryRequest; import com.lyms.platform.operate.web.request.ReferralApplyOrderAddRequest; import com.lyms.platform.operate.web.request.SieveApplyOrderAddRequest; import com.lyms.platform.operate.web.result.ApplyOrderOutResult; +import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.Patients; import com.lyms.platform.pojo.ReferralApplyOrderModel; import com.lyms.platform.pojo.SieveApplyOrderModel; @@ -33,6 +35,8 @@ public class ApplyOrderFacade { private ApplyOrderService applyOrderService; @Autowired private PatientsService patientsService; + @Autowired + private AutoMatchFacade autoMatchFacade; /** * 增加转诊申请 @@ -40,23 +44,28 @@ public class ApplyOrderFacade { * @param referralApplyOrderAddRequest * @return */ - public BaseResponse addOneReferralApplyOrder(ReferralApplyOrderAddRequest referralApplyOrderAddRequest) { + public BaseResponse addOneReferralApplyOrder(ReferralApplyOrderAddRequest referralApplyOrderAddRequest,Integer userId) { ReferralApplyOrderModel referralApplyOrderModel = referralApplyOrderAddRequest.convertToDataModel(); referralApplyOrderModel.setCreated(new Date()); referralApplyOrderModel.setStatus(0); PatientsQuery patientsQuery=new PatientsQuery(); patientsQuery.setId(referralApplyOrderModel.getParentId()); //查询产妇信息 - List patientses= patientsService.queryPatient(patientsQuery); + List patientses = patientsService.queryPatient(patientsQuery); Patients patients=null; if(CollectionUtils.isNotEmpty(patientses)){ patients= patientses.get(0); } - referralApplyOrderModel.setCardNo(patients.getCardNo()); - referralApplyOrderModel.setAge(patients.getAge()); - referralApplyOrderModel.setDueDate(patients.getDueDate()); - referralApplyOrderModel.setName(patients.getUsername()); + if(null!=patients){ + referralApplyOrderModel.setCardNo(patients.getCardNo()); + referralApplyOrderModel.setAge(patients.getAge()); + referralApplyOrderModel.setDueDate(patients.getDueDate()); + referralApplyOrderModel.setName(patients.getUsername()); + } + + List areaId = autoMatchFacade.matchOrgId(userId); + referralApplyOrderModel.setOutHospitalId(areaId.get(0)+""); applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -106,7 +115,7 @@ public class ApplyOrderFacade { * @param applyOrderQueryRequest * @return */ - public BaseListResponse queryApplyOrder(ApplyOrderQueryRequest applyOrderQueryRequest){ + public BaseListResponse queryApplyOrder(ApplyOrderQueryRequest applyOrderQueryRequest,Integer userId){ ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery(); referralApplyOrderQuery.setName(applyOrderQueryRequest.getName()); referralApplyOrderQuery.setAge(applyOrderQueryRequest.getAge()); @@ -117,7 +126,14 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setCardNo(applyOrderQueryRequest.getCardNo()); referralApplyOrderQuery.setPage(applyOrderQueryRequest.getPage()); referralApplyOrderQuery.setLimit(applyOrderQueryRequest.getLimit()); - + //1 转入 0转出 + if("1".equals(applyOrderQueryRequest.getType())){ + List data = autoMatchFacade.matchOrgId(userId); + referralApplyOrderQuery.setTransferredHospital(data.get(0)+""); + }else if("0".equals(applyOrderQueryRequest.getType())){ + List data = autoMatchFacade.matchOrgId(userId); + referralApplyOrderQuery.setOutHospitalId(data.get(0)+""); + } List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); List data = new ArrayList(); @@ -130,4 +146,5 @@ public class ApplyOrderFacade { } return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java index e1ea7d5..88ecc93 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java @@ -33,6 +33,18 @@ public class ApplyOrderQueryRequest extends BasePageQueryRequest { private String rLevel; private Integer score; private String riskFactor; + /** + * 1 转入 0 转出 + */ + private String type; + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } public String getAge() { return age;