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 1fd175b..1e86a61 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 @@ -552,6 +552,18 @@ public class ApplyOrderFacade { } } babyApplyOrderResult.convert(applyOrderModel, zhuanCName, zhuanRname); + + BabyModel babyModel = babyService.getOneBabyById(applyOrderModel.getParentId()); + if (null != babyModel) { + babyApplyOrderResult.setVcCardNo(babyModel.getVcCardNo()); + if (StringUtils.isNotEmpty(babyModel.getParentId())) { + Patients patients = patientsService.findOnePatientById(babyModel.getParentId()); + if (null != patients) { + babyApplyOrderResult.setmCardNo(patients.getCardNo()); + } + } + } + String diagnose = ""; if (CollectionUtils.isNotEmpty(diagnoseList)) { diagnose = ""; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java index 5675bc6..cf19cdf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java @@ -17,6 +17,11 @@ public class BabyApplyOrderResult { public static final String SPIT = "-"; private String id; private String pid; + //母亲身份证 + private String mCardNo; + //儿童就诊卡 + private String vcCardNo; + //名字 private String name; //高危转诊 @@ -74,6 +79,22 @@ public class BabyApplyOrderResult { return recDoctor; } + public String getmCardNo() { + return mCardNo; + } + + public void setmCardNo(String mCardNo) { + this.mCardNo = mCardNo; + } + + public String getVcCardNo() { + return vcCardNo; + } + + public void setVcCardNo(String vcCardNo) { + this.vcCardNo = vcCardNo; + } + public void setRecDoctor(String recDoctor) { this.recDoctor = recDoctor; }