From 9b8349575d34e2ca783ee6ef959b3e35161f9791 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 21 Nov 2019 17:41:28 +0800
Subject: [PATCH] update

---
 .../com/lyms/platform/operate/web/facade/AmniocentesisFacade.java     | 4 ++++
 .../com/lyms/platform/operate/web/result/AmniocentesisInfoView.java   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java
index 08a4424..30acd02 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java
@@ -121,6 +121,10 @@ public class AmniocentesisFacade {
             data.put("streetId",pat.getStreetRegisterId());
             data.put("address",pat.getAddressRegister());
 
+
+            data.put("pProfessionTypeId",pat.getPprofessionTypeId());
+            data.put("hProfessionTypeId",pat.getHprofessionTypeId());
+
             data.put("lastMenses",DateUtil.getyyyy_MM_dd(pat.getLastMenses()));
             Date dueDate = DateUtil.addDay(DateUtil.addMonth(pat.getLastMenses(), 9), 7);
             data.put("dueDate",DateUtil.getyyyy_MM_dd(dueDate));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmniocentesisInfoView.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmniocentesisInfoView.java
index 94c15ea..e0a08ca 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmniocentesisInfoView.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmniocentesisInfoView.java
@@ -152,7 +152,7 @@ public class AmniocentesisInfoView implements IBasicResultConvert<AmniocentesisI
 
         setMensStopEndDay(destModel.getMensStopEndDay());
 
-        setPage(DateUtil.getAge(destModel.getBirthday()));
+        setPage(DateUtil.getAge(destModel.getBirthday(),destModel.getCreated()));
         setHage(DateUtil.getAge(destModel.getHbirthday()));
 
         return this;
-- 
1.8.3.1