jiangjiazhi / regional-platform

Download as
Browse Code »

Commit e0358725cdb819e6ab0b6e432b281ced1750e980

Authored by jesse.wang
1 parent 745ddc8833
Exists in master and in 4 other branches autism, dev, fengning2023-06-06, luanping

孤独症初筛名字

Showing 2 changed files with 23 additions and 10 deletions

platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDoubleSievingDao.xml View file @ e035872
... ... @@ -30,7 +30,7 @@
30 30 <result property="patientSign" column="patient_sign" jdbcType="VARCHAR"/>
31 31 <result property="preliminaryScreeningResults" column="preliminary_screening_results" jdbcType="VARCHAR"/>
32 32 <result property="preliminaryScreeningResultsFailedProject" column="preliminary_screening_results_failed_project" jdbcType="VARCHAR"/>
33   - <result property="medicalHistory" column="medical_history" jdbcType="VARCHAR"/>
  33 + <result property="medicalHistoryName" column="medical_history" jdbcType="VARCHAR"/>
34 34 <result property="medicalHistoryRemark" column="medical_history_remark" jdbcType="VARCHAR"/>
35 35 <result property="developerQuotient" column="developer_quotient" jdbcType="VARCHAR"/>
36 36 <result property="bigMovement" column="big_movement" jdbcType="VARCHAR"/>
... ... @@ -147,8 +147,8 @@
147 147 <if test="preliminaryScreeningResultsFailedProject != null and preliminaryScreeningResultsFailedProject != ''">
148 148 and preliminary_screening_results_failed_project = #{preliminaryScreeningResultsFailedProject}
149 149 </if>
150   - <if test="medicalHistory != null and medicalHistory != ''">
151   - and medical_history = #{medicalHistory}
  150 + <if test="medicalHistoryName != null and medicalHistoryName != ''">
  151 + and medical_history = #{medicalHistoryName}
152 152 </if>
153 153 <if test="medicalHistoryRemark != null and medicalHistoryRemark != ''">
154 154 and medical_history_remark = #{medicalHistoryRemark}
... ... @@ -297,8 +297,8 @@
297 297 <if test="preliminaryScreeningResultsFailedProject != null and preliminaryScreeningResultsFailedProject != ''">
298 298 and preliminary_screening_results_failed_project = #{preliminaryScreeningResultsFailedProject}
299 299 </if>
300   - <if test="medicalHistory != null and medicalHistory != ''">
301   - and medical_history = #{medicalHistory}
  300 + <if test="medicalHistoryName != null and medicalHistoryName != ''">
  301 + and medical_history = #{medicalHistoryName}
302 302 </if>
303 303 <if test="medicalHistoryRemark != null and medicalHistoryRemark != ''">
304 304 and medical_history_remark = #{medicalHistoryRemark}
305 305  
... ... @@ -363,14 +363,14 @@
363 363 <!--新增所有列-->
364 364 <insert id="insert" keyProperty="id" useGeneratedKeys="true">
365 365 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)
366   - 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})
  366 + 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})
367 367 </insert>
368 368  
369 369 <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
370 370 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)
371 371 values
372 372 <foreach collection="entities" item="entity" separator=",">
373   - (#{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})
  373 + (#{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})
374 374 </foreach>
375 375 </insert>
376 376  
... ... @@ -378,7 +378,7 @@
378 378 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)
379 379 values
380 380 <foreach collection="entities" item="entity" separator=",">
381   - (#{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})
  381 + (#{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})
382 382 </foreach>
383 383 on duplicate key update
384 384 created = values(created),
... ... @@ -511,8 +511,8 @@
511 511 <if test="preliminaryScreeningResultsFailedProject != null and preliminaryScreeningResultsFailedProject != ''">
512 512 preliminary_screening_results_failed_project = #{preliminaryScreeningResultsFailedProject},
513 513 </if>
514   - <if test="medicalHistory != null and medicalHistory != ''">
515   - medical_history = #{medicalHistory},
  514 + <if test="medicalHistoryName != null and medicalHistoryName != ''">
  515 + medical_history = #{medicalHistoryName},
516 516 </if>
517 517 <if test="medicalHistoryRemark != null and medicalHistoryRemark != ''">
518 518 medical_history_remark = #{medicalHistoryRemark},
platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismDoubleSieving.java View file @ e035872
1 1 package com.lyms.platform.pojo;
2 2  
3 3 import com.lyms.platform.common.result.BaseModel;
  4 +import org.apache.commons.lang3.StringUtils;
4 5  
5 6 import java.util.Date;
6 7 import java.util.List;
... ... @@ -156,6 +157,8 @@
156 157 */
157 158 private List<String> medicalHistory;
158 159  
  160 + private String medicalHistoryName;
  161 +
159 162 /**
160 163 * 病史询问具体症状或问题
161 164 */
... ... @@ -288,6 +291,7 @@
288 291 ", preliminaryScreeningResults='" + preliminaryScreeningResults + '\'' +
289 292 ", preliminaryScreeningResultsFailedProject='" + preliminaryScreeningResultsFailedProject + '\'' +
290 293 ", medicalHistory=" + medicalHistory +
  294 + ", medicalHistoryName='" + medicalHistoryName + '\'' +
291 295 ", medicalHistoryRemark='" + medicalHistoryRemark + '\'' +
292 296 ", developerQuotient='" + developerQuotient + '\'' +
293 297 ", bigMovement='" + bigMovement + '\'' +
294 298  
... ... @@ -310,12 +314,21 @@
310 314 '}';
311 315 }
312 316  
  317 + public String getMedicalHistoryName() {
  318 + return medicalHistoryName;
  319 + }
  320 +
  321 + public void setMedicalHistoryName(String medicalHistoryName) {
  322 + this.medicalHistoryName = medicalHistoryName;
  323 + }
  324 +
313 325 public List<String> getMedicalHistory() {
314 326 return medicalHistory;
315 327 }
316 328  
317 329 public void setMedicalHistory(List<String> medicalHistory) {
318 330 this.medicalHistory = medicalHistory;
  331 + setMedicalHistoryName(StringUtils.join(medicalHistory,","));
319 332 }
320 333  
321 334 public String getScreeningScaleMentresults() {