From 0932e1c9d88f823c31a5736b8728325b0fb2dfbc Mon Sep 17 00:00:00 2001
From: "[wangbo]" <www.184677810@qq.com>
Date: Sat, 7 Sep 2019 16:59:05 +0800
Subject: [PATCH] update

---
 .../java/com/lyms/platform/operate/web/facade/TrackDownFacade.java  | 6 ------
 .../main/java/com/lyms/platform/operate/web/facade/ViewFacade.java  | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
index d9e5385..fcd83f4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
@@ -1181,12 +1181,8 @@ public class TrackDownFacade {
             }
         }
         //处理孕妇建档处历史数据
-
-
         patients.setHistory(true);
         List<Patients> patientsList = patientsService.queryPatient(patients);
-
-
         if (CollectionUtils.isNotEmpty(patientsList)) {
             int batchSize = 5;
             int ends = 0;
@@ -1214,8 +1210,6 @@ public class TrackDownFacade {
             }
         }
         //追访详情历史数据处理
-
-
         trackDownRecordQuery.setHistory(true);
         List<TrackDownRecord> trackDownRecords = trackDownRecordService.queryTrackDown(trackDownRecordQuery);
         if (CollectionUtils.isNotEmpty(trackDownRecords)) {
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 b4276c3..e770df8 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
@@ -6242,10 +6242,10 @@ public class ViewFacade {
             result.setWeight(StringUtils.isNotEmpty(checkModel.getWeight()) ? checkModel.getWeight() + "kg,评价：" + checkModel.getWeightEvaluate() : "");
             result.setHeight(StringUtils.isNotEmpty(checkModel.getHeight()) ? checkModel.getHeight() + "cm,评价：" + checkModel.getHeightEvaluate() : "");
             result.setWeightOrHeight(checkModel.getHeightWeight());
-            result.setPhysiqueInfo(checkModel.getWeightEvaluate());
+            result.setPhysiqueInfo(checkModel.getGrowthEvaluate());
             result.setHeadCircumference(checkModel.getHead());
             result.setXhdb(checkModel.getHemoglobin());
-            result.setOtherCheck(JsonUtil.obj2JsonString(checkModel.getFaceColor()));
+            result.setOtherCheck(checkModel.getBabyCheckOther());
             result.setCheckHospital(StringUtils.isNotEmpty(checkModel.getHospitalId()) ? organizationService.getOrganization(Integer.valueOf(checkModel.getHospitalId())).getName() : "");
             result.setCheckDoctor(StringUtils.isNotEmpty(checkModel.getCheckDoctor()) ? usersService.getUsers(Integer.valueOf(checkModel.getCheckDoctor())).getName() : "");
             result.setNextCheckTime(DateUtil.getyyyy_MM_dd(checkModel.getNextDate()));
-- 
1.8.3.1