diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBaby.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBaby.java
index 5fe3707..aadcb03 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBaby.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBaby.java
@@ -21,6 +21,15 @@ public class BabyPatientExtendEarBaby {
private Date buildDate;
private String babyPatientId;
private String babyEarId;
+ private String personId;
+
+ public String getPersonId() {
+ return personId;
+ }
+
+ public void setPersonId(String personId) {
+ this.personId = personId;
+ }
public String getId() {
return id;
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBabyQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBabyQuery.java
index 09245bf..71bd676 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBabyQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBabyQuery.java
@@ -22,12 +22,14 @@ public class BabyPatientExtendEarBabyQuery extends BaseQuery {
private String hospitalId;
private Integer buildType;
private String enable;
+ private String noEnable;
private Integer yn;
private Date buildDate;
private String babyPatientId;
private String babyEarId;
//儿童姓名、母亲证件号、母亲联系方式
private String queryNo;
+ private String personId;
/**
* 生日
*/
@@ -37,6 +39,14 @@ public class BabyPatientExtendEarBabyQuery extends BaseQuery {
*/
private Date birthEnd;
+ public String getPersonId() {
+ return personId;
+ }
+
+ public void setPersonId(String personId) {
+ this.personId = personId;
+ }
+
public Date getBirthStart() {
return birthStart;
}
@@ -53,6 +63,14 @@ public class BabyPatientExtendEarBabyQuery extends BaseQuery {
this.birthEnd = birthEnd;
}
+ public String getNoEnable() {
+ return noEnable;
+ }
+
+ public void setNoEnable(String noEnable) {
+ this.noEnable = noEnable;
+ }
+
public String getId() {
return id;
}
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUp.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUp.java
index 0d8476f..42a28fc 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUp.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUp.java
@@ -133,7 +133,15 @@ public class BabyPatientExtendEarFollowUp extends AbstracUuidEntity{
* 状态
*/
private Integer enalble;
+ private String pid;
+ public String getPid() {
+ return pid;
+ }
+
+ public void setPid(String pid) {
+ this.pid = pid;
+ }
public Integer getIsAudiphone() {
return isAudiphone;
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUpQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUpQuery.java
index e7c6d2f..d40baf8 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUpQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUpQuery.java
@@ -119,6 +119,7 @@ public class BabyPatientExtendEarFollowUpQuery extends BaseQuery {
* 创建人id
*/
private String createId;
+ private String pid;
/**
* 状态
*/
@@ -139,6 +140,14 @@ public class BabyPatientExtendEarFollowUpQuery extends BaseQuery {
//获取sql语句
private String sqlStr;
+ public String getPid() {
+ return pid;
+ }
+
+ public void setPid(String pid) {
+ this.pid = pid;
+ }
+
public Integer getIsAudiphone() {
return isAudiphone;
}
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java
index 9d6898e..1a8b191 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java
@@ -480,6 +480,15 @@ public class BabyPatientExtendEarHearingDiagnose implements Comparable {
* 确诊时间
*/
private String confirmTimeStr;
+ private String pid;
+
+ public String getPid() {
+ return pid;
+ }
+
+ public void setPid(String pid) {
+ this.pid = pid;
+ }
public String getMonthAge() {
return monthAge;
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnoseQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnoseQuery.java
index aa45a08..4cf1273 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnoseQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnoseQuery.java
@@ -436,6 +436,8 @@ public class BabyPatientExtendEarHearingDiagnoseQuery extends BaseQuery {
* 确诊结果
*/
private String confirmResult;
+ private String pid;
+ private String[] pids;
/**
* 确诊结果程度
*/
@@ -453,6 +455,22 @@ public class BabyPatientExtendEarHearingDiagnoseQuery extends BaseQuery {
*/
private Date confirmEndTime;
+ public String[] getPids() {
+ return pids;
+ }
+
+ public void setPids(String[] pids) {
+ this.pids = pids;
+ }
+
+ public String getPid() {
+ return pid;
+ }
+
+ public void setPid(String pid) {
+ this.pid = pid;
+ }
+
public String[] getConfirmResults() {
return confirmResults;
}
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java
index d35bef6..85abc2c 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java
@@ -53,6 +53,15 @@ public class BabyPatientExtendEarQuery extends BaseQuery
private String createUserId;
//条码
private String barCode;
+ private String pid;
+
+ public String getPid() {
+ return pid;
+ }
+
+ public void setPid(String pid) {
+ this.pid = pid;
+ }
public String getNation() {
return nation;
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java
index 3d1a97f..ad3e829 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java
@@ -107,6 +107,8 @@ public class BabyPatientExtendEarScreen extends AbstracUuidEntity {
* 预约诊断时间
*/
private Date nextCheckTime;
+ //pid
+ private String pid;
private Date createDate;
private String createUserId;
@@ -116,6 +118,14 @@ public class BabyPatientExtendEarScreen extends AbstracUuidEntity {
private String lastUpdateHospitalId;
private Integer status;
+ public String getPid() {
+ return pid;
+ }
+
+ public void setPid(String pid) {
+ this.pid = pid;
+ }
+
public Integer getScrIspass() {
return scrIspass;
}
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java
index d0ef3d9..b57d176 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java
@@ -129,6 +129,7 @@ public class BabyPatientExtendEarScreenQuery extends BaseQuery {
private String nextStartTime;
//预约复查结束时间
private String nextEndTime;
+ private String pid;
//筛查结果 -1未通过 1-通过
private Integer isPass;
@@ -140,6 +141,13 @@ public class BabyPatientExtendEarScreenQuery extends BaseQuery {
//筛查结果 1通过 2-未通过
private Integer scrIspass;
+ public String getPid() {
+ return pid;
+ }
+
+ public void setPid(String pid) {
+ this.pid = pid;
+ }
public Integer getScrIspass() {
return scrIspass;
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospital.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospital.java
index 3d2d009..daf0e74 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospital.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospital.java
@@ -74,6 +74,15 @@ public class HighriskChangeHospital {
* 听筛记录ID
*/
private String scrreenId;
+ private String pid;
+
+ public String getPid() {
+ return pid;
+ }
+
+ public void setPid(String pid) {
+ this.pid = pid;
+ }
public String getScrreenId() {
return scrreenId;
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospitalQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospitalQuery.java
index 4b8e48f..0a42c58 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospitalQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospitalQuery.java
@@ -88,9 +88,18 @@ public class HighriskChangeHospitalQuery extends BaseQuery {
* 听筛记录ID
*/
private String scrreenId;
+ private String pid;
//听诊儿童档案集合
private String[] babyIds;
+ public String getPid() {
+ return pid;
+ }
+
+ public void setPid(String pid) {
+ this.pid = pid;
+ }
+
public String[] getBabyIds() {
return babyIds;
}
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml
index baaf434..a215590 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml
@@ -22,12 +22,13 @@
+
-insert into baby_patient_extend_ear_baby (id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,build_doctor,hospital_id,build_type,enable,yn,build_date,baby_patient_id,baby_ear_id) values (#{id},#{name},#{sex},#{cardno},#{birth},#{mname},#{mcertTypeId},#{mcertNo},#{mphone},#{vcCardNo},#{buildDoctor},#{hospitalId},#{buildType},#{enable},#{yn},#{buildDate},#{babyPatientId},#{babyEarId})
+insert into baby_patient_extend_ear_baby (id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,build_doctor,hospital_id,build_type,enable,yn,build_date,baby_patient_id,baby_ear_id,person_id) values (#{id},#{name},#{sex},#{cardno},#{birth},#{mname},#{mcertTypeId},#{mcertNo},#{mphone},#{vcCardNo},#{buildDoctor},#{hospitalId},#{buildType},#{enable},#{yn},#{buildDate},#{babyPatientId},#{babyEarId},#{personId})
@@ -86,6 +87,9 @@ insert into baby_patient_extend_ear_baby (id,name,sex,cardNo,birth,mname,mcert_t
baby_ear_id = #{babyEarId,jdbcType=VARCHAR},
+
+ person_id = #{personId,jdbcType=VARCHAR},
+
where id = #{id,jdbcType=VARCHAR}
@@ -98,7 +102,7 @@ delete from baby_patient_extend_ear_baby where id = #{id,jdbcType=VARCHAR}
@@ -179,7 +183,14 @@ select id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,b
and build_type = #{buildType,jdbcType=INTEGER}
- and enable = #{enable,jdbcType=VARCHAR}
+ and (enable = #{enable,jdbcType=VARCHAR}
+ or `enable` is null
+ )
+
+
+ and (enable != #{noEnable,jdbcType=VARCHAR}
+ or `enable` is null
+ )
and yn = #{yn,jdbcType=INTEGER}
@@ -193,6 +204,10 @@ select id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,b
and baby_ear_id = #{babyEarId,jdbcType=VARCHAR}
+
+ and person_id = #{personId,jdbcType=VARCHAR}
+
+
@@ -200,7 +215,7 @@ select id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,b