From 8ff864d58bd252bbc375e3372a5b2226f88e9e74 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 2 Aug 2017 16:07:26 +0800
Subject: [PATCH] update code

---
 .../src/main/resources/mainOrm/master/CouponMapper.xml       |  2 +-
 .../operate/web/controller/CouponPrintController.java        | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

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 efd3d4f..d903275 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -502,7 +502,7 @@
 
 
     <select id="findCouponByCode" parameterType="Map" resultType="Map">
-        SELECT c.user_id as pId,t.coupon_order as couponOrder,m.type,date_format(c.create_date,'%Y-%m-%d') as createDate  from coupon_info c
+        SELECT c.create_hospital_id as createHospitalId,c.user_id as pId,t.coupon_order as couponOrder,m.type,date_format(c.create_date,'%Y-%m-%d') as createDate  from coupon_info c
         INNER JOIN coupon_template t on c.coupon_template_id  = t.id
         INNER JOIN coupon_type m on t.type_id =  m.id
         where c.sequence_id = #{code}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java
index 029fd45..99e97e4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java
@@ -152,13 +152,13 @@ public class CouponPrintController  extends BaseController{
             Patients patient = list.get(0);
             result.put("couponCode",code); //优惠劵
             result.put("createDate",couponInfo.get("createDate"));//发放时间
-            result.put("hospitalName",CommonsHelper.getHospitalName(patient.getHospitalId(), organizationService));//医院名称
+            result.put("hospitalName",CommonsHelper.getHospitalName(couponInfo.get("createHospitalId"), organizationService));//医院名称
             result.put("userName",patient.getUsername()); //用户名
             result.put("couponType",type.toString()); //优惠劵类型
 
             String areaName = "";
-            if (org.apache.commons.lang.StringUtils.isNotEmpty(patient.getHospitalId())) {
-                Organization organization = organizationService.getOrganization(Integer.parseInt(patient.getHospitalId()));
+            if (org.apache.commons.lang.StringUtils.isNotEmpty(couponInfo.get("createHospitalId"))) {
+                Organization organization = organizationService.getOrganization(Integer.parseInt(couponInfo.get("createHospitalId")));
                 if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
                     String areaId = organization.getAreaId();
                     BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(areaId);
@@ -207,7 +207,7 @@ public class CouponPrintController  extends BaseController{
 
         Object type = couponInfo.get("type");
         //验证优惠劵是否可以使用
-        BaseObjectResponse objectResponse = couponService.validateUse(code,Integer.parseInt(type.toString()),hospitalId);
+        BaseObjectResponse objectResponse = couponService.validateUse(code, Integer.parseInt(type.toString()),hospitalId);
         if (objectResponse.getErrorcode() != ResponseCode.SUCCESS.getCode())
         {
             return  objectResponse;
@@ -248,8 +248,8 @@ public class CouponPrintController  extends BaseController{
             model.setSerialNumber(order == null ? "0" : order.toString());
 
             String hospital = "";
-            if (org.apache.commons.lang.StringUtils.isNotEmpty(patient.getHospitalId())) {
-                Organization organization = organizationService.getOrganization(Integer.parseInt(patient.getHospitalId()));
+            if (org.apache.commons.lang.StringUtils.isNotEmpty(couponInfo.get("createHospitalId"))) {
+                Organization organization = organizationService.getOrganization(Integer.parseInt(couponInfo.get("createHospitalId")));
                 if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
                     hospital = organization.getName();
                     String areaId = organization.getAreaId();
-- 
1.8.3.1