diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDoubleSievingDao.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDoubleSievingDao.xml
index 7e27908..c54a458 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDoubleSievingDao.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDoubleSievingDao.xml
@@ -30,7 +30,7 @@
-
+
@@ -147,8 +147,8 @@
and preliminary_screening_results_failed_project = #{preliminaryScreeningResultsFailedProject}
-
- and medical_history = #{medicalHistory}
+
+ and medical_history = #{medicalHistoryName}
and medical_history_remark = #{medicalHistoryRemark}
@@ -297,8 +297,8 @@
and preliminary_screening_results_failed_project = #{preliminaryScreeningResultsFailedProject}
-
- and medical_history = #{medicalHistory}
+
+ and medical_history = #{medicalHistoryName}
and medical_history_remark = #{medicalHistoryRemark}
@@ -363,14 +363,14 @@
insert into baby_autism_double_sieving(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, preliminary_screening_results, preliminary_screening_results_failed_project, medical_history, medical_history_remark, developer_quotient, big_movement, fine_motion, adaptability, language_num, social_behavior, pediatric_heart_scale_assess_mentresults, core_project_num, positivet_num, screening_scale_mentresults, behavior_rating_scale_total, feel_num, social_interaction_num, body_movement_num, behavior_rating_language_num, self_care_in_daily_life_num, behavior_rating_scale_assess_mentresults, rescreen_results)
- values (#{created}, #{modified}, #{yn}, #{operaterId}, #{hospitalId}, #{babyId}, #{babyBuildDate}, #{babyName}, #{babySex}, #{babyMName}, #{babyFName}, #{babyMPhone}, #{babyFPhone}, #{babyMCertNo}, #{babyFCertNo}, #{pid}, #{checkMonthAge}, #{checkMonthId}, #{birth}, #{checkTime}, #{nextCheckTime}, #{checkDoctor}, #{doctorSign}, #{patientSign}, #{preliminaryScreeningResults}, #{preliminaryScreeningResultsFailedProject}, #{medicalHistory}, #{medicalHistoryRemark}, #{developerQuotient}, #{bigMovement}, #{fineMotion}, #{adaptability}, #{languageNum}, #{socialBehavior}, #{pediatricHeartScaleAssessMentresults}, #{coreProjectNum}, #{positivetNum}, #{screeningScaleMentresults}, #{behaviorRatingScaleTotal}, #{feelNum}, #{socialInteractionNum}, #{bodyMovementNum}, #{behaviorRatingLanguageNum}, #{selfCareInDailyLifeNum}, #{behaviorRatingScaleAssessMentresults}, #{rescreenResults})
+ values (#{created}, #{modified}, #{yn}, #{operaterId}, #{hospitalId}, #{babyId}, #{babyBuildDate}, #{babyName}, #{babySex}, #{babyMName}, #{babyFName}, #{babyMPhone}, #{babyFPhone}, #{babyMCertNo}, #{babyFCertNo}, #{pid}, #{checkMonthAge}, #{checkMonthId}, #{birth}, #{checkTime}, #{nextCheckTime}, #{checkDoctor}, #{doctorSign}, #{patientSign}, #{preliminaryScreeningResults}, #{preliminaryScreeningResultsFailedProject}, #{medicalHistoryName}, #{medicalHistoryRemark}, #{developerQuotient}, #{bigMovement}, #{fineMotion}, #{adaptability}, #{languageNum}, #{socialBehavior}, #{pediatricHeartScaleAssessMentresults}, #{coreProjectNum}, #{positivetNum}, #{screeningScaleMentresults}, #{behaviorRatingScaleTotal}, #{feelNum}, #{socialInteractionNum}, #{bodyMovementNum}, #{behaviorRatingLanguageNum}, #{selfCareInDailyLifeNum}, #{behaviorRatingScaleAssessMentresults}, #{rescreenResults})
insert into baby_autism_double_sieving(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, preliminary_screening_results, preliminary_screening_results_failed_project, medical_history, medical_history_remark, developer_quotient, big_movement, fine_motion, adaptability, language_num, social_behavior, pediatric_heart_scale_assess_mentresults, core_project_num, positivet_num, screening_scale_mentresults, behavior_rating_scale_total, feel_num, social_interaction_num, body_movement_num, behavior_rating_language_num, self_care_in_daily_life_num, behavior_rating_scale_assess_mentresults, rescreen_results)
values
- (#{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.preliminaryScreeningResults}, #{entity.preliminaryScreeningResultsFailedProject}, #{entity.medicalHistory}, #{entity.medicalHistoryRemark}, #{entity.developerQuotient}, #{entity.bigMovement}, #{entity.fineMotion}, #{entity.adaptability}, #{entity.languageNum}, #{entity.socialBehavior}, #{entity.pediatricHeartScaleAssessMentresults}, #{entity.coreProjectNum}, #{entity.positivetNum}, #{entity.screeningScaleMentresults}, #{entity.behaviorRatingScaleTotal}, #{entity.feelNum}, #{entity.socialInteractionNum}, #{entity.bodyMovementNum}, #{entity.behaviorRatingLanguageNum}, #{entity.selfCareInDailyLifeNum}, #{entity.behaviorRatingScaleAssessMentresults}, #{entity.rescreenResults})
+ (#{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.preliminaryScreeningResults}, #{entity.preliminaryScreeningResultsFailedProject}, #{entity.medicalHistoryName}, #{entity.medicalHistoryRemark}, #{entity.developerQuotient}, #{entity.bigMovement}, #{entity.fineMotion}, #{entity.adaptability}, #{entity.languageNum}, #{entity.socialBehavior}, #{entity.pediatricHeartScaleAssessMentresults}, #{entity.coreProjectNum}, #{entity.positivetNum}, #{entity.screeningScaleMentresults}, #{entity.behaviorRatingScaleTotal}, #{entity.feelNum}, #{entity.socialInteractionNum}, #{entity.bodyMovementNum}, #{entity.behaviorRatingLanguageNum}, #{entity.selfCareInDailyLifeNum}, #{entity.behaviorRatingScaleAssessMentresults}, #{entity.rescreenResults})
@@ -378,7 +378,7 @@
insert into baby_autism_double_sieving(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, preliminary_screening_results, preliminary_screening_results_failed_project, medical_history, medical_history_remark, developer_quotient, big_movement, fine_motion, adaptability, language_num, social_behavior, pediatric_heart_scale_assess_mentresults, core_project_num, positivet_num, screening_scale_mentresults, behavior_rating_scale_total, feel_num, social_interaction_num, body_movement_num, behavior_rating_language_num, self_care_in_daily_life_num, behavior_rating_scale_assess_mentresults, rescreen_results)
values
- (#{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.preliminaryScreeningResults}, #{entity.preliminaryScreeningResultsFailedProject}, #{entity.medicalHistory}, #{entity.medicalHistoryRemark}, #{entity.developerQuotient}, #{entity.bigMovement}, #{entity.fineMotion}, #{entity.adaptability}, #{entity.languageNum}, #{entity.socialBehavior}, #{entity.pediatricHeartScaleAssessMentresults}, #{entity.coreProjectNum}, #{entity.positivetNum}, #{entity.screeningScaleMentresults}, #{entity.behaviorRatingScaleTotal}, #{entity.feelNum}, #{entity.socialInteractionNum}, #{entity.bodyMovementNum}, #{entity.behaviorRatingLanguageNum}, #{entity.selfCareInDailyLifeNum}, #{entity.behaviorRatingScaleAssessMentresults}, #{entity.rescreenResults})
+ (#{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.preliminaryScreeningResults}, #{entity.preliminaryScreeningResultsFailedProject}, #{entity.medicalHistoryName}, #{entity.medicalHistoryRemark}, #{entity.developerQuotient}, #{entity.bigMovement}, #{entity.fineMotion}, #{entity.adaptability}, #{entity.languageNum}, #{entity.socialBehavior}, #{entity.pediatricHeartScaleAssessMentresults}, #{entity.coreProjectNum}, #{entity.positivetNum}, #{entity.screeningScaleMentresults}, #{entity.behaviorRatingScaleTotal}, #{entity.feelNum}, #{entity.socialInteractionNum}, #{entity.bodyMovementNum}, #{entity.behaviorRatingLanguageNum}, #{entity.selfCareInDailyLifeNum}, #{entity.behaviorRatingScaleAssessMentresults}, #{entity.rescreenResults})
on duplicate key update
created = values(created),
@@ -511,8 +511,8 @@
preliminary_screening_results_failed_project = #{preliminaryScreeningResultsFailedProject},
-
- medical_history = #{medicalHistory},
+
+ medical_history = #{medicalHistoryName},
medical_history_remark = #{medicalHistoryRemark},
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismDoubleSieving.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismDoubleSieving.java
index 91bb85d..2b4c498 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismDoubleSieving.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismDoubleSieving.java
@@ -1,6 +1,7 @@
package com.lyms.platform.pojo;
import com.lyms.platform.common.result.BaseModel;
+import org.apache.commons.lang3.StringUtils;
import java.util.Date;
import java.util.List;
@@ -156,6 +157,8 @@ public class BabyAutismDoubleSieving extends BaseModel {
*/
private List medicalHistory;
+ private String medicalHistoryName;
+
/**
* 病史询问具体症状或问题
*/
@@ -288,6 +291,7 @@ public class BabyAutismDoubleSieving extends BaseModel {
", preliminaryScreeningResults='" + preliminaryScreeningResults + '\'' +
", preliminaryScreeningResultsFailedProject='" + preliminaryScreeningResultsFailedProject + '\'' +
", medicalHistory=" + medicalHistory +
+ ", medicalHistoryName='" + medicalHistoryName + '\'' +
", medicalHistoryRemark='" + medicalHistoryRemark + '\'' +
", developerQuotient='" + developerQuotient + '\'' +
", bigMovement='" + bigMovement + '\'' +
@@ -310,12 +314,21 @@ public class BabyAutismDoubleSieving extends BaseModel {
'}';
}
+ public String getMedicalHistoryName() {
+ return medicalHistoryName;
+ }
+
+ public void setMedicalHistoryName(String medicalHistoryName) {
+ this.medicalHistoryName = medicalHistoryName;
+ }
+
public List getMedicalHistory() {
return medicalHistory;
}
public void setMedicalHistory(List medicalHistory) {
this.medicalHistory = medicalHistory;
+ setMedicalHistoryName(StringUtils.join(medicalHistory,","));
}
public String getScreeningScaleMentresults() {