From c635d3d3a51577e8d9408a1f05785ae712cf060d Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 24 Apr 2018 15:06:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E5=B0=91=E6=9C=AA=E9=97=AD=E5=90=88?=
 =?UTF-8?q?=E5=B0=BA=E5=AF=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/biz/service/PatientsService.java | 18 ++++++++++--------
 .../java/com/lyms/platform/pojo/BabyCheckModel.java    |  2 +-
 .../platform/job/index/restore/data/ConvertHelper.java |  6 ++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
index e036438..2c4149b 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
@@ -370,6 +370,7 @@ public class PatientsService {
                         tr.setTrackType(TrackDownDateEnums.F.getId());
                     }
                 }else{//否则不显示
+                    System.out.println("开始处理产检、产筛追访数据进入分娩追访:"+patients.getId());
                     tr.setStatus(0);
                 }
                 trackDownRecordService.updateTrackDown(tr, tr.getId());
@@ -390,15 +391,16 @@ public class PatientsService {
         for (TrackDownRecord tr : records) {
             Patients patients = iPatientDao.getPatient(tr.getParentId());
             if (patients == null || tr == null) {
+                tr.setStatus(0);
                 System.out.println("处理产筛追访数据，孕周大于20周自动进入产检追访:patient为空" + tr.getParentId());
-                continue;
-            }
-            int week = DateUtil.getWeek2(patients.getLastMenses(), new Date());
-            if (week > 20) {//不能做产前筛查追访，显示产前检查追访
-                if (tr.getTrackType() == TrackDownDateEnums.C.getId()) {
-                    tr.setTrackType(TrackDownDateEnums.I.getId());
-                } else if (tr.getTrackType() == TrackDownDateEnums.H.getId()) {
-                    tr.setTrackType(TrackDownDateEnums.E.getId());
+            }else {
+                int week = DateUtil.getWeek2(patients.getLastMenses(), new Date());
+                if (week > 20) {//不能做产前筛查追访，显示产前检查追访
+                    if (tr.getTrackType() == TrackDownDateEnums.C.getId()) {
+                        tr.setTrackType(TrackDownDateEnums.I.getId());
+                    } else if (tr.getTrackType() == TrackDownDateEnums.H.getId()) {
+                        tr.setTrackType(TrackDownDateEnums.E.getId());
+                    }
                 }
             }
             trackDownRecordService.updateTrackDown(tr, tr.getId());
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
index cc32f8b..663f261 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
@@ -46,7 +46,7 @@ public class BabyCheckModel extends BaseModel {
     private String excrement;
     //睡眠情况
     private String sleep;
-    //活动小时
+    //活动小时（户外活动）
     private String activity;
     //维生素D
     private String vitaminD;
diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java
index 35864d9..737fd79 100644
--- a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java
+++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java
@@ -242,7 +242,6 @@ public class ConvertHelper {
                     String value = QbTypeEnums.getNameById(Integer.parseInt(map.get("select").toString()));
                     babyPaedia.setUmbilical(value);
                 }
-
             }
 
             babyPaedia.setOtherText(babyCheckModel.getBabyCheckOther());
@@ -288,17 +287,16 @@ public class ConvertHelper {
             babyCheckCommonly.setHeight(com.lyms.platform.common.utils.StringUtils.unitHandle(babyCheckModel.getHeight(), UnitConstants.CM));
             babyCheckCommonly.setHeightWeight(babyCheckModel.getHeightWeight());
             String bregma = "";
-            String bregmaValue = "";
             if (org.apache.commons.lang.StringUtils.isNotEmpty(babyCheckModel.getBregma())) {
                 Map map = JsonUtil.str2Obj(babyCheckModel.getBregma(), Map.class);
                 String yesOrNo = map.get("yeaOrNo") == null ? "" : map.get("yeaOrNo").toString();
                 if ("yes".equals(yesOrNo)) {
                     bregma = "闭合";
                 } else if ("no".equals(yesOrNo)) {
-//                    bregma = "未闭合";
+                   bregma = "未闭合";
                     String one = map.get("wbhcc1") == null ? "" : map.get("wbhcc1").toString();
                     String two = map.get("wbhcc2") == null ? "" : map.get("wbhcc2").toString();
-                    bregma = one + "cm - " + two + "cm";
+                    bregma = bregma+":"+one + "cm - " + two + "cm";
                 }
             }
             babyCheckCommonly.setBregma(bregma);
-- 
1.8.3.1