diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java
index eb946e1..46e215b 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java
@@ -53,6 +53,54 @@ public class PatientService {
* 医院ID
*/
private String hospitalId;
+ /**
+ * 验证码
+ */
+ private String serCode;
+ /**
+ * 领取状态 1-待领取、2-已领取
+ */
+ private Integer status;
+ /**
+ * 领取时间
+ */
+ private Date receiveDate;
+ /**
+ * 领取医生id
+ */
+ private String receiveUser;
+
+ public String getSerCode() {
+ return serCode;
+ }
+
+ public void setSerCode(String serCode) {
+ this.serCode = serCode;
+ }
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ public Date getReceiveDate() {
+ return receiveDate;
+ }
+
+ public void setReceiveDate(Date receiveDate) {
+ this.receiveDate = receiveDate;
+ }
+
+ public String getReceiveUser() {
+ return receiveUser;
+ }
+
+ public void setReceiveUser(String receiveUser) {
+ this.receiveUser = receiveUser;
+ }
public String getHospitalId() {
return hospitalId;
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java
index 03cc48b..4e9a1da 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java
@@ -9,6 +9,10 @@ import java.util.Date;
public class PatientServiceQuery extends BaseQuery {
private String id;
private String parentid;
+ /**
+ * 孕妇集合，根据关键字模糊查询
+ */
+ private String[] parentIds;
private String pid;
private Integer serType;
private String serDoct;
@@ -22,7 +26,66 @@ public class PatientServiceQuery extends BaseQuery {
private String updateUserName;
private String updateUser;
private String hospitalId;
+ /**
+ * 验证码
+ */
+ private String serCode;
+ /**
+ * sql(用于查询短信不为空的数据)
+ */
+ private String sql;
+ /**
+ * 领取状态 1-待领取、2-已领取
+ */
+ private Integer status;
+ /**
+ * 领取时间
+ */
+ private Date receiveDate;
+ /**
+ * 领取医生id
+ */
+ private String receiveUser;
+ public String getSql() {
+ return sql;
+ }
+
+ public void setSql(String sql) {
+ this.sql = sql;
+ }
+
+ public String getSerCode() {
+ return serCode;
+ }
+
+ public void setSerCode(String serCode) {
+ this.serCode = serCode;
+ }
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ public Date getReceiveDate() {
+ return receiveDate;
+ }
+
+ public void setReceiveDate(Date receiveDate) {
+ this.receiveDate = receiveDate;
+ }
+
+ public String getReceiveUser() {
+ return receiveUser;
+ }
+
+ public void setReceiveUser(String receiveUser) {
+ this.receiveUser = receiveUser;
+ }
public Date getCreateStartDate() {
return createStartDate;
}
@@ -166,4 +229,12 @@ public class PatientServiceQuery extends BaseQuery {
this.updateUser = updateUser;
}
+
+ public String[] getParentIds() {
+ return parentIds;
+ }
+
+ public void setParentIds(String[] parentIds) {
+ this.parentIds = parentIds;
+ }
}
\ No newline at end of file
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
index bcc0e87..3711e7a 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
@@ -16,11 +16,15 @@
+
+
+
+
-insert into patient_service (id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id) values (#{id},#{parentid},#{pid},#{serType},#{serDoct},#{createDate},#{createUserName},#{createUser},#{serStatus},#{updateDate},#{updateUserName},#{updateUser},#{hospitalId})
+insert into patient_service (id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user) values (#{id},#{parentid},#{pid},#{serType},#{serDoct},#{createDate},#{createUserName},#{createUser},#{serStatus},#{updateDate},#{updateUserName},#{updateUser},#{hospitalId},#{serCode},#{status},#{receiveDate},#{receiveUser})
@@ -63,6 +67,18 @@ insert into patient_service (id,parentid,pid,ser_type,ser_doct,create_date,creat
hospital_id = #{hospitalId,jdbcType=VARCHAR},
+
+ ser_code = #{serCode,jdbcType=VARCHAR},
+
+
+ status = #{status,jdbcType=INTEGER},
+
+
+ receive_date = #{receiveDate,jdbcType=TIMESTAMP},
+
+
+ receive_user = #{receiveUser,jdbcType=VARCHAR},
+
where id = #{id,jdbcType=VARCHAR}
@@ -74,7 +90,7 @@ delete from patient_service where id = #{id,jdbcType=VARCHAR}
@@ -98,6 +114,13 @@ select id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_use
and parentid = #{parentid,jdbcType=VARCHAR}
+
+ and parentid in (
+
+ #{parentid}
+
+ )
+
and pid = #{pid,jdbcType=VARCHAR}
@@ -143,6 +166,21 @@ select id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_use
and hospital_id = #{hospitalId,jdbcType=VARCHAR}
+
+ and ser_code = #{serCode,jdbcType=VARCHAR}
+
+
+ and status = #{status,jdbcType=INTEGER}
+
+
+ and receive_date = #{receiveDate,jdbcType=TIMESTAMP}
+
+
+ and receive_user = #{receiveUser,jdbcType=VARCHAR}
+
+
+ ${sql}
+
@@ -150,7 +188,7 @@ select id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_use