diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java index c524c52..ed22b86 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java @@ -43,4 +43,6 @@ public interface IReferralApplyOrderDao { * @param referralApplyOrderModel */ void updateOne(ReferralApplyOrderModel referralApplyOrderModel); + + } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ApplyOrderService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ApplyOrderService.java index ecb3c6c..4797c83 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ApplyOrderService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ApplyOrderService.java @@ -74,4 +74,8 @@ public class ApplyOrderService { public void updateByParentId(ReferralApplyOrderQuery referralApplyOrderQuery, ReferralApplyOrderModel orderModel) { iReferralApplyOrderDao.findAndModify(referralApplyOrderQuery.convertToQuery(), orderModel); } + + public void updateReferralApplyOrder(ReferralApplyOrderModel orderModel) { + iReferralApplyOrderDao.updateOne(orderModel); + } } diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ApplyOrderStatusEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ApplyOrderStatusEnums.java index 9fde1a4..dc9da05 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/ApplyOrderStatusEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ApplyOrderStatusEnums.java @@ -7,7 +7,8 @@ public enum ApplyOrderStatusEnums { CREATED("待接收", "1"), O("已接收", "2"), O1("建议转诊", "3"), - O2("拒绝接收", "4"); + O2("拒绝接收", "4"), + O3("已转回", "5"); private ApplyOrderStatusEnums(String name, String id) { 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 f28c367..3c95c6c 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 @@ -77,13 +77,21 @@ public class ReferralApplyOrderModel extends BaseModel { private String applyDoctor; //接收日期 private Date received; + + //转回日期 + private Date backDate; + private String backUserId; + //接收医生 private String recDoctor; //创建时间 private Date created; //修改时间 private Date modified; - //申请单状态 0 已接收 1 已转出 2 建议转诊 + //申请单状态 CREATED("待接收", "1"), +// O("已接收", "2"), +// O1("建议转诊", "3"), +// O2("拒绝接收", "4"); private Integer status; //转诊类型 1 儿童 2 孕妇 private Integer type; @@ -97,6 +105,22 @@ public class ReferralApplyOrderModel extends BaseModel { //拒绝原因 private String reason; + public Date getBackDate() { + return backDate; + } + + public void setBackDate(Date backDate) { + this.backDate = backDate; + } + + public String getBackUserId() { + return backUserId; + } + + public void setBackUserId(String backUserId) { + this.backUserId = backUserId; + } + public String getReason() { return reason; } 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 f1ec5aa..b779ff7 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 @@ -80,6 +80,10 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati private Date revicedStart; private Date revicedEnd; + + private Date backDateStart; + private Date backDateEnd; + private Date transferredStart; private Date transferredEnd; @@ -96,6 +100,21 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati //查询号 private String queryNo; + public Date getBackDateStart() { + return backDateStart; + } + + public void setBackDateStart(Date backDateStart) { + this.backDateStart = backDateStart; + } + + public Date getBackDateEnd() { + return backDateEnd; + } + + public void setBackDateEnd(Date backDateEnd) { + this.backDateEnd = backDateEnd; + } public Date getLastMenses() { return lastMenses; @@ -404,6 +423,23 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati c = Criteria.where("received").lte(revicedEnd); } } + + + if (null != backDateStart) { + if (null != c) { + c = c.where("backDate").gte(backDateStart); + } else { + c = Criteria.where("backDate").gte(backDateStart); + } + } + if (null != backDateEnd) { + if (c != null) { + c = c.lte(backDateEnd); + } else { + c = Criteria.where("backDate").lte(backDateEnd); + } + } + if (null != transferredStart) { if (c != null) { c = c.where("created").gte(transferredStart); 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 76a9be4..9cd8524 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 @@ -58,6 +58,16 @@ public class ApplyOrderController extends BaseController { return applyOrderFacade.addOneReferralApplyOrder(applyOrderAddRequest, loginState.getId(), 2); } + + @RequestMapping(method = RequestMethod.POST, value = "/backReferralapply") + @ResponseBody + @TokenRequired + public BaseResponse backReferralapply(@Valid @RequestBody ReferralApplyOrderAddRequest applyOrderAddRequest, HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return applyOrderFacade.backReferralapply(applyOrderAddRequest, loginState.getId()); + } + + //增加转诊申请单 @RequestMapping(method = RequestMethod.POST, value = "/referrbapply") @ResponseBody 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 51edd2f..b2e4c48 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 @@ -888,17 +888,17 @@ public class ApplyOrderFacade { } Patients patients = null; - BabyModel babyModel = null; +// BabyModel babyModel = null; if (referralApplyOrderModel.getType() == 2 ) { patients = patientsService.findOnePatientById(referralApplyOrderModel.getParentId()); List> screenList = antenatalExaminationFacade.getscreenResult(patients.getScreenResult()); referralApplyOrderResult.setScreenResult(screenList); } - else - { - babyModel = babyService.getOneBabyById(referralApplyOrderModel.getParentId()); - } +// else +// { +// babyModel = babyService.getOneBabyById(referralApplyOrderModel.getParentId()); +// } referralApplyOrderResult.convertToResult(referralApplyOrderModel, patients, zhuanCName, zhuanRname); referralApplyOrderResult.setTransferredHospital(map1); @@ -1014,6 +1014,17 @@ public class ApplyOrderFacade { } } + + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getBackDate())) { + String[] str = applyOrderQueryRequest.getBackDate().split(" - "); + if (str.length > 1) { + referralApplyOrderQuery.setBackDateStart(DateUtil.parseYMD(str[0])); + } + if (str.length == 2) { + referralApplyOrderQuery.setBackDateEnd(new Date(DateUtil.parseYMD(str[1]).getTime() + 86398000)); + } + } + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferred())) { String[] str = applyOrderQueryRequest.getTransferred().split(" - "); if (str.length > 1) { @@ -2367,7 +2378,19 @@ public class ApplyOrderFacade { } } - + public BaseResponse backReferralapply(ReferralApplyOrderAddRequest applyOrderAddRequest, Integer userId) { + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); + referralApplyOrderQuery.setId(applyOrderAddRequest.getId()); + List list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); + if (CollectionUtils.isNotEmpty(list)) + { + ReferralApplyOrderModel orderModel = list.get(0); + orderModel.setBackDate(DateUtil.parseYMD(applyOrderAddRequest.getBackDate())); + orderModel.setBackUserId(userId.toString()); + applyOrderService.updateReferralApplyOrder(orderModel); + } + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功!"); + } /*拼json使用*/ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index a674d62..96d1c02 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -137,7 +137,8 @@ public class BabyBookbuildingFacade { @Autowired private BabyCheckService babyCheckService; - + @Autowired + private ApplyOrderService applyOrderService; @Autowired private UsersService usersService; @@ -3724,15 +3725,29 @@ public class BabyBookbuildingFacade { } String status = ""; - if ("0".equals(model.getEnable())) - { - status = "已转诊"; - } - else if ("1".equals(model.getEnable())) + + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); + referralApplyOrderQuery.setParentId(model.getParentId()); + List list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); + + if (CollectionUtils.isNotEmpty(list)) { - status = "已接收"; + //ApplyOrderStatusEnums + if (list.get(0).getStatus() == 1) + { + status = "已转诊"; + } + else if (list.get(0).getStatus() == 2) + { + status = "已转诊 已接收"; + } + else if (list.get(0).getStatus() == 3) + { + status = "已转诊 已接收 已转回"; + } } + String hospitalAddress = ""; if (org.apache.commons.lang.StringUtils.isNotEmpty(model.getHospitalId())) { Organization organization = organizationService.getOrganization(Integer.parseInt(model.getHospitalId())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java index bf7e92e..6cd4e2f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java @@ -40,6 +40,17 @@ public class BabyApplyOrderQueryRequest extends BasePageQueryRequest{ //查询号 private String queryNo; + //转回日期 + private String backDate; + + public String getBackDate() { + return backDate; + } + + public void setBackDate(String backDate) { + this.backDate = backDate; + } + public String getQueryNo() { return queryNo; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyOrderAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyOrderAddRequest.java index f4f573a..616d075 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyOrderAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyOrderAddRequest.java @@ -13,6 +13,8 @@ import com.lyms.platform.pojo.ReferralApplyOrderModel; @Form public class ReferralApplyOrderAddRequest implements IBasicRequestConvert { + + private String id; private String pid; @@ -32,6 +34,26 @@ public class ReferralApplyOrderAddRequest implements IBasicRequestConvert