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 e010a3d..2f39ecd 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 @@ -48,7 +48,16 @@ public class ApplyOrderController extends BaseController { @TokenRequired public BaseResponse addReferralApplyOrder(@Valid @RequestBody ReferralApplyOrderAddRequest applyOrderAddRequest,HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return applyOrderFacade.addOneReferralApplyOrder(applyOrderAddRequest, loginState.getId()); + return applyOrderFacade.addOneReferralApplyOrder(applyOrderAddRequest, loginState.getId(),2); + } + + //增加转诊申请单 + @RequestMapping(method = RequestMethod.POST,value = "/referrbapply") + @ResponseBody + @TokenRequired + public BaseResponse addReferralBaApplyOrder(@Valid @RequestBody ReferralApplyOrderAddRequest applyOrderAddRequest,HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return applyOrderFacade.addOneReferralApplyOrder(applyOrderAddRequest, loginState.getId(),1); } @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 8fa6686..00a2174 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 @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.ApplyOrderService; +import com.lyms.platform.biz.service.BabyService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.biz.service.SieveService; import com.lyms.platform.common.constants.ErrorCodeConstants; @@ -18,10 +19,7 @@ import com.lyms.platform.operate.web.result.ReferralApplyOrderResult; import com.lyms.platform.operate.web.result.SieveApplyOrderResult; 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; -import com.lyms.platform.pojo.SieveModel; +import com.lyms.platform.pojo.*; import com.lyms.platform.query.PatientsQuery; import com.lyms.platform.query.ReferralApplyOrderQuery; import com.lyms.platform.query.SieveApplyOrderQuery; @@ -50,34 +48,50 @@ public class ApplyOrderFacade { private SieveService sieveService; @Autowired private OrganizationService organizationService; + @Autowired + private BabyService babyService; /** * 增加转诊申请 * * @param referralApplyOrderAddRequest + * @param type 2 孕妇 1 儿童 * @return */ - public BaseResponse addOneReferralApplyOrder(ReferralApplyOrderAddRequest referralApplyOrderAddRequest, Integer userId) { + public BaseResponse addOneReferralApplyOrder(ReferralApplyOrderAddRequest referralApplyOrderAddRequest, Integer userId,Integer type) { ReferralApplyOrderModel referralApplyOrderModel = referralApplyOrderAddRequest.convertToDataModel(); referralApplyOrderModel.setCreated(new Date()); referralApplyOrderModel.setStatus(0); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setId(referralApplyOrderModel.getParentId()); - //查询产妇信息 - List patientses = patientsService.queryPatient(patientsQuery); - Patients patients = null; - if (CollectionUtils.isNotEmpty(patientses)) { - patients = patientses.get(0); - } + if(2==type){ + //查询产妇信息 + List patientses = patientsService.queryPatient(patientsQuery); + Patients patients = null; + if (CollectionUtils.isNotEmpty(patientses)) { + patients = patientses.get(0); + } - if (null != patients) { - 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()); + } + }else{ + BabyModel babyModel= babyService.getOneBabyById(referralApplyOrderModel.getParentId()); + if(null!=babyModel){ + referralApplyOrderModel.setCardNo(babyModel.getCardNo()); + if(null!=babyModel.getBirth()){ + referralApplyOrderModel.setAge(DateUtil.getAge(babyModel.getBirth())); + } + referralApplyOrderModel.setDueDate(babyModel.getDueDate()); + referralApplyOrderModel.setName(babyModel.getName()); + } } + //孕妇 - referralApplyOrderModel.setType(2); + referralApplyOrderModel.setType(type); List areaId = autoMatchFacade.matchOrgId(userId); referralApplyOrderModel.setOutHospitalId(areaId.get(0) + ""); applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel);