jiangjiazhi / regional-platform

Commit d674a24a45725d6f25545341be35a0e605556554

Authored by jesse.wang about 2 years ago

Exists in master and in 4 other branches

孤独症初筛复筛接口

Showing 4 changed files with 22 additions and 16 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyAutismPrimaryScreeningService.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyAutismPrimaryScreeningServiceImpl.java
platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java

...	...	@@ -61,5 +61,6 @@
61	61	*/
62	62	List<BabyAutismPrimaryScreening> queryListByBabyId(String babyId);
63	63
	64	+ Long count(BabyAutismPrimaryScreening babyAutismPrimaryScreening, BaseQuery pageRequest);
64	65	}

...	...	@@ -40,7 +40,6 @@
40	40	*/
41	41	@Override
42	42	public List<BabyAutismPrimaryScreening> queryByPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, BaseQuery pageRequest) {
43		- long total = this.babyAutismPrimaryScreeningDao.count(babyAutismPrimaryScreening);
44	43	return this.babyAutismPrimaryScreeningDao.queryAllByLimit(babyAutismPrimaryScreening, pageRequest);
45	44	}
46	45
...	...	@@ -88,6 +87,11 @@
88	87	@Override
89	88	public List<BabyAutismPrimaryScreening> queryListByBabyId(String babyId) {
90	89	return babyAutismPrimaryScreeningDao.queryListByBabyId(babyId);
	90	+ }
	91	+
	92	+ @Override
	93	+ public Long count(BabyAutismPrimaryScreening babyAutismPrimaryScreening, BaseQuery pageRequest) {
	94	+ return this.babyAutismPrimaryScreeningDao.count(babyAutismPrimaryScreening);
91	95	}
92	96	}

...	...	@@ -274,30 +274,30 @@
274	274	</select>
275	275
276	276	<!--新增所有列-->
277		- <insert id="insert" keyProperty="id" useGeneratedKeys="true">
278		- insert into baby_autism_primary_screening(created, modified, yn, operater_id, hospital_id, baby_id,
	277	+ <insert id="insert" >
	278	+ insert into baby_autism_primary_screening(id,created, modified, yn, operater_id, hospital_id, baby_id,
279	279	baby_build_date, baby_name, baby_sex, baby_m_name, baby_f_name,
280	280	baby_m_phone, baby_f_phone, baby_m_cert_no, baby_f_cert_no, pid,
281	281	check_month_age, check_month_id, birth, check_time, next_check_time,
282	282	check_doctor, doctor_sign, patient_sign, guidance_opinions,
283	283	handle_opinions, warning_signs, language_social,
284	284	preliminary_screening_results)
285		- values (#{created}, #{modified}, #{yn}, #{operaterId}, #{hospitalId}, #{babyId}, #{babyBuildDate}, #{babyName},
	285	+ values (#{id},#{created}, #{modified}, #{yn}, #{operaterId}, #{hospitalId}, #{babyId}, #{babyBuildDate}, #{babyName},
286	286	#{babySex}, #{babyMName}, #{babyFName}, #{babyMPhone}, #{babyFPhone}, #{babyMCertNo}, #{babyFCertNo},
287	287	#{pid}, #{checkMonthAge}, #{checkMonthId}, #{birth}, #{checkTime}, #{nextCheckTime}, #{doctor},
288	288	#{doctorSign}, #{patientSign}, #{guidanceOpinions}, #{handleOpinions}, #{entity.warningSignstring},
289	289	#{entity.languageSocialstirng}, #{entity.global})
290	290	</insert>
291	291
292		- <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
293		- insert into baby_autism_primary_screening(created, modified, yn, operater_id, hospital_id, baby_id,
	292	+ <insert id="insertBatch" >
	293	+ insert into baby_autism_primary_screening(id,created, modified, yn, operater_id, hospital_id, baby_id,
294	294	baby_build_date, baby_name, baby_sex, baby_m_name, baby_f_name, baby_m_phone, baby_f_phone, baby_m_cert_no,
295	295	baby_f_cert_no, pid, check_month_age, check_month_id, birth, check_time, next_check_time, check_doctor,
296	296	doctor_sign, patient_sign, guidance_opinions, handle_opinions, warning_signs, language_social,
297	297	preliminary_screening_results)
298	298	values
299	299	<foreach collection="entities" item="entity" separator=",">
300		- (#{entity.created}, #{entity.modified}, #{entity.yn}, #{entity.operaterId}, #{entity.hospitalId},
	300	+ (#{entity.id},#{entity.created}, #{entity.modified}, #{entity.yn}, #{entity.operaterId}, #{entity.hospitalId},
301	301	#{entity.babyId}, #{entity.babyBuildDate}, #{entity.babyName}, #{entity.babySex}, #{entity.babyMName},
302	302	#{entity.babyFName}, #{entity.babyMPhone}, #{entity.babyFPhone}, #{entity.babyMCertNo},
303	303	#{entity.babyFCertNo}, #{entity.pid}, #{entity.checkMonthAge}, #{entity.checkMonthId}, #{entity.birth},
304	304
...	...	@@ -307,15 +307,15 @@
307	307	</foreach>
308	308	</insert>
309	309
310		- <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
311		- insert into baby_autism_primary_screening(created, modified, yn, operater_id, hospital_id, baby_id,
	310	+ <insert id="insertOrUpdateBatch" >
	311	+ insert into baby_autism_primary_screening(id,created, modified, yn, operater_id, hospital_id, baby_id,
312	312	baby_build_date, baby_name, baby_sex, baby_m_name, baby_f_name, baby_m_phone, baby_f_phone, baby_m_cert_no,
313	313	baby_f_cert_no, pid, check_month_age, check_month_id, birth, check_time, next_check_time, check_doctor,
314	314	doctor_sign, patient_sign, guidance_opinions, handle_opinions, warning_signs, language_social,
315	315	preliminary_screening_results)
316	316	values
317	317	<foreach collection="entities" item="entity" separator=",">
318		- (#{entity.created}, #{entity.modified}, #{entity.yn}, #{entity.operaterId}, #{entity.hospitalId},
	318	+ (#{entity.id},#{entity.created}, #{entity.modified}, #{entity.yn}, #{entity.operaterId}, #{entity.hospitalId},
319	319	#{entity.babyId}, #{entity.babyBuildDate}, #{entity.babyName}, #{entity.babySex}, #{entity.babyMName},
320	320	#{entity.babyFName}, #{entity.babyMPhone}, #{entity.babyFPhone}, #{entity.babyMCertNo},
321	321	#{entity.babyFCertNo}, #{entity.pid}, #{entity.checkMonthAge}, #{entity.checkMonthId}, #{entity.birth},
322	322
...	...	@@ -359,10 +359,10 @@
359	359	<update id="update">
360	360	update baby_autism_primary_screening
361	361	<set>
362		- <if test="created != null and created != ''">
	362	+ <if test="created != null">
363	363	created = #{created},
364	364	</if>
365		- <if test="modified != null and modified != ''">
	365	+ <if test="modified != null">
366	366	modified = #{modified},
367	367	</if>
368	368	<if test="yn != null">
...	...	@@ -377,7 +377,7 @@
377	377	<if test="babyId != null and babyId != ''">
378	378	baby_id = #{babyId},
379	379	</if>
380		- <if test="babyBuildDate != null and babyBuildDate != ''">
	380	+ <if test="babyBuildDate != null">
381	381	baby_build_date = #{babyBuildDate},
382	382	</if>
383	383	<if test="babyName != null and babyName != ''">
384	384
385	385
...	...	@@ -413,13 +413,13 @@
413	413	<if test="checkMonthId != null and checkMonthId != ''">
414	414	check_month_id = #{checkMonthId},
415	415	</if>
416		- <if test="birth != null and birth != ''">
	416	+ <if test="birth != null">
417	417	birth = #{birth},
418	418	</if>
419		- <if test="checkTime != null and checkTime != ''">
	419	+ <if test="checkTime != null">
420	420	check_time = #{checkTime},
421	421	</if>
422		- <if test="nextCheckTime != null and nextCheckTime != ''">
	422	+ <if test="nextCheckTime != null">
423	423	next_check_time = #{nextCheckTime},
424	424	</if>
425	425	<if test="doctor != null and doctor != ''">

...	...	@@ -158,6 +158,7 @@
158	158	}
159	159
160	160	public BaseResponse queryDateListPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, BaseQuery pageRequest, Integer id) {
	161	+ pageRequest.mysqlBuild(babyAutismPrimaryScreeningService.count(babyAutismPrimaryScreening, pageRequest).intValue());
161	162	List<BabyAutismPrimaryScreening> primaryScreeningPage = babyAutismPrimaryScreeningService.queryByPage(babyAutismPrimaryScreening, pageRequest);
162	163	for (BabyAutismPrimaryScreening primaryScreening : primaryScreeningPage) {
163	164	//查询医院