From de37e6781433e9ffd0ea904264597f1cf68da013 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Wed, 21 Mar 2018 14:00:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E4=BF=9D=E5=88=86=E6=9C=88=E9=BE=84?=
 =?UTF-8?q?=E5=A5=97=E9=A4=90=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/BabyCheckFacade.java |  2 ++
 .../lyms/platform/operate/web/facade/ViewFacade.java |  2 +-
 .../web/inteceptor/MybatisSqlInterceptor.java        | 15 +++++----------
 .../platform/operate/web/result/BabyBasicResult.java | 20 ++++++++++++++++++++
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
index f031910..35b00f1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
@@ -764,6 +764,8 @@ public class BabyCheckFacade {
                 base.setBabyLastHighRisk(getBabyLastHighRisk(model.getPid()));
                 base.setId(id);
                 base.setSex(model.getSex());
+                base.setDueWeek(model.getDueWeek());
+                base.setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate()));
                 base.setName(model.getName());
                 base.setCardNo(model.getMcertNo());
                 base.setPregnantCertificateTypeId(model.getMcertTypeId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index 7ed6010..980d302 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -3147,7 +3147,7 @@ public class ViewFacade {
                         model.setTcType(ChildCareEnums.JCTCEnums.H.getId());
                     }
                 }
-                if (model.getTcType() == null) {
+                if (model.getTcType() == null) {//如果月龄未完成赋值
                     String checkMonthAge = DateUtil.getBabyMonthAge(babyModel.getBirth(), checkModel.getCheckDate());
                     if (StringUtils.isNotEmpty(checkMonthAge)) {
                         if (checkMonthAge.indexOf("岁") != -1) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java
index 9d8c1e2..8657799 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java
@@ -1,11 +1,6 @@
 package com.lyms.platform.operate.web.inteceptor;
 
 
-import java.sql.Statement;
-import java.text.DateFormat;
-import java.util.*;
-
-import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.ExceptionUtils;
 import com.lyms.platform.operate.web.utils.SendMysqlSyncDatUtil;
 import org.apache.commons.collections.CollectionUtils;
@@ -15,15 +10,15 @@ import org.apache.ibatis.executor.resultset.ResultSetHandler;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.mapping.ParameterMapping;
-import org.apache.ibatis.plugin.Interceptor;
-import org.apache.ibatis.plugin.Intercepts;
-import org.apache.ibatis.plugin.Invocation;
-import org.apache.ibatis.plugin.Plugin;
-import org.apache.ibatis.plugin.Signature;
+import org.apache.ibatis.plugin.*;
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.type.TypeHandlerRegistry;
 
+import java.sql.Statement;
+import java.text.DateFormat;
+import java.util.*;
+
 /**
  * 同步线上mysql的操作到区域
  * Created by Administrator on 2017-04-24.
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java
index 6c0901b..b830734 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java
@@ -49,6 +49,26 @@ public class BabyBasicResult {
     private String pregnantCertificateTypeId;
     //是否高危儿童 0 非高危 1高危
     private Integer babyLastHighRisk;
+    //分娩孕周
+    private Integer dueWeek;
+    //预产期
+    private String dueDate;
+
+    public String getDueDate() {
+        return dueDate;
+    }
+
+    public void setDueDate(String dueDate) {
+        this.dueDate = dueDate;
+    }
+
+    public Integer getDueWeek() {
+        return dueWeek;
+    }
+
+    public void setDueWeek(Integer dueWeek) {
+        this.dueWeek = dueWeek;
+    }
 
     public String getPregnantCertificateTypeId() {
         return pregnantCertificateTypeId;
-- 
1.8.3.1