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 c878507..cc5d02b 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 @@ -16,6 +16,8 @@ public class ReferralApplyOrderModel { private String id; //患者id private String parentId; + + private String pid; //患者名字 private String name; private String mname; @@ -70,6 +72,14 @@ public class ReferralApplyOrderModel { //转诊类型 1 儿童 2 孕妇 private Integer type; + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + public Date getModified() { return modified; } 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 6f7f769..1440e40 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 @@ -99,6 +99,7 @@ public class ApplyOrderFacade { referralApplyOrderModel.setBirth(patients.getBirth()); referralApplyOrderModel.setExpVip(patients.getExpVip()); int days= DateUtil.daysBetween(new Date(),patients.getDueDate());; + referralApplyOrderModel.setPid(patients.getPid()); referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days)); } } else { @@ -119,6 +120,7 @@ public class ApplyOrderFacade { referralApplyOrderModel.setSex(babyModel.getSex()); referralApplyOrderModel.setCardNo(patients.getCardNo()); referralApplyOrderModel.setExpVip(babyModel.getExpVip()); + referralApplyOrderModel.setPid(babyModel.getPid()); } } 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 832bc5b..26f9ca4 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 @@ -16,6 +16,7 @@ import java.util.Date; public class BabyApplyOrderResult { public static final String SPIT="-"; private String id; + private String pid; //名字 private String name; //高危转诊 @@ -54,6 +55,14 @@ public class BabyApplyOrderResult { private String zhuanRname; private String status; + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + public String getCyl() { return cyl; } @@ -95,6 +104,7 @@ public class BabyApplyOrderResult { } public BabyApplyOrderResult convert(ReferralApplyOrderModel referralApplyOrderModel, String zhuanCName,String zhuanRname) { + setPid(referralApplyOrderModel.getPid()); setZhuanRname(zhuanRname); setZhuanCName(zhuanCName); setId(referralApplyOrderModel.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java index f723811..73618a4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java @@ -26,6 +26,7 @@ public class ReferralApplyOrderResult { //末次月经 private String lastMenses; private String id; + private String pid; //患者id private String parentId; //患者名字 @@ -66,6 +67,14 @@ public class ReferralApplyOrderResult { //转入医院 private String zhuanRname; + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + public String getZhuanCName() { return zhuanCName; } @@ -235,7 +244,7 @@ public class ReferralApplyOrderResult { int days= DateUtil.daysBetween(new Date(),destModel.getDueDate()); this.dueWeek=StringUtils.dueWeek(days); } - + setPid(destModel.getPid()); setCardNo(destModel.getCardNo()); setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate())); setrLevel(destModel.getrLevel());