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

---
 .../resources/mainOrm/master/FolviteMapper.xml     |  7 ++++++-
 .../mainOrm/master/FolviteReceiveMapper.xml        | 13 ++++++++----
 .../operate/web/controller/FolviteController.java  | 24 +++++++++++-----------
 .../web/service/impl/FolviteServiceImpl.java       |  6 ++++--
 4 files changed, 31 insertions(+), 19 deletions(-)

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 3c61cbb..13f4c15 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
@@ -138,6 +138,9 @@
         lyms_folvite_Info f ON p.folvite_id = f.id
         <where>
             1=1
+            <if test="yn != null">
+              and  p.yn=#{yn}
+            </if>
             <if test="queryNo !=null and queryNo != ''">
                 and f.name =#{queryNo} or f.card_no=#{queryNo} or f.phone=#{queryNo}
             </if>
@@ -168,6 +171,9 @@
         lyms_folvite_Info f ON p.folvite_id = f.id
         <where>
             1=1
+            <if test="yn != null">
+              and   p.yn=#{yn}
+            </if>
             <if test="queryNo !=null and queryNo != ''">
                 and f.name =#{queryNo} or f.card_no=#{queryNo} or f.phone=#{queryNo}
             </if>
@@ -186,7 +192,6 @@
         </where>
     </select>
 
-
     <select id="queryFolviteListCount" parameterType="com.lyms.platform.permission.model.FolviteQuery"
             resultType="java.lang.Integer">
         select count(id) from lyms_folvite_Info
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 df5e6b8..904da2b 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
@@ -7,6 +7,7 @@
         <result column="folvite_id" property="folviteId"/>
         <result column="receive_number" property="receiveNumber"/>
         <result column="receive_week" property="receiveWeek"/>
+        <result column="receive_week" property="receiveWeek"/>
         <result column="highrisk" property="highrisk"/>
         <result column="provide_unit" property="provideUnit"/>
         <result column="issuer" property="issuer"/>
@@ -69,7 +70,7 @@ yn
         <where>
             1=1
             <if test="yn != null">
-                and yn=#{yn}
+                and p.yn=#{yn}
             </if>
             <if test="queryNo != null and queryNo != ''">
                 and f.`name` =#{queryNo} or f.phone=#{queryNo} or f.card_no =#{queryNo} or f.vc_card=#{queryNo}
@@ -107,7 +108,7 @@ yn
         <where>
             1=1
             <if test="yn != null">
-                and yn=#{yn}
+                and p.yn=#{yn}
             </if>
             <if test="queryNo != null and queryNo != ''">
                 and f.`name` =#{queryNo} or f.phone=#{queryNo} or f.card_no =#{queryNo} or f.vc_card=#{queryNo}
@@ -131,7 +132,6 @@ yn
         GROUP BY p.folvite_id
         ) t
 
-
     </select>
 
     <select id="queyFolviteReceiveCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery"
@@ -146,6 +146,11 @@ yn
             <if test="folviteId != null and folviteId != ''">
                 and folvite_id=#{folviteId}
             </if>
+            <if test="yn != null">
+                and yn=#{yn}
+            </if>
+
+
         </where>
 
 
@@ -196,7 +201,7 @@ yn
             <if test="endPregnancy != null ">
                 end_pregnancy=#{endPregnancy,jdbcType=INTEGER},
             </if>
-            <if test="yn ! = null">
+            <if test="yn != null">
                 yn=#{yn}
             </if>
 
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 33b5214..19c68ff 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
@@ -76,7 +76,7 @@ public class FolviteController extends BaseController {
      * @param id
      * @return
      */
-    @RequestMapping(value = "queryFolviteOne/{id}", method = RequestMethod.GET)
+    @RequestMapping(value = "/queryFolviteOne/{id}", method = RequestMethod.GET)
     @ResponseBody
     @TokenRequired
     public BaseResponse queryFolviteOne(@PathVariable("id") String id) {
@@ -92,7 +92,7 @@ public class FolviteController extends BaseController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "saveOrUpdateProvideFolvite", method = RequestMethod.POST)
+    @RequestMapping(value = "/saveOrUpdateProvideFolvite", method = RequestMethod.POST)
     @ResponseBody
     @TokenRequired
     public BaseResponse saveProvideFolvite(@Valid @RequestBody FolviteReceiveRecordModel receiveModel, HttpServletRequest request) {
@@ -107,7 +107,7 @@ public class FolviteController extends BaseController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "queryOneProvide/{id}", method = RequestMethod.GET)
+    @RequestMapping(value = "/queryOneProvide/{id}", method = RequestMethod.GET)
     @ResponseBody
     @TokenRequired
     public BaseResponse queryOneProvide(@PathVariable("id") String id, HttpServletRequest request) {
@@ -126,7 +126,7 @@ public class FolviteController extends BaseController {
     @TokenRequired
     public BaseResponse queryFolviteList(@Param("queryNo") String queryNo,
                                          @Param("isconceive") Integer isconceive,
-                                         @Param("receiveDate") String receiveDate,
+                                         @Param("receiveTime") String receiveTime,
                                          @Param("drawTime") String drawTime,
                                          @Param("page") Integer page,
                                          @Param("limit") Integer limit) {
@@ -136,10 +136,10 @@ public class FolviteController extends BaseController {
         if (null != isconceive) {
             query.setIsconceive(isconceive);
         }
-        if (StringUtils.isNotEmpty(receiveDate)) {
+        if (StringUtils.isNotEmpty(receiveTime)) {
             try {
-                query.setStartReceiveDate(DateUtil.getSNDate(receiveDate)[0]);
-                query.setEndReceiveDate(DateUtil.getSNDate(receiveDate)[1]);
+                query.setStartReceiveDate(DateUtil.getSNDate(receiveTime)[0]);
+                query.setEndReceiveDate(DateUtil.getSNDate(receiveTime)[1]);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -174,7 +174,7 @@ public class FolviteController extends BaseController {
      *
      * @param queryNo
      * @param hospitalId
-     * @param receiveDate
+
      * @param highRisk
      * @param page
      * @param limit
@@ -185,7 +185,7 @@ public class FolviteController extends BaseController {
     @TokenRequired
     public BaseResponse queryFolviteRecord(@Param("queryNo") String queryNo,
                                            @Param("hospitalId") String hospitalId,
-                                           @Param("receiveDate") String receiveDate,
+                                           @Param("receiveTime") String receiveTime,
                                            @Param("highRisk") String highRisk,
                                            @Param("page") Integer page,
                                            @Param("limit") Integer limit) {
@@ -197,10 +197,10 @@ public class FolviteController extends BaseController {
         if (StringUtils.isNotEmpty(hospitalId)) {
             query.setHospitalId(hospitalId);
         }
-        if (StringUtils.isNotEmpty(receiveDate)) {
+        if (StringUtils.isNotEmpty(receiveTime)) {
             try {
-                query.setStartReceiveDate(DateUtil.getSNDate(receiveDate)[0]);
-                query.setEndReceiveDate(DateUtil.getSNDate(receiveDate)[1]);
+                query.setStartReceiveDate(DateUtil.getSNDate(receiveTime)[0]);
+                query.setEndReceiveDate(DateUtil.getSNDate(receiveTime)[1]);
             } catch (Exception e) {
                 e.printStackTrace();
             }
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 f128202..f0669f8 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
@@ -100,6 +100,7 @@ public class FolviteServiceImpl implements FolviteService {
             }
             FolviteRecordQuery recordQuery = new FolviteRecordQuery();
             recordQuery.setFolviteId(queryOne.getId());
+            recordQuery.setYn(YnEnums.YES.getId());
             recordQuery.setSort("receive_date asc");
             List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery);
             if (CollectionUtils.isNotEmpty(folviteRecordModels)) {
@@ -171,7 +172,7 @@ public class FolviteServiceImpl implements FolviteService {
                 BeanUtils.copyProperties(folviteRecordModel, folviteResult);
                 folviteResult.setNationalityStr(getBasicConfig(folviteRecordModel.getNationality()));
                 folviteResult.setNationStr(getBasicConfig(folviteRecordModel.getNation()));
-                folviteResult.setMaritalStatusStr(FunvCommonUtil.getBaseicConfigByid(folviteResult.getMaritalStatusStr(), basicConfigService));
+                folviteResult.setMaritalStatusStr(FunvCommonUtil.getBaseicConfigByid(folviteResult.getMaritalStatus(), basicConfigService));
                 folviteResult.setCertificateTypeStr(FunvCommonUtil.getBaseicConfigByid(folviteResult.getCertificateType(), basicConfigService));
                 folviteResult.setCensusTypeStr(FunvCommonUtil.getBaseicConfigByid(folviteResult.getCensusType(), basicConfigService));
                 folviteResult.setLiveTypeStr(FunvCommonUtil.getBaseicConfigByid(folviteRecordModel.getLiveType(), basicConfigService));
@@ -180,7 +181,7 @@ public class FolviteServiceImpl implements FolviteService {
                 folviteResult.setUserNameStr(usersService.getUsers(Integer.valueOf(folviteRecordModel.getOperationDoctor())).getName());
                 folviteResult.setHabitationAddressStr(CommonsHelper.getResidence(folviteRecordModel.getHabitationProvince(), folviteRecordModel.getHabitationCity(),
                         folviteRecordModel.getHabitationArea(), folviteRecordModel.getHabitationCountry(), folviteRecordModel.getHabitationAddress(), basicConfigService));
-                folviteResult.setHabitationAddressStr(CommonsHelper.getResidence(folviteRecordModel.getDomicileProvince(), folviteRecordModel.getDomicileCity(),
+                folviteResult.setDomicileAddressStr(CommonsHelper.getResidence(folviteRecordModel.getDomicileProvince(), folviteRecordModel.getDomicileCity(),
                         folviteRecordModel.getDomicileArea(), folviteRecordModel.getDomicileCountry(), folviteRecordModel.getDomicileAddress(), basicConfigService));
                 String hospital = "";
                 if (org.apache.commons.lang.StringUtils.isNotEmpty(folviteRecordModel.getHospitalId())) {
@@ -287,6 +288,7 @@ public class FolviteServiceImpl implements FolviteService {
         }
         FolviteRecordQuery recordQuery = new FolviteRecordQuery();
         recordQuery.setFolviteId(queryOne.getId());
+        recordQuery.setYn(YnEnums.YES.getId());
         recordQuery.setSort("receive_date asc");
         List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery);
         if (CollectionUtils.isNotEmpty(folviteRecordModels)) {
-- 
1.8.3.1