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 803f79a..8384543 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
@@ -121,17 +121,17 @@ public class BabyPatientExtendEarFollowUpQuery extends BaseQuery {
private Integer enalble;
//随访开始日期
- private Date followUpStartTime;
+ private String followUpStartTime;
//随访结束日期
- private Date followUpEndTime;
+ private String followUpEndTime;
//查询关键字 姓名、联系方式、就诊卡
private String keyWord;
//来源:1.本院、2.*医院、3.其他、4.全部
private Integer source;
//预约复查开始时间
- private Date nextStartTime;
+ private String nextStartTime;
//预约复查结束时间
- private Date nextEndTime;
+ private String nextEndTime;
//获取sql语句
private String sqlStr;
@@ -155,16 +155,20 @@ public class BabyPatientExtendEarFollowUpQuery extends BaseQuery {
return isArtifiCochlea;
}
- public void setIsArtifiCochlea(Integer isArtifiCochlea) {
- this.isArtifiCochlea = isArtifiCochlea;
+ public String getId() {
+ return id;
}
- public String getSqlStr() {
- return sqlStr;
+ public void setId(String id) {
+ this.id = id;
}
- public void setSqlStr(String sqlStr) {
- this.sqlStr = sqlStr;
+ public String getBabyId() {
+ return babyId;
+ }
+
+ public void setBabyId(String babyId) {
+ this.babyId = babyId;
}
public String[] getBabyIds() {
@@ -175,6 +179,18 @@ public class BabyPatientExtendEarFollowUpQuery extends BaseQuery {
this.babyIds = babyIds;
}
+ public Date getFollowTime() {
+ return followTime;
+ }
+
+ public void setFollowTime(Date followTime) {
+ this.followTime = followTime;
+ }
+
+ public void setIsArtifiCochlea(Integer isArtifiCochlea) {
+ this.isArtifiCochlea = isArtifiCochlea;
+ }
+
public String[] getCheckHospitalIds() {
return checkHospitalIds;
}
@@ -183,19 +199,19 @@ public class BabyPatientExtendEarFollowUpQuery extends BaseQuery {
this.checkHospitalIds = checkHospitalIds;
}
- public Date getFollowUpStartTime() {
+ public String getFollowUpStartTime() {
return followUpStartTime;
}
- public void setFollowUpStartTime(Date followUpStartTime) {
+ public void setFollowUpStartTime(String followUpStartTime) {
this.followUpStartTime = followUpStartTime;
}
- public Date getFollowUpEndTime() {
+ public String getFollowUpEndTime() {
return followUpEndTime;
}
- public void setFollowUpEndTime(Date followUpEndTime) {
+ public void setFollowUpEndTime(String followUpEndTime) {
this.followUpEndTime = followUpEndTime;
}
@@ -215,48 +231,28 @@ public class BabyPatientExtendEarFollowUpQuery extends BaseQuery {
this.source = source;
}
- public Date getNextStartTime() {
+ public String getNextStartTime() {
return nextStartTime;
}
- public void setNextStartTime(Date nextStartTime) {
+ public void setNextStartTime(String nextStartTime) {
this.nextStartTime = nextStartTime;
}
- public Date getNextEndTime() {
+ public String getNextEndTime() {
return nextEndTime;
}
- public void setNextEndTime(Date nextEndTime) {
+ public void setNextEndTime(String nextEndTime) {
this.nextEndTime = nextEndTime;
}
- public String getId() {
- return id;
- }
-
-
- public void setId(String id) {
- this.id = id;
-
- }
-
- public String getBabyId() {
- return babyId;
- }
-
- public void setBabyId(String babyId) {
- this.babyId = babyId;
- }
-
- public Date getFollowTime() {
- return followTime;
+ public String getSqlStr() {
+ return sqlStr;
}
-
- public void setFollowTime(Date followTime) {
- this.followTime = followTime;
-
+ public void setSqlStr(String sqlStr) {
+ this.sqlStr = sqlStr;
}
public String getFollowAddr() {
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml
index 81a52a2..2648be2 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml
@@ -268,6 +268,15 @@ select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,foll
+
+
-
+
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
index afdbcc3..307fc27 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
@@ -321,7 +321,7 @@ public class FollowUpController extends BaseController {
query.setNextEndTime(fur.getNextEndTime());
query.setSource(fur.getSource());
//分页信息
- // query.setNeed("1");
+ query.setNeed("1");
query.setSort("create_time");
query.setLimit(fur.getLimit());
query.setPage(fur.getPage());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FollowUpRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FollowUpRequest.java
index 951f057..18c176c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FollowUpRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FollowUpRequest.java
@@ -1,7 +1,5 @@
package com.lyms.platform.operate.web.request;
-import java.util.Date;
-
/**
* @auther yangfei
* @createTime 2017年05月15日 15时24分
@@ -9,9 +7,9 @@ import java.util.Date;
*/
public class FollowUpRequest extends BasePageQueryRequest{
//随访开始日期
- private Date followUpStartTime;
+ private String followUpStartTime;
//随访结束日期
- private Date followUpEndTime;
+ private String followUpEndTime;
//随访医生
private String followDoctorId;
//查询关键字 姓名、联系方式、就诊卡
@@ -25,24 +23,23 @@ public class FollowUpRequest extends BasePageQueryRequest{
//干预治疗 0-未干预治疗,1-人工耳蜗,2-助听器,3-手术
private String [] interCure;
//预约复查开始时间
- private Date nextStartTime;
+ private String nextStartTime;
//预约复查结束时间
- private Date nextEndTime;
-
+ private String nextEndTime;
- public Date getFollowUpStartTime() {
+ public String getFollowUpStartTime() {
return followUpStartTime;
}
- public void setFollowUpStartTime(Date followUpStartTime) {
- this.followUpStartTime = followUpStartTime;
+ public String getFollowUpEndTime() {
+ return followUpEndTime;
}
- public Date getFollowUpEndTime() {
- return followUpEndTime;
+ public void setFollowUpStartTime(String followUpStartTime) {
+ this.followUpStartTime = followUpStartTime;
}
- public void setFollowUpEndTime(Date followUpEndTime) {
+ public void setFollowUpEndTime(String followUpEndTime) {
this.followUpEndTime = followUpEndTime;
}
@@ -89,22 +86,24 @@ public class FollowUpRequest extends BasePageQueryRequest{
public String[] getInterCure() {
return interCure;
}
+
public void setInterCure(String[] interCure) {
this.interCure = interCure;
}
- public Date getNextStartTime() {
+
+ public String getNextStartTime() {
return nextStartTime;
}
- public void setNextStartTime(Date nextStartTime) {
+ public void setNextStartTime(String nextStartTime) {
this.nextStartTime = nextStartTime;
}
- public Date getNextEndTime() {
+ public String getNextEndTime() {
return nextEndTime;
}
- public void setNextEndTime(Date nextEndTime) {
+ public void setNextEndTime(String nextEndTime) {
this.nextEndTime = nextEndTime;
}
}