From a3779e917414101f988a7dd26c203d211c1b63f3 Mon Sep 17 00:00:00 2001
From: Administrator <184677810@qq.com>
Date: Fri, 1 Nov 2019 10:59:48 +0800
Subject: [PATCH] update

---
 .../lyms/platform/permission/dao/master/FolviteMapper.java  |  4 +---
 .../src/main/resources/mainOrm/master/FolviteMapper.xml     |  3 ++-
 .../main/resources/mainOrm/master/FolviteReceiveMapper.xml  | 13 ++++++++-----
 .../com/lyms/platform/pojo/FolviteReceiveRecordModel.java   | 13 +++++++++++++
 .../platform/operate/web/controller/FolviteController.java  |  1 +
 .../operate/web/service/impl/FolviteServiceImpl.java        | 13 +++++++++++++
 6 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteMapper.java
index c4d7434..3fcb9d4 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteMapper.java
@@ -23,11 +23,9 @@ public interface FolviteMapper {
      */
     FolviteRecordModel queryOne(String id);
 
-
-
-
     List<Map<String, Object>> queryListMap(FolviteQuery query);
 
+
     Integer queryListCount(FolviteQuery query);
 
     /**
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
index e95813c..79ceeb2 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
@@ -130,7 +130,8 @@
     <select id="queryListMap" parameterType="com.lyms.platform.permission.model.FolviteQuery"
             resultType="map">
         SELECT
-        f.`name`,f.card_no,f.phone,p.receive_date,p.receive_number,p.receive_week,p.highrisk,p.provide_unit,f.habitation_address,f.habitation_area,f.habitation_city,f.habitation_country,f.habitation_province,p.`issuer`
+        f.`name`,f.card_no,f.phone,p.receive_date,p.receive_number,p.receive_week,p.highrisk,p.provide_unit,f.habitation_address,f.habitation_area,f.habitation_city,
+        f.habitation_country,f.habitation_province,p.`issuer`,p.id as id, f.id as folviteId
         FROM
         lyms_folvite_provide AS p
         LEFT JOIN
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 b2dda7c..207f573 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
@@ -29,7 +29,8 @@ receive_date,
 creation_date,
 modified,
 isconceive,
-hospitalid
+hospitalid,
+end_pregnancy
 ) VALUES (
 #{id,jdbcType=VARCHAR},
 #{folviteId,jdbcType=VARCHAR},
@@ -42,7 +43,8 @@ hospitalid
 #{creationDate,jdbcType=TIMESTAMP},
 #{modified,jdbcType=TIMESTAMP},
 #{isconceive,jdbcType=INTEGER},
-#{hospitalId,jdbcType=VARCHAR}
+#{hospitalId,jdbcType=VARCHAR},
+#{endPregnancy,jdbcType=INTEGER}
 )
 
     </insert>
@@ -133,8 +135,6 @@ hospitalid
             <if test="folviteId != null and folviteId != ''">
                 and folvite_id=#{folviteId}
             </if>
-
-
         </where>
 
 
@@ -180,7 +180,10 @@ hospitalid
                 modified=#{modified,jdbcType=TIMESTAMP},
             </if>
             <if test="isconceive != null">
-                isconceive=#{isconceive,jdbcType=INTEGER}
+                isconceive=#{isconceive,jdbcType=INTEGER},
+            </if>
+            <if test="endPregnancy != null and endPregnancy !=''">
+                end_pregnancy=#{endPregnancy,jdbcType=INTEGER}
             </if>
 
         </set>
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 2523b62..cdbfee3 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
@@ -52,6 +52,19 @@ public class FolviteReceiveRecordModel {
     private String hospitalId;
 
 
+    //是否完结 0 为完结 1 已完结
+    private Integer endPregnancy;
+
+
+    public Integer getEndPregnancy() {
+        return endPregnancy;
+    }
+
+
+    public void setEndPregnancy(Integer endPregnancy) {
+        this.endPregnancy = endPregnancy;
+    }
+
     public String getHospitalId() {
         return hospitalId;
     }
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 1a961fc..1c034a4 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
@@ -84,6 +84,7 @@ public class FolviteController extends BaseController {
         return folviteService.queryFolviteOne(id);
     }
 
+
     /**
      * 添加叶酸发放记录
      *
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 0d50de9..d81ab86 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
@@ -147,10 +147,12 @@ public class FolviteServiceImpl implements FolviteService {
             recordModel.setHospitalId(hospitalId);
             recordModel.setCreated(new Date());
             recordModel.setModify(new Date());
+            recordModel.setIspregnancy(0);
             folviteMapper.saveFolvite(recordModel);
         } else {
             recordModel.setHospitalId(hospitalId);
             recordModel.setModify(new Date());
+            recordModel.setIspregnancy(0);
             folviteMapper.updateFolvite(recordModel);
         }
         BaseResponse response = new BaseResponse();
@@ -178,6 +180,14 @@ public class FolviteServiceImpl implements FolviteService {
             receiveRecordModel.setModified(new Date());
             receiveMapper.saveFolviteReceive(receiveRecordModel);
         }
+        //表示本次孕次已完结
+        if (receiveRecordModel.getEndPregnancy() == 1) {
+            FolviteRecordModel recordModel = new FolviteRecordModel();
+            recordModel.setModify(new Date());
+            recordModel.setIspregnancy(receiveRecordModel.getEndPregnancy());
+            recordModel.setId(receiveRecordModel.getFolviteId());
+            folviteMapper.updateFolvite(recordModel);
+        }
         BaseResponse response = new BaseResponse();
         response.setObject(receiveRecordModel.getId());
         return response;
@@ -290,6 +300,9 @@ public class FolviteServiceImpl implements FolviteService {
             m.put("name", map.get("name"));
             m.put("address", CommonsHelper.getResidence(map.get("habitation_province").toString(), map.get("habitation_city").toString(),
                     map.get("habitation_area").toString(), map.get("habitation_country").toString(), map.get("habitation_address").toString(), basicConfigService));
+            m.put("id", map.get("id"));
+            m.put("folviteId", map.get("folviteId"));
+
             data.add(m);
         }
         return data;
-- 
1.8.3.1