jiangjiazhi / yimiao

Authored by landong2015 over 9 years ago

Exists in master

Showing 3 changed files with 5 additions and 11 deletions

...	...	@@ -156,7 +156,7 @@
156	156	CCC.CNT
157	157	FROM med_InoculateRecord B
158	158	INNER JOIN med_Vaccineinfo C ON B.IC_VACCINEID=C.VI_ID AND C.ISDELETE=1
159		- INNER JOIN med_VaccineName A ON C.VI_VACCINENAMEID=A.VN_ID AND A.ISDELETE=1
	159	+ INNER JOIN med_VaccineName A ON C.VI_VACCINENAMEID=A.VN_ID AND A.ISDELETE=1 AND A.VN_ISINPLAN = 1
160	160	INNER JOIN MED_KIDS D ON B.IC_KIDID=D.KI_ID
161	161	INNER JOIN (SELECT AA.VN_NAME,COUNT(DISTINCT b.column_value) AS CNT
162	162	FROM med_VaccineName AA, table(splitstr(AA.VN_MONTHAGE, ',')) b

...	...	@@ -38,7 +38,7 @@
38	38
39	39	<sql id="MedVaccineNameCondition">
40	40	<where>
41		- 1 = 1 and VN_ISINPLAN = 2
	41	+ 1 = 1 and VN_ISINPLAN = 1
42	42	<if test="vnId != null and vnId != ''">
43	43	and vn_id = #{vnId,jdbcType=VARCHAR}
44	44	</if>
...	...	@@ -101,7 +101,7 @@
101	101	FROM med_VaccineName , table(splitstr(VN_MONTHAGE, ',')) b
102	102	WHERE VN_MONTHAGE IS NOT NULL
103	103	AND ISDELETE = 1
104		- AND VN_ISINPLAN = 2
	104	+ AND VN_ISINPLAN = 1
105	105	ORDER BY MONTH_AGE,VN_VACCINETYPE
106	106	</select>
107	107

...	...	@@ -69,19 +69,13 @@
69	69	</property>
70	70	</bean>
71	71
72		- <!-- mommybaby数据库 -->
73		-
74		-
75		-
76		-
77		-
78		-
79	72	<!-- manage transaction -->
80	73	<bean id="mainTransactionManager"
81	74	class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
82	75	<property name="dataSource" ref="mainDataSource" />
83	76	</bean>
84		-
	77	+
	78	+
85	79	<tx:annotation-driven transaction-manager="mainTransactionManager"/>
86	80
87	81	<!-- Mabatis Data Layer -->