From c841834fad43631b99c00261c8e554d5e6533b9c Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 20 Mar 2018 09:56:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E5=84=BF=E4=BF=9D=E5=A5=97?=
 =?UTF-8?q?=E9=A4=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/ViewFacade.java    | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

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 69b1db4..7ed6010 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
@@ -3097,6 +3097,8 @@ public class ViewFacade {
 
     private BabyCheckPageResult getBabyCheckResult(BabyCheckModel checkModel, BabyModel babyModel) {
         BabyCheckPageResult model = new BabyCheckPageResult();
+        //新加字段,检查套餐
+        model.setTcType(checkModel.getTcType());
 
         if (babyModel != null) {
             if (checkModel.getTcType() == null) {//历史数据不存在套餐处理成一个规则
@@ -3145,19 +3147,21 @@ public class ViewFacade {
                         model.setTcType(ChildCareEnums.JCTCEnums.H.getId());
                     }
                 }
-                String checkMonthAge = DateUtil.getBabyMonthAge(babyModel.getBirth(), checkModel.getCheckDate());
-                if (StringUtils.isNotEmpty(checkMonthAge)) {
-                    if (checkMonthAge.indexOf("岁") != -1) {
-                        String yearStr = checkMonthAge.substring(0, checkMonthAge.indexOf("岁"));
-                        int year = Integer.parseInt(yearStr);
-                        if (year == 3) {
-                            model.setTcType(ChildCareEnums.JCTCEnums.I.getId());
-                        } else if (year == 4) {
-                            model.setTcType(ChildCareEnums.JCTCEnums.J.getId());
-                        } else if (year == 5) {
-                            model.setTcType(ChildCareEnums.JCTCEnums.K.getId());
-                        } else if (year == 6) {
-                            model.setTcType(ChildCareEnums.JCTCEnums.L.getId());
+                if (model.getTcType() == null) {
+                    String checkMonthAge = DateUtil.getBabyMonthAge(babyModel.getBirth(), checkModel.getCheckDate());
+                    if (StringUtils.isNotEmpty(checkMonthAge)) {
+                        if (checkMonthAge.indexOf("岁") != -1) {
+                            String yearStr = checkMonthAge.substring(0, checkMonthAge.indexOf("岁"));
+                            int year = Integer.parseInt(yearStr);
+                            if (year == 3) {
+                                model.setTcType(ChildCareEnums.JCTCEnums.I.getId());
+                            } else if (year == 4) {
+                                model.setTcType(ChildCareEnums.JCTCEnums.J.getId());
+                            } else if (year == 5) {
+                                model.setTcType(ChildCareEnums.JCTCEnums.K.getId());
+                            } else if (year == 6) {
+                                model.setTcType(ChildCareEnums.JCTCEnums.L.getId());
+                            }
                         }
                     }
                 }
@@ -3232,10 +3236,6 @@ public class ViewFacade {
 
             }
         }
-        //新加字段
-        model.setTcType(checkModel.getTcType());
-
-
         model.setCnqk(checkModel.getCnqk());
         model.setMtcnNum(UnitUtils.unitSplice(checkModel.getMtcnNum(), UnitConstants.CI));
         model.setXbNum(UnitUtils.unitSplice(checkModel.getXbNum(), UnitConstants.CI));
-- 
1.8.3.1