From 16e63175f0f6449a2395607668645836a9d29dce Mon Sep 17 00:00:00 2001
From: Administrator <184677810@qq.com>
Date: Fri, 1 Nov 2019 15:15:49 +0800
Subject: [PATCH] update

---
 .../operate/web/controller/FolviteController.java  |  8 ++++
 .../operate/web/service/FolviteService.java        |  7 ++++
 .../web/service/impl/FolviteServiceImpl.java       | 46 ++++++++++++++++++++++
 3 files changed, 61 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java
index 29f5fe4..56d4205 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java
@@ -218,5 +218,13 @@ public class FolviteController extends BaseController {
         return folviteService.deleteProvide(id);
     }
 
+    @RequestMapping(value = "querFolviteRecordInfo/{id}", method = RequestMethod.GET)
+    @ResponseBody
+    @TokenRequired
+    public BaseResponse querFolviteRecordInfo(@PathVariable("id") String id) {
+
+        return folviteService.querFolviteRecordInfo(id);
+    }
+
 
 }
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/FolviteService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/FolviteService.java
index 9e713ef..d39f9fa 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/FolviteService.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/FolviteService.java
@@ -68,6 +68,13 @@ public interface FolviteService {
      */
     BaseResponse deleteProvide(String id);
 
+    /**
+     * 通过建档id 查询建档详情+ 方法历史记录
+     *
+     * @param id
+     * @return
+     */
+    BaseResponse querFolviteRecordInfo(String id);
 
     List<FolviteRecordModel> queryFolviteList(FolviteQuery folviteQuery);
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
index d7ddf2c..82746aa 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
@@ -235,6 +235,52 @@ public class FolviteServiceImpl implements FolviteService {
     }
 
     @Override
+    public BaseResponse querFolviteRecordInfo(String id) {
+        Map<String, Object> responseMap = new HashMap<>();
+        FolviteRecordModel queryOne = folviteMapper.queryOne(id);
+        Map<String, Object> data = new HashMap<>();
+        List<Map<String, Object>> listMap = new ArrayList<>();
+        if (queryOne != null) {
+            data.put("id", queryOne.getId());
+            data.put("name", queryOne.getName());
+            data.put("age", DateUtil.getAge(queryOne.getBirthday()));
+            data.put("sex", queryOne.getSex());
+            data.put("birth", DateUtil.getyyyy_MM_dd(queryOne.getBirthday()));
+            data.put("phone", queryOne.getPhone());
+            data.put("sumNumber", queryOne.getReceiveSum());
+            data.put("address", CommonsHelper.getResidence(queryOne.getDomicileProvince(), queryOne.getDomicileCity(),
+                    queryOne.getDomicileArea(), queryOne.getDomicileCountry(), queryOne.getDomicileAddress(), basicConfigService));
+            data.put("drawTime", DateUtil.getyyyy_MM_dd(queryOne.getDrawTime()));
+            data.put("ispregnancy", queryOne.getIspregnancy());
+        }
+        FolviteRecordQuery recordQuery = new FolviteRecordQuery();
+        recordQuery.setFolviteId(queryOne.getId());
+        recordQuery.setSort("receive_date asc");
+        List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery);
+        if (CollectionUtils.isNotEmpty(folviteRecordModels)) {
+            for (FolviteReceiveRecordModel folviteRecordModel : folviteRecordModels) {
+                Map<String, Object> recordMap = new HashMap<>();
+                recordMap.put("drawCount", folviteRecordModel.getReceiveNumber());
+                recordMap.put("drawTime", DateUtil.getyyyy_MM_dd(folviteRecordModel.getReceiveDate()));
+                recordMap.put("id", folviteRecordModel.getId());
+                recordMap.put("other", folviteRecordModel.getIsconceive());
+                if (folviteRecordModel.getIsconceive() == 0) {
+                    recordMap.put("pregnancyType", "孕前");
+                } else {
+                    recordMap.put("pregnancyType", "孕" + folviteRecordModel.getReceiveWeek() + "周");
+                }
+                listMap.add(recordMap);
+            }
+        }
+        BaseResponse response = new BaseResponse();
+        responseMap.put("baseInfo", data);
+        responseMap.put("history", listMap);
+        response.setObject(responseMap);
+        return response;
+    }
+
+
+    @Override
     public List<FolviteRecordModel> queryFolviteList(FolviteQuery folviteQuery) {
         if (folviteQuery.getNeed() != null) {
             folviteQuery.mysqlBuild(folviteMapper.queryFolviteListCount(folviteQuery));
-- 
1.8.3.1