diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java index 60cfb3f..e2d4e35 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java @@ -189,6 +189,74 @@ public class BabyHighRiskBabyModel extends BaseModel { private String opinion; //备注 private String remarks; + //既往患病情况 + private String jwbqk; + + //转归状态 1 正常 2转诊3 拒转诊 4 失访 5死亡 + private Integer zgStatus; + + + //评价方法 + /** + * 1询问儿童近期患病、家庭养育情况 + 2身体检查 + 3体格生长监测与评价 + 4神经心理行为发育监测和评估 + 5特殊检查 + */ + private Integer evalMethod; + + //处理 + /** + * 1预见性指导 + 2早期干预 + 3转诊 + 4结案 + 5其他 + */ + private Integer handle; + private String handleOther; + + public Integer getEvalMethod() { + return evalMethod; + } + + public void setEvalMethod(Integer evalMethod) { + this.evalMethod = evalMethod; + } + + public Integer getHandle() { + return handle; + } + + public void setHandle(Integer handle) { + this.handle = handle; + } + + public String getHandleOther() { + return handleOther; + } + + public void setHandleOther(String handleOther) { + this.handleOther = handleOther; + } + + public String getJwbqk() { + return jwbqk; + } + + public void setJwbqk(String jwbqk) { + this.jwbqk = jwbqk; + } + + public Integer getZgStatus() { + return zgStatus; + } + + public void setZgStatus(Integer zgStatus) { + this.zgStatus = zgStatus; + } + 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 3c95c6c..64adda2 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 @@ -92,6 +92,7 @@ public class ReferralApplyOrderModel extends BaseModel { // O("已接收", "2"), // O1("建议转诊", "3"), // O2("拒绝接收", "4"); +// O2("已回转", "5"); private Integer status; //转诊类型 1 儿童 2 孕妇 private Integer type; 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 b2e4c48..ea479c5 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 @@ -2384,10 +2384,20 @@ public class ApplyOrderFacade { 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); + referralApplyOrderQuery = new ReferralApplyOrderQuery(); + referralApplyOrderQuery.setPid(list.get(0).getPid()); + list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); + + if (CollectionUtils.isNotEmpty(list)) + { + for (ReferralApplyOrderModel orderModel : list) + { + orderModel.setBackDate(DateUtil.parseYMD(applyOrderAddRequest.getBackDate())); + orderModel.setBackUserId(userId.toString()); + orderModel.setStatus(5); + applyOrderService.updateReferralApplyOrder(orderModel); + } + } } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功!"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java index c52cceb..fa58979 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java @@ -167,6 +167,11 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { model.setXss(request.getXss()); model.setOpinion(request.getOpinion()); model.setRemarks(request.getRemarks()); + model.setJwbqk(request.getJwbqk()); + model.setZgStatus(request.getZgStatus()); + model.setEvalMethod(request.getEvalMethod()); + model.setHandle(request.getHandle()); + model.setHandleOther(request.getHandleOther()); return model; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java index d17448d..d4caf97 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java @@ -205,6 +205,72 @@ public class BabyHighRiskBabyRequest { //备注 private String remarks; + //既往患病情况 + private String jwbqk; + + //转归状态 1 正常 2转诊3 拒转诊 4 失访 5死亡 + private Integer zgStatus; + //评价方法 + /** + * 1询问儿童近期患病、家庭养育情况 + 2身体检查 + 3体格生长监测与评价 + 4神经心理行为发育监测和评估 + 5特殊检查 + */ + private Integer evalMethod; + + //处理 + /** + * 1预见性指导 + 2早期干预 + 3转诊 + 4结案 + 5其他 + */ + private Integer handle; + private String handleOther; + + public Integer getEvalMethod() { + return evalMethod; + } + + public void setEvalMethod(Integer evalMethod) { + this.evalMethod = evalMethod; + } + + public Integer getHandle() { + return handle; + } + + public void setHandle(Integer handle) { + this.handle = handle; + } + + public String getHandleOther() { + return handleOther; + } + + public void setHandleOther(String handleOther) { + this.handleOther = handleOther; + } + + public String getJwbqk() { + return jwbqk; + } + + public void setJwbqk(String jwbqk) { + this.jwbqk = jwbqk; + } + + public Integer getZgStatus() { + return zgStatus; + } + + public void setZgStatus(Integer zgStatus) { + this.zgStatus = zgStatus; + } + public String getNumber() { return number; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java index b541d36..1046117 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java @@ -191,6 +191,72 @@ public class BabyHighRiskBabyResult implements IBasicResultConvert