From 9df472ca3f73b04b017c9d450cb72e6fcc4d392f Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 21 Jul 2016 16:50:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E9=80=9A?= =?UTF-8?q?=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/result/AntexListResult.java | 3 +++ .../com/lyms/platform/operate/web/result/MatDeliverListResult.java | 3 +++ .../java/com/lyms/platform/operate/web/result/PatientBaseResult.java | 3 +++ .../com/lyms/platform/operate/web/result/PostReviewListResult.java | 4 +++- .../lyms/platform/operate/web/result/ReferralApplyOrderResult.java | 3 +++ .../com/lyms/platform/operate/web/result/SieveApplyOrderResult.java | 3 +++ .../java/com/lyms/platform/operate/web/result/SieveDetailResult.java | 3 +++ .../main/java/com/lyms/platform/operate/web/result/SieveResult.java | 3 +++ 8 files changed, 24 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java index 8d2c2aa..3c02a3c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java @@ -143,6 +143,9 @@ public class AntexListResult { } }catch (Exception e){ } + if(null!=patients.getDueDate()){ + setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); + } setName(patients.getUsername()); setPhone(patients.getPhone()); setRemarks(patients.getMremark()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java index 8d62254..405d74b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java @@ -55,6 +55,9 @@ public class MatDeliverListResult { if(null!=patients.getLastMenses()){ setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); } + if(null!=patients.getDueDate()){ + setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); + } setName(patients.getUsername()); setPhone(patients.getPhone()); setRemarks(patients.getMremark()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java index 785ba1c..83ad7bb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java @@ -117,6 +117,9 @@ public class PatientBaseResult { } }catch (Exception e){ } + if(null!=patients.getDueDate()){ + setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); + } setName(patients.getUsername()); setPhone(patients.getPhone()); setRemarks(patients.getMremark()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java index 3d5381a..6a4d9b2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java @@ -160,7 +160,9 @@ public class PostReviewListResult { setPhone(patients.getPhone()); setRemarks(patients.getMremark()); setRiskScore("60"); - + if(null!=patients.getDueDate()){ + setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); + } int days= DateUtil.daysBetween(patients.getLastMenses(),new Date()); String week= (days/7)+""; int day = (days%7); 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 84a6007..62810d8 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 @@ -236,6 +236,9 @@ public class ReferralApplyOrderResult { int day = (days%7); this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); } + if(null!=patients.getDueDate()){ + setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); + } setCardNo(destModel.getCardNo()); setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate())); setrLevel(destModel.getrLevel()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java index f14888c..1961841 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java @@ -111,6 +111,9 @@ public class SieveApplyOrderResult { } }catch (Exception e){ } + if(null!=patients.getDueDate()){ + setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); + } setName(patients.getUsername()); setPhone(patients.getPhone()); setRemarks(patients.getMremark()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java index 510de9f..a3ce86b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java @@ -214,6 +214,9 @@ public class SieveDetailResult { } }catch (Exception e){ } + if(null!=patients.getDueDate()){ + setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); + } setName(patients.getUsername()); setPhone(patients.getPhone()); setRemarks(patients.getMremark()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java index 8dc2bdd..d726d0c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java @@ -189,6 +189,9 @@ public class SieveResult { } }catch (Exception e){ } + if(null!=patients.getDueDate()){ + setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); + } setName(patients.getUsername()); setPhone(patients.getPhone()); setRemarks(patients.getMremark()); -- 1.8.3.1