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> findTemp(Map map); - String findTopName(String hospitalId); + List> findTopName(String hospitalId); List> findInfo(Map 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 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 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> couponInfos = couponMapper.findInfo(param); for (Map 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 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}