From ec91480911cd19f1b7e86e151458649b3eba269a Mon Sep 17 00:00:00 2001
From: fangcheng <fangcheng@lymsh.com>
Date: Wed, 17 May 2017 16:18:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/controller/CouponPrintController.java | 5 +++--
 platform-operate-api/src/main/resources/rebel.xml                   | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

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 cd4cace..a3d5db0 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
@@ -45,12 +45,13 @@ public class CouponPrintController {
     public BaseObjectResponse printTrigger(HttpServletRequest request) {
         if(shanDong_DeZhou_fuYou_hopitalId.equals(request.getParameter("hospitalId"))){//山东德州妇幼
         	Patients patient =    patientsService.findOnePatientById(request.getParameter("patientUserId"));
-        	String cardType = request.getParameter("cardType");
+        	String area = request.getParameter("area");
         	String sendPersonName = request.getParameter("sendPersonName");
         	String patientUserName = patient.getUsername();//领卡人
         	String cardNum = patient.getVcCardNo();//就诊卡号
         	String sendReason = "孕产婴软件："+patientUserName+"， 孕检代金券";//发卡原因
-            String remark = cardType + "代金券,产检代金券禁止其他使用";//备注
+        	String cardType = area + "代金券";
+            String remark = area + "代金券,产检代金券禁止其他使用";//备注
             String JSFS = "孕检代金券";//结算方式
             Integer KMJE = Integer.parseInt(shanDong_Dezhou_youHuiQuan_money_Number);//卡面金额
             Integer XSJE =0;// 销售金额
diff --git a/platform-operate-api/src/main/resources/rebel.xml b/platform-operate-api/src/main/resources/rebel.xml
index 149fd02..f73dc5c 100644
--- a/platform-operate-api/src/main/resources/rebel.xml
+++ b/platform-operate-api/src/main/resources/rebel.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://www.zeroturnaround.com/alderaan/rebel-2_0.xsd">
+<application generated-by="eclipse" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">
 
 	<classpath>
-		<dir name="D:/lyms_wrok/regional/regional-platform/platform-operate-api/target/classes">
+		<dir name="E:/Workspaces-lyms/regional-platform/platform-operate-api/target/classes">
 		</dir>
 	</classpath>
 
 	<web>
 		<link target="/">
-			<dir name="D:/lyms_wrok/regional/regional-platform/platform-operate-api/src/main/webapp">
+			<dir name="E:/Workspaces-lyms/regional-platform/platform-operate-api/src/main/webapp">
 			</dir>
 		</link>
 	</web>
-- 
1.8.3.1