jiangjiazhi / regional-platform

Authored by Administrator about 6 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 33 additions and 3 deletions

...	...	@@ -95,7 +95,9 @@
95	95	<include refid="orderAndLimit"/>
96	96	</select>
97	97
98		- <select id="listCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery" resultType="java.lang.Integer">
	98	+ <select id="listCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery"
	99	+ resultType="java.lang.Integer">
	100	+ select count(1) from (
99	101	SELECT
100	102	count(1)
101	103	FROM
...	...	@@ -126,6 +128,10 @@
126	128	AND <![CDATA[ f.drawTime < date_format(#{endDrawTime},'%Y-%m-%d') ]]>
127	129	</if>
128	130	</where>
	131	+
	132	+ ) t
	133	+
	134	+
129	135	</select>
130	136
131	137	<select id="queyFolviteReceiveCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery"
132	138
...	...	@@ -187,12 +193,13 @@
187	193	<if test="isconceive != null">
188	194	isconceive=#{isconceive,jdbcType=INTEGER},
189	195	</if>
190		- <if test="endPregnancy != null and endPregnancy !=''">
	196	+ <if test="endPregnancy != null ">
191	197	end_pregnancy=#{endPregnancy,jdbcType=INTEGER},
192	198	</if>
193	199	<if test="yn ! = null">
194	200	yn=#{yn}
195	201	</if>
	202	+
196	203	</set>
197	204	</sql>
198	205

...	...	@@ -169,7 +169,17 @@
169	169	return baseResponse;
170	170	}
171	171
172		-
	172	+ /**
	173	+ * 查询发放列表
	174	+ *
	175	+ * @param queryNo
	176	+ * @param hospitalId
	177	+ * @param receiveDate
	178	+ * @param highRisk
	179	+ * @param page
	180	+ * @param limit
	181	+ * @return
	182	+ */
173	183	@RequestMapping(value = "/queryFolviteRecord", method = RequestMethod.GET)
174	184	@ResponseBody
175	185	@TokenRequired
...	...	@@ -210,6 +220,12 @@
210	220	return response;
211	221	}
212	222
	223	+ /**
	224	+ * 删除
	225	+ *
	226	+ * @param id
	227	+ * @return
	228	+ */
213	229	@RequestMapping(value = "deleteReceive/{id}", method = RequestMethod.DELETE)
214	230	@ResponseBody
215	231	@TokenRequired
...	...	@@ -218,6 +234,12 @@
218	234	return folviteService.deleteProvide(id);
219	235	}
220	236
	237	+ /**
	238	+ * 获取详情
	239	+ *
	240	+ * @param id
	241	+ * @return
	242	+ */
221	243	@RequestMapping(value = "querFolviteRecordInfo/{id}", method = RequestMethod.GET)
222	244	@ResponseBody
223	245	@TokenRequired

...	...	@@ -192,6 +192,7 @@
192	192	folviteResult.setHospitalIdStr(hospital);
193	193
194	194	} catch (Exception e) {
	195	+
195	196	}
196	197	}
197	198	BaseResponse response = new BaseResponse();