jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 44892b275db5c0ffd49c2ab235bc5bd8f9d70f05

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

孤独症参数格式

Showing 2 changed files with 33 additions and 40 deletions

platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml View file @ 44892b2
... ... @@ -27,7 +27,7 @@
27 27 <result property="birth" column="birth" jdbcType="VARCHAR"/>
28 28 <result property="checkTime" column="check_time" jdbcType="VARCHAR"/>
29 29 <result property="nextCheckTime" column="next_check_time" jdbcType="VARCHAR"/>
30   - <result property="checkDoctor" column="check_doctor" jdbcType="VARCHAR"/>
  30 + <result property="doctor" column="check_doctor" jdbcType="VARCHAR"/>
31 31 <result property="doctorSign" column="doctor_sign" jdbcType="VARCHAR"/>
32 32 <result property="patientSign" column="patient_sign" jdbcType="VARCHAR"/>
33 33 <result property="guidanceOpinions" column="guidance_opinions" jdbcType="VARCHAR"/>
... ... @@ -116,8 +116,8 @@
116 116 <if test="nextCheckTime != null and nextCheckTime != ''">
117 117 and next_check_time = #{nextCheckTime}
118 118 </if>
119   - <if test="checkDoctor != null and checkDoctor != ''">
120   - and check_doctor = #{checkDoctor}
  119 + <if test="doctor != null and doctor != ''">
  120 + and check_doctor = #{doctor}
121 121 </if>
122 122 <if test="doctorSign != null and doctorSign != ''">
123 123 and doctor_sign = #{doctorSign}
... ... @@ -215,8 +215,8 @@
215 215 <if test="nextCheckTime != null and nextCheckTime != ''">
216 216 and next_check_time = #{nextCheckTime}
217 217 </if>
218   - <if test="checkDoctor != null and checkDoctor != ''">
219   - and check_doctor = #{checkDoctor}
  218 + <if test="doctor != null and doctor != ''">
  219 + and check_doctor = #{doctor}
220 220 </if>
221 221 <if test="doctorSign != null and doctorSign != ''">
222 222 and doctor_sign = #{doctorSign}
... ... @@ -255,7 +255,7 @@
255 255 <insert id="insert" >
256 256  
257 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)
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})
  258 + values (#{id},#{created}, #{modified}, #{yn}, #{operaterId}, #{hospitalId}, #{babyId}, #{babyBuildDate}, #{babyName}, #{babySex}, #{babyMName}, #{babyFName}, #{babyMPhone}, #{babyFPhone}, #{babyMCertNo}, #{babyFCertNo}, #{pid}, #{checkMonthAge}, #{checkMonthId}, #{birth}, #{checkTime}, #{nextCheckTime}, #{doctor}, #{doctorSign}, #{patientSign}, #{guidanceOpinions}, #{handleOpinions}, #{warningSignstring}, #{languageSocialstirng}, #{global})
259 259 </insert>
260 260  
261 261 <insert id="insertBatch" >
... ... @@ -264,7 +264,7 @@
264 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)
265 265 values
266 266 <foreach collection="entities" item="entity" separator=",">
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})
  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.doctor}, #{entity.doctorSign}, #{entity.patientSign}, #{entity.guidanceOpinions}, #{entity.handleOpinions}, #{entity.warningSignstring}, #{entity.languageSocialstirng}, #{entity.global})
268 268 </foreach>
269 269 </insert>
270 270  
... ... @@ -272,7 +272,7 @@
272 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)
273 273 values
274 274 <foreach collection="entities" item="entity" separator=",">
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})
  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.doctor}, #{entity.doctorSign}, #{entity.patientSign}, #{entity.guidanceOpinions}, #{entity.handleOpinions}, #{entity.warningSignstring}, #{entity.languageSocialstirng}, #{entity.global})
276 276 </foreach>
277 277 on duplicate key update
278 278 created = values(created),
... ... @@ -373,8 +373,8 @@
373 373 <if test="nextCheckTime != null and nextCheckTime != ''">
374 374 next_check_time = #{nextCheckTime},
375 375 </if>
376   - <if test="checkDoctor != null and checkDoctor != ''">
377   - check_doctor = #{checkDoctor},
  376 + <if test="doctor != null and doctor != ''">
  377 + check_doctor = #{doctor},
378 378 </if>
379 379 <if test="doctorSign != null and doctorSign != ''">
380 380 doctor_sign = #{doctorSign},
platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismPrimaryScreening.java View file @ 44892b2
1 1 package com.lyms.platform.pojo;
2 2  
3   -import com.fasterxml.jackson.annotation.JsonProperty;
4 3 import com.lyms.platform.common.result.BaseModel;
5 4 import org.apache.commons.lang.StringUtils;
6 5  
... ... @@ -111,7 +110,7 @@
111 110 /**
112 111 * 检查医生
113 112 */
114   - private String checkDoctor;
  113 + private String doctor;
115 114  
116 115 /**
117 116 * 医生签名
118 117  
... ... @@ -168,17 +167,8 @@
168 167  
169 168 private String errormsg;
170 169  
171   - @JsonProperty("doctor")
172   - private DoctorDTO doctor;
  170 + private DoctorDTO checkDoctor;
173 171  
174   - public DoctorDTO getDoctor() {
175   - return doctor;
176   - }
177   -
178   - public void setDoctor(DoctorDTO doctor) {
179   - this.doctor = doctor;
180   - }
181   -
182 172 public String getDisplayState() {
183 173 return displayState;
184 174 }
... ... @@ -442,14 +432,6 @@
442 432 this.nextCheckTime = nextCheckTime;
443 433 }
444 434  
445   - public String getCheckDoctor() {
446   - return checkDoctor;
447   - }
448   -
449   - public void setCheckDoctor(String checkDoctor) {
450   - this.checkDoctor = checkDoctor;
451   - }
452   -
453 435 public String getDoctorSign() {
454 436 return doctorSign;
455 437 }
456 438  
457 439  
458 440  
459 441  
... ... @@ -508,16 +490,27 @@
508 490 this.preliminaryScreeningResults = preliminaryScreeningResults;
509 491 }
510 492  
  493 + public String getDoctor() {
  494 + return doctor;
  495 + }
  496 +
  497 + public void setDoctor(String doctor) {
  498 + this.doctor = doctor;
  499 + }
  500 +
  501 + public DoctorDTO getCheckDoctor() {
  502 + return checkDoctor;
  503 + }
  504 +
  505 + public void setCheckDoctor(DoctorDTO checkDoctor) {
  506 + this.checkDoctor = checkDoctor;
  507 + }
  508 +
511 509 public static class DoctorDTO {
512   - @JsonProperty("name")
513 510 private String name;
514   - @JsonProperty("id")
515   - private Integer idX;
516   - @JsonProperty("label")
  511 + private Integer id;
517 512 private String label;
518   - @JsonProperty("value")
519 513 private Integer value;
520   - @JsonProperty("search")
521 514 private String search;
522 515  
523 516 public String getName() {
524 517  
... ... @@ -528,12 +521,12 @@
528 521 this.name = name;
529 522 }
530 523  
531   - public Integer getIdX() {
532   - return idX;
  524 + public Integer getId() {
  525 + return id;
533 526 }
534 527  
535   - public void setIdX(Integer idX) {
536   - this.idX = idX;
  528 + public void setId(Integer id) {
  529 + this.id = id;
537 530 }
538 531  
539 532 public String getLabel() {