From 15a1b32534cbfd4826ddc06ba36288210edd9ec8 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 26 Dec 2017 18:22:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B2=A1=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=9A=84=E6=97=B6=E5=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/TempFacade.java | 62 +++++++++++----------- .../operate/web/request/TempQueryRequest.java | 10 ++-- 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java index 7010d31..1497249 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java @@ -127,45 +127,47 @@ public class TempFacade { public BaseResponse findTempDataList(TempQueryRequest queryRequest, Integer userId) { List hospital = groupsFacade.findGroupHospital(userId, false); - PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setCardNo(queryRequest.getCardNo()); - patientsQuery.setVcCardNo(queryRequest.getVcCardNo()); - patientsQuery.setHospitalList(hospital); - patientsQuery.setLastMensesStart(queryRequest.capEnd()); - patientsQuery.setLastMensesEnd(queryRequest.capStart()); - patientsQuery.setExtEnable(false); - patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setType(1); - Date currentDate = DateUtil.formatDate(new Date()); - if (null != queryRequest.getStartAge()) { - Date date = DateUtil.addYear(currentDate, -queryRequest.getStartAge()); - patientsQuery.setBirthEnd(date); - } - if (null != queryRequest.getEndAge()) { - Date date = DateUtil.addYear(currentDate, -queryRequest.getEndAge()); - date = DateUtil.addYear(date, -1); + TempQuery tempQuery = new TempQuery(); + if(queryRequest.hasParam()){ + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setCardNo(queryRequest.getCardNo()); + patientsQuery.setVcCardNo(queryRequest.getVcCardNo()); + patientsQuery.setHospitalList(hospital); + patientsQuery.setLastMensesStart(queryRequest.capEnd()); + patientsQuery.setLastMensesEnd(queryRequest.capStart()); + patientsQuery.setExtEnable(false); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setType(1); + Date currentDate = DateUtil.formatDate(new Date()); + if (null != queryRequest.getStartAge()) { + Date date = DateUtil.addYear(currentDate, -queryRequest.getStartAge()); + patientsQuery.setBirthEnd(date); + } + if (null != queryRequest.getEndAge()) { + Date date = DateUtil.addYear(currentDate, -queryRequest.getEndAge()); + date = DateUtil.addYear(date, -1); - patientsQuery.setBirthStart(DateUtil.addDay(date, 1)); - } + patientsQuery.setBirthStart(DateUtil.addDay(date, 1)); + } - List patientses = patientsService.queryPatient(patientsQuery); - if (CollectionUtils.isEmpty(patientses)) { - return new BaseListResponse().setData(new ArrayList()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); - } - List pids = new ArrayList<>(); - for (Patients patients : patientses) { - if (StringUtils.isNotEmpty(patients.getPid())) { - pids.add(patients.getPid()); + List patientses = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isEmpty(patientses)) { + return new BaseListResponse().setData(new ArrayList()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + List pids = new ArrayList<>(); + for (Patients patients : patientses) { + if (StringUtils.isNotEmpty(patients.getPid())) { + pids.add(patients.getPid()); + } + } + tempQuery.setpIds(pids); } - TempQuery tempQuery = new TempQuery(); tempQuery.setYn(YnEnums.YES.getId()); - tempQuery.setpIds(pids); + tempQuery.setPage(queryRequest.getPage()); tempQuery.setLimit(queryRequest.getLimit()); tempQuery.setNeed("1"); - tempQuery.setHospitalList(hospital); List temp = tempService.queryTemp(tempQuery); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TempQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TempQueryRequest.java index 6a5648d..c9f4ac5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TempQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TempQueryRequest.java @@ -22,7 +22,7 @@ import java.util.Date; * @since BME V100R001C40B104 */ @Form -public class TempQueryRequest extends BasePageQueryRequest{ +public class TempQueryRequest extends BasePageQueryRequest { @FormParam private String vcCardNo; @FormParam @@ -45,6 +45,10 @@ public class TempQueryRequest extends BasePageQueryRequest{ return null; } + public boolean hasParam() { + return StringUtils.isNotEmpty(vcCardNo) || StringUtils.isNotEmpty(cardNo) || StringUtils.isNotEmpty(startDueWeek) || StringUtils.isNotEmpty(endDueWeek) || null != startAge || null != endAge; + } + public Date capEnd() { if (StringUtils.isNotEmpty(endDueWeek)) { int end = NumberUtils.toInt(endDueWeek, 0); @@ -55,7 +59,7 @@ public class TempQueryRequest extends BasePageQueryRequest{ } public String getVcCardNo() { - if(org.apache.commons.lang.StringUtils.isBlank(vcCardNo)){ + if (org.apache.commons.lang.StringUtils.isBlank(vcCardNo)) { return null; } return vcCardNo; @@ -66,7 +70,7 @@ public class TempQueryRequest extends BasePageQueryRequest{ } public String getCardNo() { - if(org.apache.commons.lang.StringUtils.isBlank(cardNo)){ + if (org.apache.commons.lang.StringUtils.isBlank(cardNo)) { return null; } return cardNo; -- 1.8.3.1