jiangjiazhi / regional-platform

Commit 5829783af3cba9033528ed3a32e3bc6277afdf86

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

听力诊断模块

Showing 5 changed files with 67 additions and 28 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java
platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java

...	...	@@ -95,8 +95,11 @@
95	95	* 听筛月龄
96	96	*/
97	97	private String monthAge;
98		-
99	98	/**
	99	+ * 是否通过 1-通过 2-未通过
	100	+ */
	101	+ private Integer scrIspass;
	102	+ /**
100	103	* 诊断时间
101	104	*/
102	105	private Date referralDate;
...	...	@@ -112,6 +115,14 @@
112	115	private String lastUpdateUserId;
113	116	private String lastUpdateHospitalId;
114	117	private Integer status;
	118	+
	119	+ public Integer getScrIspass() {
	120	+ return scrIspass;
	121	+ }
	122	+
	123	+ public void setScrIspass(Integer scrIspass) {
	124	+ this.scrIspass = scrIspass;
	125	+ }
115	126
116	127	public Date getNextCheckTime() {
117	128	return nextCheckTime;

...	...	@@ -137,7 +137,17 @@
137	137	//筛查技术 1-AOE 2-AABR
138	138	private Integer srcSkill;
139	139
	140	+ //筛查结果 1通过 2-未通过
	141	+ private Integer scrIspass;
140	142
	143	+
	144	+ public Integer getScrIspass() {
	145	+ return scrIspass;
	146	+ }
	147	+
	148	+ public void setScrIspass(Integer scrIspass) {
	149	+ this.scrIspass = scrIspass;
	150	+ }
141	151
142	152	public Integer getSrcSkill() {
143	153	return srcSkill;

...	...	@@ -36,12 +36,13 @@
36	36	<result column="last_update_user_id" property="lastUpdateUserId" jdbcType="VARCHAR"/>
37	37	<result column="last_update_hospital_id" property="lastUpdateHospitalId" jdbcType="VARCHAR"/>
38	38	<result column="status" property="status" jdbcType="INTEGER"/>
	39	+ <result column="scr_ispass" property="scrIspass" jdbcType="INTEGER"/>
39	40	</resultMap>
40	41
41	42
42	43	<insert id="addBabyPatientExtendEarScreen"
43	44	parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarScreen">
44		-insert into baby_patient_extend_ear_screen (id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,rrna_1494,rrna_1555,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,next_check_time,last_update_date,last_update_user_id,last_update_hospital_id,status) values (#{id},#{babyId},#{screenType},#{checkHospitalId},#{screenDate},#{highRiskCause},#{oaeLeft},#{oaeRight},#{aabrLeft},#{aabrRight},#{gjb2Del35},#{gjb2Del176},#{gjb2Del235},#{gjb2Del299},#{gjb3Slc26a4538},#{gjb3Slc26a42168},#{gjb3Slc26a4Ivs7},#{rrna1494},#{rrna1555},#{processOptionType},#{processOptionDesc},#{guidOpinion},#{checkDoctorId},#{referralDate},#{createDate},#{createUserId},#{createHospitalId},#{nextCheckTime},#{lastUpdateDate},#{lastUpdateUserId},#{lastUpdateHospitalId},#{status})
	45	+insert into baby_patient_extend_ear_screen (id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,rrna_1494,rrna_1555,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,next_check_time,last_update_date,last_update_user_id,last_update_hospital_id,status,scr_ispass) values (#{id},#{babyId},#{screenType},#{checkHospitalId},#{screenDate},#{highRiskCause},#{oaeLeft},#{oaeRight},#{aabrLeft},#{aabrRight},#{gjb2Del35},#{gjb2Del176},#{gjb2Del235},#{gjb2Del299},#{gjb3Slc26a4538},#{gjb3Slc26a42168},#{gjb3Slc26a4Ivs7},#{rrna1494},#{rrna1555},#{processOptionType},#{processOptionDesc},#{guidOpinion},#{checkDoctorId},#{referralDate},#{createDate},#{createUserId},#{createHospitalId},#{nextCheckTime},#{lastUpdateDate},#{lastUpdateUserId},#{lastUpdateHospitalId},#{status},#{scrIspass})
45	46	</insert>
46	47
47	48
...	...	@@ -142,6 +143,9 @@
142	143	<if test="status != null and status >= 0">
143	144	status = #{status,jdbcType=INTEGER},
144	145	</if>
	146	+ <if test="scrIspass != null and scrIspass >= 0">
	147	+ scrIspass = #{scr_ispass,jdbcType=INTEGER},
	148	+ </if>
145	149	</set>
146	150	where id = #{id,jdbcType=VARCHAR}
147	151	</update>
...	...	@@ -154,7 +158,7 @@
154	158
155	159	<select id="getBabyPatientExtendEarScreen" resultMap="BabyPatientExtendEarScreenResultMap"
156	160	parameterType="java.lang.String">
157		-select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,rrna_1494,rrna_1555,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,next_check_time,last_update_date,last_update_user_id,last_update_hospital_id,status
	161	+select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,rrna_1494,rrna_1555,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,next_check_time,last_update_date,last_update_user_id,last_update_hospital_id,status,scr_ispass
158	162	from baby_patient_extend_ear_screen where id = #{id,jdbcType=VARCHAR}
159	163	</select>
160	164
...	...	@@ -274,6 +278,9 @@
274	278	<if test="status != null and status >= 0">
275	279	and status = #{status,jdbcType=INTEGER}
276	280	</if>
	281	+ <if test="scrIspass != null and scrIspass >= 0">
	282	+ and scr_ispass = #{scrIspass,jdbcType=INTEGER}
	283	+ </if>
277	284
278	285	</where>
279	286	</sql>
...	...	@@ -282,7 +289,7 @@
282	289	<select id="queryBabyPatientExtendEarScreen" resultMap="BabyPatientExtendEarScreenResultMap"
283	290	parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarScreenQuery">
284	291	select
285		- id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status
	292	+ id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status,scr_ispass
286	293	from baby_patient_extend_ear_screen
287	294	<include refid="BabyPatientExtendEarScreenCondition"/>
288	295	<include refid="orderAndLimit"/>
...	...	@@ -291,7 +298,7 @@
291	298	<select id="queryEarScreenList" resultMap="BabyPatientExtendEarScreenResultMap"
292	299	parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarScreenQuery">
293	300	select
294		- id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status
	301	+ id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status,scr_ispass
295	302	from baby_patient_extend_ear_screen
296	303	<where>
297	304	status = 0
...	...	@@ -334,7 +341,7 @@
334	341	)
335	342	</if>
336	343
337		- <if test="isPass != null and isPass ==1 and srcSkill==null and leftRight == null">
	344	+ <if test="scrIspass != null and scrIspass ==1 and srcSkill==null and leftRight == null">
338	345	and (
339	346	oae_left !=-1
340	347	and oae_right !=-1
...	...	@@ -342,7 +349,7 @@
342	349	and aabr_right !=-1
343	350	)
344	351	</if>
345		- <if test="isPass != null and isPass ==2 and srcSkill==null and leftRight == null">
	352	+ <if test="scrIspass != null and scrIspass ==2 and srcSkill==null and leftRight == null">
346	353	and(
347	354	oae_left =-1
348	355	or oae_right = -1
349	356
350	357
...	...	@@ -351,19 +358,19 @@
351	358	)
352	359	</if>
353	360	<if test="srcSkill != null and srcSkill == 1">
354		- <if test="isPass != null and isPass ==1">
	361	+ <if test="scrIspass != null and scrIspass ==1">
355	362	and(
356	363	oae_left =1
357	364	and oae_right = 1
358	365	)
359	366	</if>
360		- <if test="isPass != null and isPass ==2">
	367	+ <if test="scrIspass != null and scrIspass ==2">
361	368	and(
362	369	oae_left =-1
363	370	and oae_right = -1
364	371	)
365	372	</if>
366		- <if test="isPass == null">
	373	+ <if test="scrIspass == null">
367	374	and(
368	375	oae_left is not null
369	376	or oae_right is not null
370	377
371	378
...	...	@@ -371,19 +378,19 @@
371	378	</if>
372	379	</if>
373	380	<if test="srcSkill != null and srcSkill == 2">
374		- <if test="isPass != null and isPass ==1">
	381	+ <if test="scrIspass != null and scrIspass ==1">
375	382	and(
376	383	aabr_left =1
377	384	and aabr_right = 1
378	385	)
379	386	</if>
380		- <if test="isPass != null and isPass ==2">
	387	+ <if test="scrIspass != null and scrIspass ==2">
381	388	and(
382	389	aabr_left =-1
383	390	and aabr_right = -1
384	391	)
385	392	</if>
386		- <if test="isPass == null">
	393	+ <if test="scrIspass == null">
387	394	and(
388	395	aabr_left is not null
389	396	or aabr_right is not null
390	397
391	398
...	...	@@ -393,19 +400,19 @@
393	400	</if>
394	401
395	402	<if test="leftRight!= null and leftRight == 1">
396		- <if test="isPass != null and isPass ==1">
	403	+ <if test="scrIspass != null and scrIspass ==1">
397	404	and(
398	405	oae_left =1
399	406	and aabr_left = 1
400	407	)
401	408	</if>
402		- <if test="isPass != null and isPass ==2">
	409	+ <if test="scrIspass != null and scrIspass ==2">
403	410	and(
404	411	oae_left =-1
405	412	and aabr_left = -1
406	413	)
407	414	</if>
408		- <if test="isPass == null">
	415	+ <if test="scrIspass == null">
409	416	and(
410	417	oae_left is not null
411	418	or aabr_left is not null
412	419
413	420
...	...	@@ -414,19 +421,19 @@
414	421	</if>
415	422
416	423	<if test="leftRight!= null and leftRight == 2">
417		- <if test="isPass != null and isPass ==1">
	424	+ <if test="scrIspass != null and scrIspass ==1">
418	425	and(
419	426	oae_right =1
420	427	and aabr_right = 1
421	428	)
422	429	</if>
423		- <if test="isPass != null and isPass ==2">
	430	+ <if test="scrIspass != null and scrIspass ==2">
424	431	and(
425	432	oae_right =-1
426	433	and aabr_right = -1
427	434	)
428	435	</if>
429		- <if test="isPass == null">
	436	+ <if test="scrIspass == null">
430	437	and(
431	438	oae_right is not null
432	439	or aabr_right is not null
...	...	@@ -454,7 +461,7 @@
454	461	<select id="notAuscultationBabyPatientExtendEarScreen" resultMap="BabyPatientExtendEarScreenResultMap"
455	462	parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarScreenQuery">
456	463	select
457		- id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,rrna_1494,rrna_1555,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status
	464	+ id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,rrna_1494,rrna_1555,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status,scr_ispass
458	465	from baby_patient_extend_ear_screen
459	466
460	467	<where>
...	...	@@ -561,6 +568,9 @@
561	568	<if test="status != null and status >= 0">
562	569	and status = #{status,jdbcType=INTEGER}
563	570	</if>
	571	+ <if test="scrIspass != null and scrIspass >= 0">
	572	+ and scrIspass = #{scr_ispass,jdbcType=INTEGER}
	573	+ </if>
564	574	</where>
565	575	<include refid="orderAndLimit"/>
566	576	</select>
...	...	@@ -568,7 +578,7 @@
568	578	<select id="dubiousScreen" resultMap="BabyPatientExtendEarScreenResultMap"
569	579	parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarScreenQuery">
570	580	select
571		- id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,rrna_1494,rrna_1555,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status
	581	+ id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,rrna_1494,rrna_1555,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status,scr_ispass
572	582	from baby_patient_extend_ear_screen
573	583	<where>
574	584	(oae_left =-1 or oae_right = -1 or aabr_left = -1 or aabr_right = -1)
...	...	@@ -631,12 +641,7 @@
631	641	and
632	642	screen_type = 2
633	643	and
634		- (
635		- oae_left =-1
636		- or oae_right = -1
637		- or aabr_left = -1
638		- or aabr_right = -1
639		- )
	644	+ scr_ispass = 2
640	645	ORDER BY sc.create_date DESC
641	646	</where>
642	647	</select>

...	...	@@ -1753,7 +1753,7 @@
1753	1753	screenQuery.setSrcEndTime(earScreenListRequest.getSrcEndTime());
1754	1754	screenQuery.setCheckDoctorId(earScreenListRequest.getCheckDoctorId());
1755	1755	screenQuery.setScreenType(earScreenListRequest.getScreenType());
1756		- screenQuery.setIsPass(earScreenListRequest.getIsPass());
	1756	+ screenQuery.setScrIspass(earScreenListRequest.getIsPass());
1757	1757	screenQuery.setLeftRight(earScreenListRequest.getLeftRight());
1758	1758	screenQuery.setSrcSkill(earScreenListRequest.getSrcSkill());
1759	1759	screenQuery.setNextStartTime(earScreenListRequest.getNextStartTime());

...	...	@@ -83,6 +83,10 @@
83	83	private Integer rrna1494;
84	84
85	85	private Integer rrna1555;
	86	+ /**
	87	+ * 是否通过 1-通过 2-未通过
	88	+ */
	89	+ private Integer scrIspass;
86	90
87	91	/**
88	92	* 处理意见 1=复筛 2=诊断
...	...	@@ -100,6 +104,7 @@
100	104	babyPatientExtendEarScreen.setGjb3Slc26a4Ivs7(gjb3Slc26a4Ivs7);
101	105	babyPatientExtendEarScreen.setProcessOptionType(processOptionType);
102	106	babyPatientExtendEarScreen.setProcessOptionDesc(processOptionDesc);
	107	+ babyPatientExtendEarScreen.setScrIspass(scrIspass);
103	108	babyPatientExtendEarScreen.setId(id);
104	109	babyPatientExtendEarScreen.setBabyId(babyId);
105	110	babyPatientExtendEarScreen.setScreenType(screenType);
...	...	@@ -134,6 +139,14 @@
134	139	* 指导意见
135	140	*/
136	141	private String guidOpinion;
	142	+
	143	+ public Integer getScrIspass() {
	144	+ return scrIspass;
	145	+ }
	146	+
	147	+ public void setScrIspass(Integer scrIspass) {
	148	+ this.scrIspass = scrIspass;
	149	+ }
137	150
138	151	/**
139	152	* 检查医生