From 7d7d51b4c3eb54bd40fa46d3a89faf387cb54015 Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Tue, 16 May 2017 14:50:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=88=B0=E4=BC=98=E6=83=A0=E5=88=B8=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/permission/dao/master/CouponMapper.java |  2 +-
 .../service/impl/BabyPatientExtendEarServiceImpl.java         |  4 ++--
 .../platform/permission/service/impl/CouponServiceImpl.java   |  3 ++-
 .../src/main/resources/mainOrm/master/CouponMapper.xml        |  6 +++---
 .../main/java/com/lyms/platform/common/utils/EnumUtil.java    |  7 +++----
 .../platform/operate/web/controller/CouponController.java     | 11 ++++++-----
 .../lyms/platform/operate/web/controller/EarController.java   |  5 -----
 7 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java
index 4ccf4e8..89fb83f 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java
@@ -18,7 +18,7 @@ public interface CouponMapper {
 
     List<Map<String,Object>> findTemp(Map<String, Object> map);
 
-    String findTopName(String hospitalId);
+    List<Map<String,Object>> findTopName(String hospitalId);
 
     List<Map<String,Object>> findInfo(Map<String, Object> param);
 
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarServiceImpl.java
index 995eafa..dee8eaf 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarServiceImpl.java
@@ -45,8 +45,8 @@ public class BabyPatientExtendEarServiceImpl implements BabyPatientExtendEarServ
     @Override
     public BaseObjectResponse getConfigs() {
         Map<String, Object> restMap = new HashMap<>();
-        restMap.put("fmType", EnumUtil.buildEnumJson(FmTypeEnums.class)); /** 分娩方式 */
-        restMap.put("aborType", EnumUtil.buildEnumJson(AbortionEnums.class)); /** 流产方式 */
+        restMap.put("fmType", EnumUtil.toJson(FmTypeEnums.class)); /** 分娩方式 */
+        restMap.put("aborType", EnumUtil.toJson(AbortionEnums.class)); /** 流产方式 */
         List<BasicConfig> basicConfigs = mongoTemplate.find(Query.query(Criteria.where("").is("")), BasicConfig.class);
 
 
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 5fa8f01..14c4465 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
@@ -445,7 +445,8 @@ public class CouponServiceImpl implements CouponService {
         restMap.put("topName", couponMapper.findTopName(hospitalId));
         List<Map<String, Object>> couponInfos = couponMapper.findInfo(param);
         for (Map<String,Object> map : couponInfos) {
-            map.put("url", PropertiesUtil.getInstance().getDefault("or.code.url", map.get("sequence_id").toString()));
+//            map.put("url", PropertiesUtil.getInstance().getDefault("or.code.url", map.get("sequence_id").toString()));
+            map.put("url", findUrl(map.get("sequence_id").toString()));
         }
         restMap.put("couponInfos", couponInfos);
         return RespBuilder.buildSuccess(restMap);
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
index cac02e8..5db436b 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -50,14 +50,14 @@
         order by b.coupon_order
     </select>
 
-    <select id="findTopName" parameterType="string" resultType="string">
-        select b.name
+    <select id="findTopName" parameterType="string" resultType="map">
+        select b.name, a.coupon_desc, a.img_base64
         from hospital_coupon_template_group a, coupon_template_group b
         where a.coupon_template_group_id = b.id and a.hospital_id = #{hospital_id}
     </select>
 
     <select id="findInfo" parameterType="map" resultType="map">
-        select a.create_date, d.coupon_desc, d.img_base64, b.name, b.title, b.show_start, b.show_end, b.unit_type, b.content, a.sequence_id, a.status
+        select a.create_date, b.name, b.title, b.show_start, b.show_end, b.unit_type, b.content, a.sequence_id, a.status
         from coupon_info a, coupon_template b, coupon_type c, hospital_coupon_template_group d
         where a.user_id = #{userId} and a.create_hospital_id = #{hospitalId} and a.coupon_template_id = b.id and b.type_id=c.id and d.hospital_id = #{hospitalId}
         order by c.type, b.coupon_order
diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/EnumUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/EnumUtil.java
index 6018a5a..0658305 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/EnumUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/EnumUtil.java
@@ -1,6 +1,5 @@
 package com.lyms.platform.common.utils;
 
-import com.lyms.platform.common.enums.FmTypeEnums;
 import org.apache.commons.beanutils.PropertyUtils;
 
 import java.security.InvalidParameterException;
@@ -19,11 +18,11 @@ public class EnumUtil {
     private static final String DEFAULT_KEY_NAME = "id";
     private static final String DEFAULT_VALUE_NAME = "name";
 
-    public static <T> List<Map<String, Object>> buildEnumJson(Class<T> clazz) {
-        return buildEnumJson(clazz, DEFAULT_KEY_NAME, DEFAULT_VALUE_NAME);
+    public static <T> List<Map<String, Object>> toJson(Class<T> clazz) {
+        return toJson(clazz, DEFAULT_KEY_NAME, DEFAULT_VALUE_NAME);
     }
 
-    public static <T> List<Map<String, Object>> buildEnumJson(Class<T> clazz, String codeName, String valueName) {
+    public static <T> List<Map<String, Object>> toJson(Class<T> clazz, String codeName, String valueName) {
         List<Map<String, Object>> list = new ArrayList<>();
 
         if (!clazz.isEnum()) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java
index e4cd4e4..3dd253e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java
@@ -1,12 +1,13 @@
 package com.lyms.platform.operate.web.controller;
 
+import com.lyms.platform.biz.service.PatientsService;
 import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.base.BaseController;
 import com.lyms.platform.common.base.LoginContext;
 import com.lyms.platform.common.result.BaseObjectResponse;
+import com.lyms.platform.common.result.RespBuilder;
 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
 import com.lyms.platform.permission.service.CouponService;
-import com.lyms.platform.pojo.PatientCheckTicket;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -39,6 +40,8 @@ public class CouponController extends BaseController {
     @Autowired
     private MongoTemplate mongoTemplate;
 
+    @Autowired
+    private PatientsService patientsService;
     /**
      * 创建用户产检券
      * @param userId
@@ -80,10 +83,8 @@ public class CouponController extends BaseController {
     @RequestMapping(method = RequestMethod.POST, value = "/test")
     @ResponseBody
     public BaseObjectResponse testUse() {
-        PatientCheckTicket ticket = new PatientCheckTicket();
-        mongoTemplate.save(ticket);
-        System.err.println("ticket > " + ticket + " : " + ticket.getId());
-        return null;
+//        patientsService.
+        return RespBuilder.buildSuccess();
     }
 
     /**
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
index 6bbf2c9..c9aeb55 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
@@ -54,9 +54,4 @@ public class EarController extends BaseController {
         return babyPatientExtendEarService.getConfigs();
     }
 
-    @RequestMapping("/test")
-    @ResponseBody
-    public BaseObjectResponse test() {
-        return RespBuilder.buildSuccess(EnumUtil.buildEnumJson(FmTypeEnums.class));
-    }
 }
-- 
1.8.3.1