diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java index 4084a0e..5d48e16 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java @@ -190,6 +190,12 @@ public class BabyPsychologistModel extends BaseModel { //初诊页面的现病史 private String presentIllness; + + //发育迟缓专科检查 cz初诊,fz复诊 + private String czOrfzProject; + private String czOrfzProjectName; + + public String getCjfy() { return cjfy; } @@ -835,6 +841,21 @@ public class BabyPsychologistModel extends BaseModel { return serialVersionUID; } + public String getCzOrfzProject() { + return czOrfzProject; + } + + public void setCzOrfzProject(String czOrfzProject) { + this.czOrfzProject = czOrfzProject; + } + + public String getCzOrfzProjectName() { + return czOrfzProjectName; + } + + public void setCzOrfzProjectName(String czOrfzProjectName) { + this.czOrfzProjectName = czOrfzProjectName; + } } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyPsychologistModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyPsychologistModelQuery.java index d1bc986..c6ce25a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyPsychologistModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyPsychologistModelQuery.java @@ -46,6 +46,12 @@ public class BabyPsychologistModelQuery extends BaseQuery implements IConvertToN private String sort; + //发育迟缓专科检查 cz初诊,fz复诊 + private String czOrfzProject; + + private String czOrfzProjectName; + + @Override public String getSort() { return sort; @@ -186,6 +192,22 @@ public class BabyPsychologistModelQuery extends BaseQuery implements IConvertToN this.checkDateEnd = checkDateEnd; } + public String getCzOrfzProject() { + return czOrfzProject; + } + + public void setCzOrfzProject(String czOrfzProject) { + this.czOrfzProject = czOrfzProject; + } + + public String getCzOrfzProjectName() { + return czOrfzProjectName; + } + + public void setCzOrfzProjectName(String czOrfzProjectName) { + this.czOrfzProjectName = czOrfzProjectName; + } + @Override public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); @@ -221,6 +243,16 @@ public class BabyPsychologistModelQuery extends BaseQuery implements IConvertToN condition = condition.and("xlzkProject", xlzkProject, MongoOper.IS); } + if (StringUtils.isNotEmpty(czOrfzProject)) { + + condition = condition.and("czOrfzProject", czOrfzProject, MongoOper.IS); + } + +// if (StringUtils.isNotEmpty(czOrfzProjectName)) { +// +// condition = condition.and("czOrfzProjectName", czOrfzProjectName, MongoOper.IS); +// } + Criteria c = null; //月龄 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java index e222746..7cc6c99 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java @@ -158,6 +158,8 @@ public class BabyPsychologistFacade extends BaseServiceImpl { model.setFzOther(request.getFzOther()); model.setCjfy(request.getCjfy()); model.setPresentIllness(request.getPresentIllness()); + model.setCzOrfzProject(request.getCzOrfzProject()); +// model.setCzOrfzProjectName(request.getCzOrfzProjectName()); return model; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPsychologistRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPsychologistRequest.java index bee547c..cb4fd09 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPsychologistRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPsychologistRequest.java @@ -183,6 +183,12 @@ public class BabyPsychologistRequest { //初诊页面的现病史 private String presentIllness; + //发育迟缓专科检查 cz初诊,fz复诊 + private String czOrfzProject; + + private String czOrfzProjectName; + + public String getCjfy() { return cjfy; } @@ -806,4 +812,20 @@ public class BabyPsychologistRequest { public void setPresentIllness(String presentIllness) { this.presentIllness = presentIllness; } + + public String getCzOrfzProject() { + return czOrfzProject; + } + + public void setCzOrfzProject(String czOrfzProject) { + this.czOrfzProject = czOrfzProject; + } + + public String getCzOrfzProjectName() { + return czOrfzProjectName; + } + + public void setCzOrfzProjectName(String czOrfzProjectName) { + this.czOrfzProjectName = czOrfzProjectName; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPsychologistResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPsychologistResult.java index 338d6be..1a37ae8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPsychologistResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPsychologistResult.java @@ -29,7 +29,7 @@ public class BabyPsychologistResult implements IBasicResultConvert