From b2ecbbea4b0163c5e5af957b62a8a5e5da885df0 Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Tue, 17 May 2016 16:21:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mainData/src/main/resources/mainOrm/MedVaccinename.xml  | 3 ++-
 webApi/src/main/resources/spring/applicationContext.xml | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/mainData/src/main/resources/mainOrm/MedVaccinename.xml b/mainData/src/main/resources/mainOrm/MedVaccinename.xml
index 2b41d79..04982a0 100644
--- a/mainData/src/main/resources/mainOrm/MedVaccinename.xml
+++ b/mainData/src/main/resources/mainOrm/MedVaccinename.xml
@@ -38,7 +38,7 @@ limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
 
 <sql id="MedVaccineNameCondition">
 <where>
- 1 = 1 
+ 1 = 1 and VN_ISINPLAN = 2
 <if test="vnId != null and vnId != ''">
 and vn_id = #{vnId,jdbcType=VARCHAR} 
 </if>
@@ -101,6 +101,7 @@ select count(1) from med_vaccinename
         FROM med_VaccineName , table(splitstr(VN_MONTHAGE, &apos;,&apos;)) b
         WHERE VN_MONTHAGE IS NOT NULL
         AND ISDELETE = 1
+        AND VN_ISINPLAN = 2
 		ORDER BY MONTH_AGE,VN_VACCINETYPE
     </select>
 
diff --git a/webApi/src/main/resources/spring/applicationContext.xml b/webApi/src/main/resources/spring/applicationContext.xml
index 62d7b43..9c23d08 100644
--- a/webApi/src/main/resources/spring/applicationContext.xml
+++ b/webApi/src/main/resources/spring/applicationContext.xml
@@ -69,6 +69,13 @@
 		</property>
 	</bean>
 
+	<!-- mommybaby数据库 -->
+
+
+
+
+
+
 	<!-- manage transaction -->
 	<bean id="mainTransactionManager"
 		class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-- 
1.8.3.1