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 610e0c7..db05cb0 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml
@@ -5,41 +5,69 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -47,7 +75,10 @@
-
-
-
- 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}, #{doctor}, #{doctorSign}, #{patientSign}, #{guidanceOpinions}, #{handleOpinions}, #{warningSignstring}, #{languageSocialstirng}, #{global})
+
+ insert into baby_autism_primary_screening(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 (#{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}, #{entity.warningSignstring},
+ #{entity.languageSocialstirng}, #{entity.global})
-
- SELECT LAST_INSERT_ID()
-
- 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)
+
+ insert into baby_autism_primary_screening(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.doctor}, #{entity.doctorSign}, #{entity.patientSign}, #{entity.guidanceOpinions}, #{entity.handleOpinions}, #{entity.warningSignstring}, #{entity.languageSocialstirng}, #{entity.global})
+ (#{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})
-
- 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)
+
+ insert into baby_autism_primary_screening(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.doctor}, #{entity.doctorSign}, #{entity.patientSign}, #{entity.guidanceOpinions}, #{entity.handleOpinions}, #{entity.warningSignstring}, #{entity.languageSocialstirng}, #{entity.global})
+ (#{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),
@@ -310,49 +359,49 @@
update baby_autism_primary_screening
-
+
created = #{created},
-
+
modified = #{modified},
yn = #{yn},
-
+
operater_id = #{operaterId},
-
+
hospital_id = #{hospitalId},
-
+
baby_id = #{babyId},
-
+
baby_build_date = #{babyBuildDate},
-
+
baby_name = #{babyName},
baby_sex = #{babySex},
-
+
baby_m_name = #{babyMName},
-
+
baby_f_name = #{babyFName},
-
+
baby_m_phone = #{babyMPhone},
-
+
baby_f_phone = #{babyFPhone},
-
+
baby_m_cert_no = #{babyMCertNo},
-
+
baby_f_cert_no = #{babyFCertNo},
@@ -367,10 +416,10 @@
birth = #{birth},
-
+
check_time = #{checkTime},
-
+
next_check_time = #{nextCheckTime},
@@ -403,6 +452,21 @@
- delete from baby_autism_primary_screening where id = #{id}
+ delete
+ from baby_autism_primary_screening
+ where id = #{id}
+
+
diff --git a/platform-biz-service/src/main/resources/mapper/BabyAutismPrimaryScreeningDao.xml b/platform-biz-service/src/main/resources/mapper/BabyAutismPrimaryScreeningDao.xml
new file mode 100644
index 0000000..087055f
--- /dev/null
+++ b/platform-biz-service/src/main/resources/mapper/BabyAutismPrimaryScreeningDao.xml
@@ -0,0 +1,397 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into baby_autism_primary_screening(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 (#{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}, #{preliminaryScreeningResults})
+
+
+
+ insert into baby_autism_primary_screening(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
+
+ (#{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.preliminaryScreeningResults})
+
+
+
+
+ insert into baby_autism_primary_screening(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
+
+ (#{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.preliminaryScreeningResults})
+
+ on duplicate key update
+ created = values(created),
+ modified = values(modified),
+ yn = values(yn),
+ operater_id = values(operater_id),
+ hospital_id = values(hospital_id),
+ baby_id = values(baby_id),
+ baby_build_date = values(baby_build_date),
+ baby_name = values(baby_name),
+ baby_sex = values(baby_sex),
+ baby_m_name = values(baby_m_name),
+ baby_f_name = values(baby_f_name),
+ baby_m_phone = values(baby_m_phone),
+ baby_f_phone = values(baby_f_phone),
+ baby_m_cert_no = values(baby_m_cert_no),
+ baby_f_cert_no = values(baby_f_cert_no),
+ pid = values(pid),
+ check_month_age = values(check_month_age),
+ check_month_id = values(check_month_id),
+ birth = values(birth),
+ check_time = values(check_time),
+ next_check_time = values(next_check_time),
+ check_doctor = values(check_doctor),
+ doctor_sign = values(doctor_sign),
+ patient_sign = values(patient_sign),
+ guidance_opinions = values(guidance_opinions),
+ handle_opinions = values(handle_opinions),
+ warning_signs = values(warning_signs),
+ language_social = values(language_social),
+ preliminary_screening_results = values(preliminary_screening_results)
+
+
+
+
+ update baby_autism_primary_screening
+
+
+ created = #{created},
+
+
+ modified = #{modified},
+
+
+ yn = #{yn},
+
+
+ operater_id = #{operaterId},
+
+
+ hospital_id = #{hospitalId},
+
+
+ baby_id = #{babyId},
+
+
+ baby_build_date = #{babyBuildDate},
+
+
+ baby_name = #{babyName},
+
+
+ baby_sex = #{babySex},
+
+
+ baby_m_name = #{babyMName},
+
+
+ baby_f_name = #{babyFName},
+
+
+ baby_m_phone = #{babyMPhone},
+
+
+ baby_f_phone = #{babyFPhone},
+
+
+ baby_m_cert_no = #{babyMCertNo},
+
+
+ baby_f_cert_no = #{babyFCertNo},
+
+
+ pid = #{pid},
+
+
+ check_month_age = #{checkMonthAge},
+
+
+ check_month_id = #{checkMonthId},
+
+
+ birth = #{birth},
+
+
+ check_time = #{checkTime},
+
+
+ next_check_time = #{nextCheckTime},
+
+
+ check_doctor = #{checkDoctor},
+
+
+ doctor_sign = #{doctorSign},
+
+
+ patient_sign = #{patientSign},
+
+
+ guidance_opinions = #{guidanceOpinions},
+
+
+ handle_opinions = #{handleOpinions},
+
+
+ warning_signs = #{warningSigns},
+
+
+ language_social = #{languageSocial},
+
+
+ preliminary_screening_results = #{preliminaryScreeningResults},
+
+
+ where id = #{id}
+
+
+
+
+ delete from baby_autism_primary_screening where id = #{id}
+
+
+
+
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 62ef5b5..7230bd8 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 com.lyms.platform.common.utils.DateUtil;
import org.apache.commons.lang.StringUtils;
import java.util.Date;
@@ -20,11 +21,15 @@ public class BabyAutismPrimaryScreening extends BaseModel {
* 创建时间
*/
private Date created;
+
+ private String createdStr;
/**
* 修改时间
*/
private Date modified;
+ private String modifiedStr;
+
/**
* 记录删除状态0：删除 1：正常
*/
@@ -47,6 +52,8 @@ public class BabyAutismPrimaryScreening extends BaseModel {
* 儿童建档日期
*/
private Date babyBuildDate;
+
+ private String babyBuildDateStr;
/**
* 儿童姓名
*/
@@ -97,15 +104,21 @@ public class BabyAutismPrimaryScreening extends BaseModel {
*/
private Date birth;
+ private String birthStr;
+
/**
* 检查时间
*/
- private String checkTime;
+ private Date checkTime;
+
+ private String checkTimeStr;
/**
* 预约下次检查时间
*/
- private String nextCheckTime;
+ private Date nextCheckTime;
+
+ private String nextCheckTimeStr;
/**
* 检查医生
@@ -179,6 +192,74 @@ public class BabyAutismPrimaryScreening extends BaseModel {
private DoctorDTO checkDoctor;
+ /**
+ * 初筛结果
+ */
+ private String preliminaryScreeningResults;
+
+ /**
+ * 初筛结果
+ */
+ private String global;
+
+ public String getCreatedStr() {
+ return createdStr;
+ }
+
+ public void setCreatedStr(String createdStr) {
+ this.createdStr = createdStr;
+ }
+
+ public String getModifiedStr() {
+ return modifiedStr;
+ }
+
+ public void setModifiedStr(String modifiedStr) {
+ this.modifiedStr = modifiedStr;
+ }
+
+ public String getBabyBuildDateStr() {
+ return babyBuildDateStr;
+ }
+
+ public void setBabyBuildDateStr(String babyBuildDateStr) {
+ this.babyBuildDateStr = babyBuildDateStr;
+ }
+
+ public String getBirthStr() {
+ return birthStr;
+ }
+
+ public void setBirthStr(String birthStr) {
+ this.birthStr = birthStr;
+ }
+
+ public void setCheckTime(Date checkTime) {
+ this.checkTime = checkTime;
+ setCheckTimeStr(DateUtil.getyyyy_MM_dd(checkTime));
+ }
+
+ public String getCheckTimeStr() {
+ return checkTimeStr;
+ }
+
+ public void setCheckTimeStr(String checkTimeStr) {
+ this.checkTimeStr = checkTimeStr;
+ }
+
+ public void setNextCheckTime(Date nextCheckTime) {
+ this.nextCheckTime = nextCheckTime;
+ setNextCheckTimeStr(DateUtil.getyyyy_MM_dd(nextCheckTime));
+ }
+
+ public String getNextCheckTimeStr() {
+ return nextCheckTimeStr;
+ }
+
+ public void setNextCheckTimeStr(String nextCheckTimeStr) {
+ this.nextCheckTimeStr = nextCheckTimeStr;
+ }
+
public String getDisplayState() {
return displayState;
}
@@ -211,15 +292,7 @@ public class BabyAutismPrimaryScreening extends BaseModel {
this.languageSocialstirng = languageSocialstirng;
}
- /**
- * 初筛结果
- */
- private String preliminaryScreeningResults;
- /**
- * 初筛结果
- */
- private String global;
public String getLanguageSocialName() {
return languageSocialName;
@@ -259,6 +332,7 @@ public class BabyAutismPrimaryScreening extends BaseModel {
public void setCreated(Date created) {
this.created = created;
+ setCreatedStr(DateUtil.getyyyy_MM_dd(created));
}
public Date getModified() {
@@ -267,6 +341,7 @@ public class BabyAutismPrimaryScreening extends BaseModel {
public void setModified(Date modified) {
this.modified = modified;
+ setModifiedStr(DateUtil.getyyyy_MM_dd(modified));
}
public Integer getYn() {
@@ -307,6 +382,7 @@ public class BabyAutismPrimaryScreening extends BaseModel {
public void setBabyBuildDate(Date babyBuildDate) {
this.babyBuildDate = babyBuildDate;
+ setBabyBuildDateStr(DateUtil.getyyyy_MM_dd(babyBuildDate));
}
public String getBabyName() {
@@ -403,24 +479,17 @@ public class BabyAutismPrimaryScreening extends BaseModel {
public void setBirth(Date birth) {
this.birth = birth;
+ setBirthStr(DateUtil.getyyyy_MM_dd(birth));
}
- public String getCheckTime() {
+ public Date getCheckTime() {
return checkTime;
}
- public void setCheckTime(String checkTime) {
- this.checkTime = checkTime;
- }
-
- public String getNextCheckTime() {
+ public Date getNextCheckTime() {
return nextCheckTime;
}
- public void setNextCheckTime(String nextCheckTime) {
- this.nextCheckTime = nextCheckTime;
- }
-
public String getDoctorSign() {
return doctorSign;
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java
index 32335d9..8665f63 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java
@@ -92,7 +92,7 @@ public class PrimaryScreeningFacade extends BaseServiceImpl {
temp.put("sex", SexEnum.getTextById(babyModel.getSex()));
}
}
- temp.put("checkTime", babyCheck.getCheckTime());
+ temp.put("checkTime", babyCheck.getCheckTimeStr());
temp.put("type", "2");//展示区分（1：档案2：检查记录）
rest.add(temp);
}