diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 81b05df..4ce14a4 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -332,6 +332,25 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { //乡镇卫生院id private String townOrgId; + private Date startAge; + private Date endAge; + + + public Date getStartAge() { + return startAge; + } + + public void setStartAge(Date startAge) { + this.startAge = startAge; + } + + public Date getEndAge() { + return endAge; + } + + public void setEndAge(Date endAge) { + this.endAge = endAge; + } public Boolean getServiceTypeIsExist() { return serviceTypeIsExist; @@ -665,6 +684,20 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { c1 = Criteria.where("fmDate").gte(fmDateStart); } } + if (startAge != null && endAge != null) { + if (c1 != null) { + c1 = c1.and("birth").lte(startAge).gte(endAge); + } else { + c1 = Criteria.where("birth").lte(startAge).gte(endAge); + } + } else if (startAge != null) { + if (null != c1) { + c1 = c1.and("birth").lte(startAge); + } else { + c1 = Criteria.where("birth").lte(startAge); + } + + } if (null != serviceType) { condition = condition.and("serviceType", serviceType, MongoOper.IS); @@ -953,6 +986,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } } + if (null != nextCheckTime) { condition = condition.and("nextCheckTime", nextCheckTime, MongoOper.NE); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java index cdea500..03f3d35 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java @@ -505,7 +505,7 @@ public class PuerperaManageController extends BaseController { try { doc = new Document(ViewController.class.getClassLoader().getResourceAsStream("sfdjb.docx")); - DocumentBuilder builder = new DocumentBuilder(doc); + /* DocumentBuilder builder = new DocumentBuilder(doc); if (map.containsKey("red")) { builder.moveToBookmark("red"); markFrameText(builder, (String) map.get("red")); @@ -515,7 +515,7 @@ public class PuerperaManageController extends BaseController { builder.moveToBookmark("orange"); markFrameText(builder, (String) map.get("orange")); map.remove("orange"); - } + }*/ markData(doc, map);//普通数据 sendToBrowser(doc, "导出", "doc", true, response); @@ -523,6 +523,9 @@ public class PuerperaManageController extends BaseController { e.printStackTrace(); } response.flushBuffer(); + + + } catch (IOException e) { e.printStackTrace(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index f60e94c..52fd8e5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -1152,6 +1152,13 @@ public class PatientFacade { patientsQuery.setLimit(patientManagerRequest.getLimit()); patientsQuery.setPage(patientManagerRequest.getPage()); } + + if (null != patientManagerRequest.getStartAge() && null != patientManagerRequest.getEndAge()) { + Date start = DateUtil.getBeforeAge(patientManagerRequest.getStartAge()); + Date end = DateUtil.getBeforeAge(patientManagerRequest.getEndAge()); + patientsQuery.setStartAge(start); + patientsQuery.setEndAge(end); + } //排查本院隐藏建档 patientsQuery.setExtEnable(false); patientsQuery.setBuildTypeNot(1); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java index f0a05ed..22d2cf7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java @@ -90,6 +90,26 @@ public class PatientManagerRequest extends BasePageQueryRequest { //居住类别 private String liveType; + private Integer startAge; + + private Integer endAge; + + public Integer getStartAge() { + return startAge; + } + + public void setStartAge(Integer startAge) { + this.startAge = startAge; + } + + public Integer getEndAge() { + return endAge; + } + + public void setEndAge(Integer endAge) { + this.endAge = endAge; + } + public String getLiveType() { return liveType; }