diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyPatientExtendEarScreenMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyPatientExtendEarScreenMapper.java index 2099f94..873019b 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyPatientExtendEarScreenMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyPatientExtendEarScreenMapper.java @@ -22,4 +22,5 @@ public interface BabyPatientExtendEarScreenMapper { public List notAuscultationBabyPatientExtendEarScreen(BabyPatientExtendEarScreenQuery query); + public List dubiousScreen(BabyPatientExtendEarScreenQuery screenQuery); } \ No newline at end of file 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 fd936ac..89a89b0 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 @@ -34,6 +34,16 @@ public class BabyPatientExtendEarScreenQuery extends BaseQuery { private Date screenDate; /** + * 筛查开始时间 + */ + private Date screenStartDate; + + /** + * 筛查结束时间 + */ + private Date screenEndDate; + + /** * 高危因素 1=早产 2=晚产 */ private Integer highRiskCause; @@ -173,6 +183,22 @@ public class BabyPatientExtendEarScreenQuery extends BaseQuery { } + public Date getScreenStartDate() { + return screenStartDate; + } + + public void setScreenStartDate(Date screenStartDate) { + this.screenStartDate = screenStartDate; + } + + public Date getScreenEndDate() { + return screenEndDate; + } + + public void setScreenEndDate(Date screenEndDate) { + this.screenEndDate = screenEndDate; + } + public String[] getBabyIds() { return babyIds; } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ChildrenPersonQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ChildrenPersonQuery.java index dd7a168..868acd2 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ChildrenPersonQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ChildrenPersonQuery.java @@ -14,6 +14,8 @@ public class ChildrenPersonQuery extends BaseQuery private Integer gender; private String papersNum; private Date birthday; + private Date endBirthday; + private Date startBirthday; private String addressProvince; private String addressCity; private String addressArea; @@ -27,9 +29,18 @@ public class ChildrenPersonQuery extends BaseQuery private String basePapersNumber; private Date baseWomanBirth; private String contactWomanWay; + private String keyWord; private Integer degree; private Integer occupation; + public String getKeyWord() { + return keyWord; + } + + public void setKeyWord(String keyWord) { + this.keyWord = keyWord; + } + public String getId() { return id; @@ -47,6 +58,21 @@ public class ChildrenPersonQuery extends BaseQuery return motherId; } + public Date getEndBirthday() { + return endBirthday; + } + + public void setEndBirthday(Date endBirthday) { + this.endBirthday = endBirthday; + } + + public Date getStartBirthday() { + return startBirthday; + } + + public void setStartBirthday(Date startBirthday) { + this.startBirthday = startBirthday; + } public void setMotherId(String motherId) { diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyPatientExtendEarScreenService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyPatientExtendEarScreenService.java index 08f3736..5b809d1 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyPatientExtendEarScreenService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyPatientExtendEarScreenService.java @@ -22,4 +22,5 @@ public interface BabyPatientExtendEarScreenService { public List notAuscultationBabyPatientExtendEarScreen(BabyPatientExtendEarScreenQuery query); + public List dubiousScreen(BabyPatientExtendEarScreenQuery screenQuery); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarScreenServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarScreenServiceImpl.java index ba2ac3a..88c0a99 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarScreenServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarScreenServiceImpl.java @@ -54,6 +54,11 @@ public class BabyPatientExtendEarScreenServiceImpl implements BabyPatientExtendE } @Override + public List dubiousScreen(BabyPatientExtendEarScreenQuery screenQuery) { + return babyPatientExtendEarScreenMapper.dubiousScreen(screenQuery); + } + + @Override public List queryScrBabyIds(BabyPatientExtendEarScreenQuery query) { return babyPatientExtendEarScreenMapper.queryScrBabyIds(query); } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml index 5a8d58d..9675caf 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml @@ -282,6 +282,43 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ + +