diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml
index f3a4b1f..6c18c71 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml
@@ -32,14 +32,8 @@
-
-
-
-
-
-
+
+
@@ -137,11 +131,11 @@
and handle_opinions = #{handleOpinions}
-
- and warning_signs = #{warningSigns}
+
+ and warning_signs = #{warningSignstring}
-
- and language_social = #{languageSocial}
+
+ and language_social = #{languageSocialstirng}
and preliminary_screening_results = #{global}
@@ -236,11 +230,11 @@
and handle_opinions = #{handleOpinions}
-
- and warning_signs = #{warningSigns}
+
+ and warning_signs = #{warningSignstring}
-
- and language_social = #{languageSocial}
+
+ and language_social = #{languageSocialstirng}
and preliminary_screening_results = #{global}
@@ -261,7 +255,7 @@
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)
- 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})
+ 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})
@@ -270,7 +264,7 @@
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)
values
- (#{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})
+ (#{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})
@@ -278,7 +272,7 @@
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)
values
- (#{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})
+ (#{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})
on duplicate key update
created = values(created),
@@ -394,11 +388,11 @@
handle_opinions = #{handleOpinions},
-
- warning_signs = #{warningSigns},
+
+ warning_signs = #{warningSignstring},
-
- language_social = #{languageSocial},
+
+ language_social = #{languageSocialstirng},
preliminary_screening_results = #{global},
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismPrimaryScreening.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismPrimaryScreening.java
index 748545b..89064a1 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismPrimaryScreening.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismPrimaryScreening.java
@@ -1,6 +1,7 @@
package com.lyms.platform.pojo;
import com.lyms.platform.common.result.BaseModel;
+import org.apache.commons.lang.StringUtils;
import java.util.Date;
import java.util.List;
@@ -142,6 +143,32 @@ public class BabyAutismPrimaryScreening extends BaseModel {
private List languageSocial;
/**
+ * 预警征象筛查
+ */
+ private String warningSignstring;
+
+ /**
+ * 语言功能和社会交往能力询问
+ */
+ private String languageSocialstirng;
+
+ public String getWarningSignstring() {
+ return warningSignstring;
+ }
+
+ public void setWarningSignstring(String warningSignstring) {
+ this.warningSignstring = warningSignstring;
+ }
+
+ public String getLanguageSocialstirng() {
+ return languageSocialstirng;
+ }
+
+ public void setLanguageSocialstirng(String languageSocialstirng) {
+ this.languageSocialstirng = languageSocialstirng;
+ }
+
+ /**
* 初筛结果
*/
private String preliminaryScreeningResults;
@@ -418,7 +445,7 @@ public class BabyAutismPrimaryScreening extends BaseModel {
public void setWarningSigns(List warningSigns) {
this.warningSigns = warningSigns;
-
+ setWarningSignstring(StringUtils.join(warningSigns,","));
}
public List getLanguageSocial() {
@@ -427,6 +454,7 @@ public class BabyAutismPrimaryScreening extends BaseModel {
public void setLanguageSocial(List languageSocial) {
this.languageSocial = languageSocial;
+ setLanguageSocialstirng(StringUtils.join(languageSocial,","));
}
public String getPreliminaryScreeningResults() {