From 35083ae5e1dbd410d79fd1d5b2817c8a6ffbc100 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Sat, 27 May 2023 16:51:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E5=8F=91=E6=94=BE?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/permission/service/impl/CouponServiceImpl.java    |  6 +++++-
 .../src/main/java/com/lyms/platform/common/utils/DateUtil.java |  1 +
 .../com/lyms/platform/operate/web/request/AntExAddRequest.java | 10 ++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
index 3030197..30dc8fd 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
@@ -18,6 +18,7 @@ import com.lyms.platform.permission.model.WeixinQrcodeConfig;
 import com.lyms.platform.permission.model.WeixinQrcodeConfigQuery;
 import com.lyms.platform.permission.service.CouponService;
 import com.lyms.platform.permission.service.OrganizationService;
+import com.lyms.platform.permission.service.UsersService;
 import com.lyms.platform.permission.service.WeixinQrcodeConfigService;
 import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.AntExRecordQuery;
@@ -48,6 +49,8 @@ public class CouponServiceImpl implements CouponService {
 
     private Logger logger = LoggerFactory.getLogger(CouponServiceImpl.class);
 
+    @Autowired
+    private UsersService usersService;
     /**
      * 1 = 孕妇
      */
@@ -307,12 +310,13 @@ public class CouponServiceImpl implements CouponService {
     }
 
     private void sendCoupon(List<Map<String, Object>> temps, String hospitalId, Integer createUserId, String userId, Integer personType, String areaCode) {
+        String chid = usersService.getUsers(createUserId).getOrgId().toString();
         for (Map<String, Object> temp : temps) {
             Object sendType = temp.get("send_type");
             if (sendType != null) {/** 1=全部发放 2=按有效时间发放 */
                 CouponInfo couponInfo = new CouponInfo();
                 couponInfo.setCreateDate(new Date());
-                couponInfo.setCreateHospitalId(hospitalId);
+                couponInfo.setCreateHospitalId(chid);
                 couponInfo.setCreateUserId(String.valueOf(createUserId));
                 couponInfo.setSequenceId(genIdService.poll(areaCode));
                 couponInfo.setStatus(1);
diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
index 832bf81..9128369 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
@@ -1962,6 +1962,7 @@ public class DateUtil {
 
 
    public static void main(String[] args) {
+       System.out.println(DateUtil.addDay(new Date(),-20).getTime());
    }
 
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
index b1f6ebf..794801a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
@@ -430,6 +430,16 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
     //秦皇岛定制字段：是否产筛 0：未产筛   1：已产筛
     public Integer productionSieveType;
 
+    private String height;
+
+    public String getHeight() {
+        return height;
+    }
+
+    public void setHeight(String height) {
+        this.height = height;
+    }
+
     public Integer getProductionSieveType() {
         return productionSieveType;
     }
-- 
1.8.3.1