From 98c23ac7910e36ded7458148da410d0a3e599078 Mon Sep 17 00:00:00 2001
From: Administrator <184677810@qq.com>
Date: Thu, 31 Oct 2019 15:14:17 +0800
Subject: [PATCH] update

---
 .../mainOrm/master/FolviteReceiveMapper.xml        | 53 +++++++++++----------
 .../platform/pojo/FolviteReceiveRecordModel.java   | 12 +++--
 .../operate/web/controller/FolviteController.java  |  7 ++-
 .../web/service/impl/FolviteServiceImpl.java       | 55 +++++++++-------------
 4 files changed, 61 insertions(+), 66 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
index 377afaf..af8df49 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
@@ -13,35 +13,38 @@
         <result column="receive_date" property="receiveDate"/>
         <result column="creation_date" property="creationDate"/>
         <result column="modified" property="modified"/>
+        <result column="hospitalid" property="hospitalId"/>
     </resultMap>
 
     <insert id="saveFolviteReceive" parameterType="com.lyms.platform.pojo.FolviteReceiveRecordModel">
-INSERT INTO lyms_folvite_provide (
-	id,
-	folvite_id,
-	receive_number,
-	receive_week,
-	highrisk,
-	provide_unit,
-	ISSUER,
-	receive_date,
-	creation_date,
-	modified,
-	isconceive
+INSERT INTO lyms_folvite_provide(
+id,
+folvite_id,
+receive_number,
+receive_week,
+highrisk,
+provide_unit,
+issuer,
+receive_date,
+creation_date,
+modified,
+isconceive,
+hospitalid
+) VALUES (
+#{id,jdbcType=VARCHAR},
+#{folviteId,jdbcType=VARCHAR},
+#{receiveNumber,jdbcType=INTEGER},
+#{receiveWeek,jdbcType=INTEGER},
+#{highrisk,jdbcType=VARCHAR},
+#{provideUnit,jdbcType=VARCHAR},
+#{issuer,jdbcType=VARCHAR},
+#{receiveDate,jdbcType=TIMESTAMP},
+#{creationDate,jdbcType=TIMESTAMP},
+#{modified,jdbcType=TIMESTAMP},
+#{isconceive,jdbcType=INTEGER},
+#{hospitalId,jdbcType=VARCHAR}
 )
-VALUES
-	(
-		#{id,jdbcType=VARCHAR},
-		#{folviteId,jdbcType=VARCHAR},
-		#{receiveNumber,jdbcType=INTEGER},
-		#{receiveWeek,jdbcType=INTEGER},
-		#{highrisk,jdbcType=VARCHAR},
-		#{provideUnit,jdbcType=VARCHAR},
-		#{issuer,jdbcType=VARCHAR},
-		#{receiveDate,jdbcType=TIMESTAMP},
-		#{creationDate,jdbcType=TIMESTAMP},
-		#{modified,jdbcType=TIMESTAMP})
-		#{isconceive,jdbcType=INTEGER}
+
     </insert>
 
     <select id="queryFolviteReceiveList" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery"
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/FolviteReceiveRecordModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/FolviteReceiveRecordModel.java
index 58f6a10..2523b62 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/FolviteReceiveRecordModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/FolviteReceiveRecordModel.java
@@ -1,5 +1,7 @@
 package com.lyms.platform.pojo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
 import java.util.UUID;
 
@@ -34,9 +36,10 @@ public class FolviteReceiveRecordModel {
     private String provideUnit;
 
     //发放人
-    private String Issuer;
+    private String issuer;
 
     //领取日期
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date receiveDate;
 
     //创建日期
@@ -132,12 +135,11 @@ public class FolviteReceiveRecordModel {
     }
 
     public String getIssuer() {
-        return this.Issuer;
+        return issuer;
     }
 
-
-    public void setIssuer(String Issuer) {
-        this.Issuer = Issuer;
+    public void setIssuer(String issuer) {
+        this.issuer = issuer;
     }
 
     public Date getReceiveDate() {
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 e560ed1..6e9fcfe 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
@@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.controller;
 
 import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.base.BaseController;
+import com.lyms.platform.common.result.BaseListResponse;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.operate.web.service.FolviteService;
 import com.lyms.platform.permission.model.FolviteQuery;
@@ -73,7 +74,7 @@ public class FolviteController extends BaseController {
     @RequestMapping(value = "saveOrUpdateProvideFolvite", method = RequestMethod.POST)
     @ResponseBody
     @TokenRequired
-    public BaseResponse saveProvideFolvite(@RequestBody FolviteReceiveRecordModel receiveModel, HttpServletRequest request) {
+    public BaseResponse saveProvideFolvite(@Valid @RequestBody FolviteReceiveRecordModel receiveModel, HttpServletRequest request) {
         return folviteService.saveProvideFolvite(receiveModel, getUserId(request));
 
     }
@@ -104,8 +105,10 @@ public class FolviteController extends BaseController {
         query.setWomanId(womanId);
         query.setSort("created asc");
         List<FolviteRecordModel> recordModels = folviteService.queryFolviteList(query);
-        BaseResponse baseResponse = new BaseResponse();
+        BaseListResponse baseResponse = new BaseListResponse();
         baseResponse.setObject(recordModels);
+        query.setCount(recordModels.size());
+        baseResponse.setPageInfo(query.getPageInfo());
         return baseResponse;
     }
 
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 5b3efda..d03d6dd 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
@@ -95,6 +95,7 @@ public class FolviteServiceImpl implements FolviteService {
         FolviteRecordQuery recordQuery = new FolviteRecordQuery();
         recordQuery.setFolviteId(folviteId);
         List<Map<String, Object>> listMap = new ArrayList<>();
+
         List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery);
         if (CollectionUtils.isNotEmpty(folviteRecordModels)) {
             for (FolviteReceiveRecordModel folviteRecordModel : folviteRecordModels) {
@@ -111,8 +112,6 @@ public class FolviteServiceImpl implements FolviteService {
                 listMap.add(recordMap);
             }
         }
-
-
         FolviteResult result = null;
         if (flag) {
             //如果为空查询孕妇档案  进行叶酸档案建档  回显孕妇档案数据回去
@@ -201,12 +200,11 @@ public class FolviteServiceImpl implements FolviteService {
         folviteQuery.setHospitalId(hospitalId);
         folviteQuery.setId(folviteId);
         List<FolviteRecordModel> folviteRecordModels1 = folviteMapper.queryOne(folviteQuery);
-        String womanId = null;
-        String cardNo = null;
+        String folviteid = null;
+
         Map<String, Object> folvite = new HashMap<>();
         if (CollectionUtils.isNotEmpty(folviteRecordModels1)) {
             FolviteRecordModel recordModel = folviteRecordModels1.get(0);
-
             if (recordModel != null) {
                 folvite.put("username", recordModel.getName());
                 folvite.put("birthday", DateUtil.getyyyy_MM_dd(recordModel.getBirthday()));
@@ -218,43 +216,32 @@ public class FolviteServiceImpl implements FolviteService {
                         recordModel.getDomicileArea(), recordModel.getDomicileCountry(), recordModel.getDomicileAddress(), basicConfigService));
                 folvite.put("alreadySum", "已领总数");
                 folvite.put("canSum", "可领总数");
-                womanId = recordModel.getWomanId();
-                cardNo = recordModel.getCardNo();
+                folviteid = recordModel.getId();
             }
         }
-        FolviteQuery query = new FolviteQuery();
-        query.setWomanId(womanId);
-        query.setCardNo(cardNo);
-        List<FolviteRecordModel> recordModels = queryFolviteList(query);
-        List<List<Map<String, Object>>> list = new ArrayList();
-        if (CollectionUtils.isNotEmpty(recordModels)) {
-            FolviteRecordQuery recordQuery = new FolviteRecordQuery();
-            for (FolviteRecordModel folviteModel : recordModels) {
-                List<Map<String, Object>> listMap = new ArrayList<>();
-                recordQuery.setFolviteId(folviteModel.getId());
-                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);
-                    }
+        FolviteRecordQuery recordQuery = new FolviteRecordQuery();
+        List<Map<String, Object>> listMap = new ArrayList<>();
+        recordQuery.setFolviteId(folviteid);
+        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() + "周");
                 }
-                list.add(listMap);
+                listMap.add(recordMap);
             }
         }
         BaseResponse response = new BaseResponse();
         respone.put("folicAcidResult", provide);
         respone.put("archiveResult", folvite);
-        respone.put("folicAcidHistory", list);
+        respone.put("folicAcidHistory", listMap);
         response.setObject(respone);
         return response;
     }
-- 
1.8.3.1