jiangjiazhi / regional-platform

Commit b21aa46c873960163733b35bc1e1e7980fc12e24

Authored by jesse.wang about 2 years ago

1 parent 25afa62061

Exists in master and in 4 other branches

孤独症参数格式

Showing 2 changed files with 46 additions and 24 deletions

platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml
platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismPrimaryScreening.java

...	...	@@ -32,14 +32,8 @@
32	32	<result property="patientSign" column="patient_sign" jdbcType="VARCHAR"/>
33	33	<result property="guidanceOpinions" column="guidance_opinions" jdbcType="VARCHAR"/>
34	34	<result property="handleOpinions" column="handle_opinions" jdbcType="VARCHAR"/>
35		- <collection property="warningSigns"
36		- ofType="java.lang.String" javaType="java.util.List">
37		- <result column="warning_signs"/>
38		- </collection>
39		- <collection property="languageSocial"
40		- ofType="java.lang.String" javaType="java.util.List">
41		- <result column="language_social"/>
42		- </collection>
	35	+ <result property="warningSignstring" column="warning_signs" jdbcType="VARCHAR"/>
	36	+ <result property="languageSocialstirng" column="language_social" jdbcType="VARCHAR"/>
43	37	<result property="global" column="preliminary_screening_results" jdbcType="VARCHAR"/>
44	38	</resultMap>
45	39	<!--查询单个-->
46	40
...	...	@@ -137,11 +131,11 @@
137	131	<if test="handleOpinions != null and handleOpinions != ''">
138	132	and handle_opinions = #{handleOpinions}
139	133	</if>
140		- <if test="warningSigns != null and warningSigns != ''">
141		- and warning_signs = #{warningSigns}
	134	+ <if test="warningSignstring != null and warningSignstring != ''">
	135	+ and warning_signs = #{warningSignstring}
142	136	</if>
143		- <if test="languageSocial != null and languageSocial != ''">
144		- and language_social = #{languageSocial}
	137	+ <if test="languageSocialstirng != null and languageSocialstirng != ''">
	138	+ and language_social = #{languageSocialstirng}
145	139	</if>
146	140	<if test="global != null and global != ''">
147	141	and preliminary_screening_results = #{global}
148	142
...	...	@@ -236,11 +230,11 @@
236	230	<if test="handleOpinions != null and handleOpinions != ''">
237	231	and handle_opinions = #{handleOpinions}
238	232	</if>
239		- <if test="warningSigns != null and warningSigns != ''">
240		- and warning_signs = #{warningSigns}
	233	+ <if test="warningSignstring != null and warningSignstring != ''">
	234	+ and warning_signs = #{warningSignstring}
241	235	</if>
242		- <if test="languageSocial != null and languageSocial != ''">
243		- and language_social = #{languageSocial}
	236	+ <if test="languageSocialstirng != null and languageSocialstirng != ''">
	237	+ and language_social = #{languageSocialstirng}
244	238	</if>
245	239	<if test="global != null and global != ''">
246	240	and preliminary_screening_results = #{global}
...	...	@@ -261,7 +255,7 @@
261	255	<insert id="insert" >
262	256
263	257	insert into baby_autism_primary_screening(id,created, modified, yn, operater_id, hospital_id, baby_id, baby_build_date, baby_name, baby_sex, baby_m_name, baby_f_name, baby_m_phone, baby_f_phone, baby_m_cert_no, baby_f_cert_no, pid, check_month_age, check_month_id, birth, check_time, next_check_time, check_doctor, doctor_sign, patient_sign, guidance_opinions, handle_opinions, warning_signs, language_social, preliminary_screening_results)
264		- values (#{id},#{created}, #{modified}, #{yn}, #{operaterId}, #{hospitalId}, #{babyId}, #{babyBuildDate}, #{babyName}, #{babySex}, #{babyMName}, #{babyFName}, #{babyMPhone}, #{babyFPhone}, #{babyMCertNo}, #{babyFCertNo}, #{pid}, #{checkMonthAge}, #{checkMonthId}, #{birth}, #{checkTime}, #{nextCheckTime}, #{checkDoctor}, #{doctorSign}, #{patientSign}, #{guidanceOpinions}, #{handleOpinions}, #{warningSigns}, #{languageSocial}, #{global})
	258	+ values (#{id},#{created}, #{modified}, #{yn}, #{operaterId}, #{hospitalId}, #{babyId}, #{babyBuildDate}, #{babyName}, #{babySex}, #{babyMName}, #{babyFName}, #{babyMPhone}, #{babyFPhone}, #{babyMCertNo}, #{babyFCertNo}, #{pid}, #{checkMonthAge}, #{checkMonthId}, #{birth}, #{checkTime}, #{nextCheckTime}, #{checkDoctor}, #{doctorSign}, #{patientSign}, #{guidanceOpinions}, #{handleOpinions}, #{warningSignstring}, #{languageSocialstirng}, #{global})
265	259	</insert>
266	260
267	261	<insert id="insertBatch" >
...	...	@@ -270,7 +264,7 @@
270	264	insert into baby_autism_primary_screening(id,created, modified, yn, operater_id, hospital_id, baby_id, baby_build_date, baby_name, baby_sex, baby_m_name, baby_f_name, baby_m_phone, baby_f_phone, baby_m_cert_no, baby_f_cert_no, pid, check_month_age, check_month_id, birth, check_time, next_check_time, check_doctor, doctor_sign, patient_sign, guidance_opinions, handle_opinions, warning_signs, language_social, preliminary_screening_results)
271	265	values
272	266	<foreach collection="entities" item="entity" separator=",">
273		- (#{id},#{entity.created}, #{entity.modified}, #{entity.yn}, #{entity.operaterId}, #{entity.hospitalId}, #{entity.babyId}, #{entity.babyBuildDate}, #{entity.babyName}, #{entity.babySex}, #{entity.babyMName}, #{entity.babyFName}, #{entity.babyMPhone}, #{entity.babyFPhone}, #{entity.babyMCertNo}, #{entity.babyFCertNo}, #{entity.pid}, #{entity.checkMonthAge}, #{entity.checkMonthId}, #{entity.birth}, #{entity.checkTime}, #{entity.nextCheckTime}, #{entity.checkDoctor}, #{entity.doctorSign}, #{entity.patientSign}, #{entity.guidanceOpinions}, #{entity.handleOpinions}, #{entity.warningSigns}, #{entity.languageSocial}, #{entity.global})
	267	+ (#{id},#{entity.created}, #{entity.modified}, #{entity.yn}, #{entity.operaterId}, #{entity.hospitalId}, #{entity.babyId}, #{entity.babyBuildDate}, #{entity.babyName}, #{entity.babySex}, #{entity.babyMName}, #{entity.babyFName}, #{entity.babyMPhone}, #{entity.babyFPhone}, #{entity.babyMCertNo}, #{entity.babyFCertNo}, #{entity.pid}, #{entity.checkMonthAge}, #{entity.checkMonthId}, #{entity.birth}, #{entity.checkTime}, #{entity.nextCheckTime}, #{entity.checkDoctor}, #{entity.doctorSign}, #{entity.patientSign}, #{entity.guidanceOpinions}, #{entity.handleOpinions}, #{entity.warningSignstring}, #{entity.languageSocialstirng}, #{entity.global})
274	268	</foreach>
275	269	</insert>
276	270
...	...	@@ -278,7 +272,7 @@
278	272	insert into baby_autism_primary_screening(id,created, modified, yn, operater_id, hospital_id, baby_id, baby_build_date, baby_name, baby_sex, baby_m_name, baby_f_name, baby_m_phone, baby_f_phone, baby_m_cert_no, baby_f_cert_no, pid, check_month_age, check_month_id, birth, check_time, next_check_time, check_doctor, doctor_sign, patient_sign, guidance_opinions, handle_opinions, warning_signs, language_social, preliminary_screening_results)
279	273	values
280	274	<foreach collection="entities" item="entity" separator=",">
281		- (#{id},#{entity.created}, #{entity.modified}, #{entity.yn}, #{entity.operaterId}, #{entity.hospitalId}, #{entity.babyId}, #{entity.babyBuildDate}, #{entity.babyName}, #{entity.babySex}, #{entity.babyMName}, #{entity.babyFName}, #{entity.babyMPhone}, #{entity.babyFPhone}, #{entity.babyMCertNo}, #{entity.babyFCertNo}, #{entity.pid}, #{entity.checkMonthAge}, #{entity.checkMonthId}, #{entity.birth}, #{entity.checkTime}, #{entity.nextCheckTime}, #{entity.checkDoctor}, #{entity.doctorSign}, #{entity.patientSign}, #{entity.guidanceOpinions}, #{entity.handleOpinions}, #{entity.warningSigns}, #{entity.languageSocial}, #{entity.global})
	275	+ (#{id},#{entity.created}, #{entity.modified}, #{entity.yn}, #{entity.operaterId}, #{entity.hospitalId}, #{entity.babyId}, #{entity.babyBuildDate}, #{entity.babyName}, #{entity.babySex}, #{entity.babyMName}, #{entity.babyFName}, #{entity.babyMPhone}, #{entity.babyFPhone}, #{entity.babyMCertNo}, #{entity.babyFCertNo}, #{entity.pid}, #{entity.checkMonthAge}, #{entity.checkMonthId}, #{entity.birth}, #{entity.checkTime}, #{entity.nextCheckTime}, #{entity.checkDoctor}, #{entity.doctorSign}, #{entity.patientSign}, #{entity.guidanceOpinions}, #{entity.handleOpinions}, #{entity.warningSignstring}, #{entity.languageSocialstirng}, #{entity.global})
282	276	</foreach>
283	277	on duplicate key update
284	278	created = values(created),
285	279
...	...	@@ -394,11 +388,11 @@
394	388	<if test="handleOpinions != null and handleOpinions != ''">
395	389	handle_opinions = #{handleOpinions},
396	390	</if>
397		- <if test="warningSigns != null and warningSigns != ''">
398		- warning_signs = #{warningSigns},
	391	+ <if test="warningSignstring != null and warningSignstring != ''">
	392	+ warning_signs = #{warningSignstring},
399	393	</if>
400		- <if test="languageSocial != null and languageSocial != ''">
401		- language_social = #{languageSocial},
	394	+ <if test="languageSocialstirng != null and languageSocialstirng != ''">
	395	+ language_social = #{languageSocialstirng},
402	396	</if>
403	397	<if test="global != null and global != ''">
404	398	preliminary_screening_results = #{global},

1	1	package com.lyms.platform.pojo;
2	2
3	3	import com.lyms.platform.common.result.BaseModel;
	4	+import org.apache.commons.lang.StringUtils;
4	5
5	6	import java.util.Date;
6	7	import java.util.List;
...	...	@@ -142,6 +143,32 @@
142	143	private List<String> languageSocial;
143	144
144	145	/**
	146	+ * 预警征象筛查
	147	+ */
	148	+ private String warningSignstring;
	149	+
	150	+ /**
	151	+ * 语言功能和社会交往能力询问
	152	+ */
	153	+ private String languageSocialstirng;
	154	+
	155	+ public String getWarningSignstring() {
	156	+ return warningSignstring;
	157	+ }
	158	+
	159	+ public void setWarningSignstring(String warningSignstring) {
	160	+ this.warningSignstring = warningSignstring;
	161	+ }
	162	+
	163	+ public String getLanguageSocialstirng() {
	164	+ return languageSocialstirng;
	165	+ }
	166	+
	167	+ public void setLanguageSocialstirng(String languageSocialstirng) {
	168	+ this.languageSocialstirng = languageSocialstirng;
	169	+ }
	170	+
	171	+ /**
145	172	* 初筛结果
146	173	*/
147	174	private String preliminaryScreeningResults;
...	...	@@ -418,7 +445,7 @@
418	445
419	446	public void setWarningSigns(List<String> warningSigns) {
420	447	this.warningSigns = warningSigns;
421		-
	448	+ setWarningSignstring(StringUtils.join(warningSigns,","));
422	449	}
423	450
424	451	public List<String> getLanguageSocial() {
...	...	@@ -427,6 +454,7 @@
427	454
428	455	public void setLanguageSocial(List<String> languageSocial) {
429	456	this.languageSocial = languageSocial;
	457	+ setLanguageSocialstirng(StringUtils.join(languageSocial,","));
430	458	}
431	459
432	460	public String getPreliminaryScreeningResults() {