From 44892b275db5c0ffd49c2ab235bc5bd8f9d70f05 Mon Sep 17 00:00:00 2001 From: "jesse.wang" Date: Thu, 13 Apr 2023 11:33:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A4=E7=8B=AC=E7=97=87=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../master/BabyAutismPrimaryScreeningMapper.xml | 20 ++++---- .../platform/pojo/BabyAutismPrimaryScreening.java | 53 ++++++++++------------ 2 files changed, 33 insertions(+), 40 deletions(-) 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 6c18c71..8fbf9e1 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml @@ -27,7 +27,7 @@ - + @@ -116,8 +116,8 @@ and next_check_time = #{nextCheckTime} - - and check_doctor = #{checkDoctor} + + and check_doctor = #{doctor} and doctor_sign = #{doctorSign} @@ -215,8 +215,8 @@ and next_check_time = #{nextCheckTime} - - and check_doctor = #{checkDoctor} + + and check_doctor = #{doctor} and doctor_sign = #{doctorSign} @@ -255,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}, #{warningSignstring}, #{languageSocialstirng}, #{global}) + 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}) @@ -264,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.warningSignstring}, #{entity.languageSocialstirng}, #{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.doctor}, #{entity.doctorSign}, #{entity.patientSign}, #{entity.guidanceOpinions}, #{entity.handleOpinions}, #{entity.warningSignstring}, #{entity.languageSocialstirng}, #{entity.global}) @@ -272,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.warningSignstring}, #{entity.languageSocialstirng}, #{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.doctor}, #{entity.doctorSign}, #{entity.patientSign}, #{entity.guidanceOpinions}, #{entity.handleOpinions}, #{entity.warningSignstring}, #{entity.languageSocialstirng}, #{entity.global}) on duplicate key update created = values(created), @@ -373,8 +373,8 @@ next_check_time = #{nextCheckTime}, - - check_doctor = #{checkDoctor}, + + check_doctor = #{doctor}, doctor_sign = #{doctorSign}, 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 05986f6..0293b72 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,5 @@ package com.lyms.platform.pojo; -import com.fasterxml.jackson.annotation.JsonProperty; import com.lyms.platform.common.result.BaseModel; import org.apache.commons.lang.StringUtils; @@ -111,7 +110,7 @@ public class BabyAutismPrimaryScreening extends BaseModel { /** * 检查医生 */ - private String checkDoctor; + private String doctor; /** * 医生签名 @@ -168,16 +167,7 @@ public class BabyAutismPrimaryScreening extends BaseModel { private String errormsg; - @JsonProperty("doctor") - private DoctorDTO doctor; - - public DoctorDTO getDoctor() { - return doctor; - } - - public void setDoctor(DoctorDTO doctor) { - this.doctor = doctor; - } + private DoctorDTO checkDoctor; public String getDisplayState() { return displayState; @@ -442,14 +432,6 @@ public class BabyAutismPrimaryScreening extends BaseModel { this.nextCheckTime = nextCheckTime; } - public String getCheckDoctor() { - return checkDoctor; - } - - public void setCheckDoctor(String checkDoctor) { - this.checkDoctor = checkDoctor; - } - public String getDoctorSign() { return doctorSign; } @@ -508,16 +490,27 @@ public class BabyAutismPrimaryScreening extends BaseModel { this.preliminaryScreeningResults = preliminaryScreeningResults; } + public String getDoctor() { + return doctor; + } + + public void setDoctor(String doctor) { + this.doctor = doctor; + } + + public DoctorDTO getCheckDoctor() { + return checkDoctor; + } + + public void setCheckDoctor(DoctorDTO checkDoctor) { + this.checkDoctor = checkDoctor; + } + public static class DoctorDTO { - @JsonProperty("name") private String name; - @JsonProperty("id") - private Integer idX; - @JsonProperty("label") + private Integer id; private String label; - @JsonProperty("value") private Integer value; - @JsonProperty("search") private String search; public String getName() { @@ -528,12 +521,12 @@ public class BabyAutismPrimaryScreening extends BaseModel { this.name = name; } - public Integer getIdX() { - return idX; + public Integer getId() { + return id; } - public void setIdX(Integer idX) { - this.idX = idX; + public void setId(Integer id) { + this.id = id; } public String getLabel() { -- 1.8.3.1