From fb30a9a82ec3d6fa599449c2c10617b250fa5e6e Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 8 Feb 2023 15:30:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/AreaCountController.java | 36 ++- .../operate/web/facade/PatientSyncMysqlFacade.java | 279 ++++++++++++++++++--- 2 files changed, 264 insertions(+), 51 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java index 6458378..2c926ee 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java @@ -932,9 +932,10 @@ public class AreaCountController extends BaseController { public BaseResponse getBabyFmList1(HttpServletRequest request, Integer page, Integer limit, @RequestParam( required = false) String hospitalId, + @RequestParam( required = false) String streetId, @RequestParam Integer type, // 1本月活产 2累计活产 @RequestParam Date dateTime) { - return patientSyncMysqlFacade.getBabyFmList1(page,limit,hospitalId,dateTime,type); + return patientSyncMysqlFacade.getBabyFmList1(page,limit,hospitalId,streetId,dateTime,type); } /** * 新生儿访视 @@ -951,10 +952,11 @@ public class AreaCountController extends BaseController { public BaseResponse getBabyFsList1(HttpServletRequest request, Integer page, Integer limit, @RequestParam( required = false) String hospitalId, + @RequestParam( required = false) String streetId, @RequestParam Integer type, // 1本月访视 2累计访视 @RequestParam Date dateTime) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientSyncMysqlFacade.getBabyFsList1(page,limit,hospitalId,dateTime,type); + return patientSyncMysqlFacade.getBabyFsList1(page,limit,hospitalId,streetId,dateTime,type); } /** @@ -972,12 +974,13 @@ public class AreaCountController extends BaseController { public BaseResponse getBabyBuildCountList1(HttpServletRequest request, Integer page, Integer limit, @RequestParam( required = false) String hospitalId, + @RequestParam( required = false) String streetId, @RequestParam Integer type, // 1 0-3岁总数 2 0-6岁总数 @RequestParam(value = "startMonthAge", required = false) Integer startMonthAge, @RequestParam(value = "endMonthAge", required = false) Integer endMonthAge, @RequestParam Date dateTime) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientSyncMysqlFacade.getBabyBuildCountList1(page,limit,hospitalId,dateTime,type,startMonthAge,endMonthAge); + return patientSyncMysqlFacade.getBabyBuildCountList1(page,limit,hospitalId,streetId,dateTime,type,startMonthAge,endMonthAge); } @@ -996,10 +999,11 @@ public class AreaCountController extends BaseController { public BaseResponse getBabySystemCountList1(HttpServletRequest request, Integer page, Integer limit, @RequestParam( required = false) String hospitalId, + @RequestParam( required = false) String streetId, @RequestParam Integer type, // 1 0-3岁儿童系统管理人数 2 0-6岁儿童系统管理人数 @RequestParam Date dateTime) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientSyncMysqlFacade.getBabySystemCountList1(page,limit,hospitalId,dateTime,type); + return patientSyncMysqlFacade.getBabySystemCountList1(page,limit,hospitalId,streetId,dateTime,type); } @@ -1017,9 +1021,10 @@ public class AreaCountController extends BaseController { public BaseResponse getBabyHealthList1(HttpServletRequest request, Integer page, Integer limit, @RequestParam( required = false) String hospitalId, + @RequestParam( required = false) String streetId, @RequestParam Date dateTime) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientSyncMysqlFacade.getBabyHealthList1(page,limit,hospitalId,dateTime); + return patientSyncMysqlFacade.getBabyHealthList1(page,limit,hospitalId,streetId,dateTime); } @@ -1038,10 +1043,11 @@ public class AreaCountController extends BaseController { public BaseResponse getPregnantBuildCountList1(HttpServletRequest request, Integer page, Integer limit, @RequestParam( required = false) String hospitalId, + @RequestParam( required = false) String streetId, @RequestParam Integer type, // 1 13周以前建档人数 @RequestParam Date dateTime) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientSyncMysqlFacade.getPregnantBuildCountList1(page,limit,hospitalId,dateTime,type); + return patientSyncMysqlFacade.getPregnantBuildCountList1(page,limit,hospitalId,streetId,dateTime,type); } /** @@ -1058,9 +1064,10 @@ public class AreaCountController extends BaseController { public BaseResponse getPregnantSysCountList1(HttpServletRequest request, Integer page, Integer limit, @RequestParam( required = false) String hospitalId, + @RequestParam( required = false) String streetId, @RequestParam Date dateTime) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientSyncMysqlFacade.getPregnantSysCountList1(page,limit,hospitalId,dateTime); + return patientSyncMysqlFacade.getPregnantSysCountList1(page,limit,hospitalId,streetId,dateTime); } /** @@ -1077,9 +1084,10 @@ public class AreaCountController extends BaseController { public BaseResponse getPregnantHealthCountList1(HttpServletRequest request, Integer page, Integer limit, @RequestParam( required = false) String hospitalId, + @RequestParam( required = false) String streetId, @RequestParam Date dateTime) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientSyncMysqlFacade.getPregnantHealthCountList1(page,limit,hospitalId,dateTime); + return patientSyncMysqlFacade.getPregnantHealthCountList1(page,limit,hospitalId,streetId,dateTime); } @@ -1097,9 +1105,10 @@ public class AreaCountController extends BaseController { public BaseResponse getChFsCountList1(HttpServletRequest request, Integer page, Integer limit, @RequestParam( required = false) String hospitalId, + @RequestParam( required = false) String streetId, @RequestParam Date dateTime) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientSyncMysqlFacade.getChFsCountList1(page,limit,hospitalId,dateTime); + return patientSyncMysqlFacade.getChFsCountList1(page,limit,hospitalId,streetId,dateTime); } @@ -1117,9 +1126,10 @@ public class AreaCountController extends BaseController { public BaseResponse getBabyEyeCheckItems1(HttpServletRequest request, Integer page, Integer limit, @RequestParam( required = false) String hospitalId, + @RequestParam( required = false) String streetId, @RequestParam Date dateTime) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientSyncMysqlFacade.getBabyEyeCheckItems1(page,limit,hospitalId,dateTime); + return patientSyncMysqlFacade.getBabyEyeCheckItems1(page,limit,hospitalId,streetId,dateTime); } @@ -1135,10 +1145,11 @@ public class AreaCountController extends BaseController { public BaseResponse getBabyZyzdItems1(HttpServletRequest request, Integer page, Integer limit, @RequestParam( required = false) String hospitalId, + @RequestParam( required = false) String streetId, @RequestParam( required = true) Integer type, //1 本月中医指导人数 2累计中医指导人数 @RequestParam Date dateTime) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientSyncMysqlFacade.getBabyZyzdItems1(page,limit,hospitalId,dateTime,type); + return patientSyncMysqlFacade.getBabyZyzdItems1(page,limit,hospitalId,streetId,dateTime,type); } /** @@ -1156,9 +1167,10 @@ public class AreaCountController extends BaseController { public BaseResponse getAntexRecords1(HttpServletRequest request, Integer page, Integer limit, @RequestParam( required = false) String hospitalId, + @RequestParam( required = false) String streetId, @RequestParam( required = true) Integer type , // 1 月度 2 年度 @RequestParam Date dateTime) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientSyncMysqlFacade.getAntexRecords1(page,limit,dateTime,hospitalId,type); + return patientSyncMysqlFacade.getAntexRecords1(page,limit,dateTime,hospitalId,streetId,type); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java index 17cdd5d..50de405 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java @@ -3592,10 +3592,19 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { * @param streetId 街道id * @return */ - private List getOrganization(String streetId){ + private List getOrganization(String streetId){ OrganizationQuery organizationQuery = new OrganizationQuery(); organizationQuery.setStreetId(streetId); - return organizationService.queryOrganization(organizationQuery); + List organizations = organizationService.queryOrganization(organizationQuery); + List hids = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(organizations)) + { + for(Organization organization : organizations) + { + hids.add(organization.getId()+""); + } + } + return hids; } /** @@ -4714,10 +4723,10 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { } - public BaseResponse getBabyZyzdItems1( Integer page, Integer limit, String hospitalId, Date dateTime,Integer type) { + public BaseResponse getBabyZyzdItems1( Integer page, Integer limit, String hospitalId,String streetId, Date dateTime,Integer type) { BabyCheckModelQuery checkModelQuery1 = new BabyCheckModelQuery(); - if (StringUtils.isNotEmpty(hospitalId)) + if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(streetId)) { Date endDate = DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); @@ -4726,7 +4735,22 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { checkModelQuery1.setBirthEnd(start1); Date end1 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -36 - 1), 1); - checkModelQuery1.setHospitalId(hospitalId); + if (StringUtils.isNotEmpty(hospitalId)) + { + checkModelQuery1.setHospitalId(hospitalId); + } + else + { + List hids = getOrganization(streetId); + if (CollectionUtils.isNotEmpty(hids)) + { + checkModelQuery1.setHospitalIds(hids); + } + else + { + return new BaseListResponse(); + } + } checkModelQuery1.setYn(YnEnums.YES.getId()); checkModelQuery1.setBirthStart(end1); checkModelQuery1.setBirthEnd(start1); @@ -5562,19 +5586,37 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { /************************************************/ - public BaseResponse getBabyFmList1(Integer page, Integer limit, String hospitalId, Date dateTime, Integer type) { + + public BaseResponse getBabyFmList1(Integer page, Integer limit, String hospitalId,String streetId, Date dateTime, Integer type) { List results = new ArrayList<>(); //获得区县下的街道 Date startDate=DateUtil.getDateMonthFirst(dateTime); Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); BabyModelQuery babyModelQuery = new BabyModelQuery(); - if (StringUtils.isNotEmpty(hospitalId)) + if (StringUtils.isNotEmpty(hospitalId)|| StringUtils.isNotEmpty(streetId)) { babyModelQuery.setExistSource(false); babyModelQuery.setDataStatus(false); babyModelQuery.setBuildType(2); babyModelQuery.setPregnancyOut("0"); - babyModelQuery.setHospitalId(hospitalId); + if (StringUtils.isNotEmpty(hospitalId)) + { + babyModelQuery.setHospitalId(hospitalId); + } + else + { + List hids = getOrganization(streetId); + if (CollectionUtils.isNotEmpty(hids)) + { + babyModelQuery.setHospitalIdList(hids); + } + else + { + return new BaseListResponse().setErrorcode(0).setErrormsg("成功") + .setData(results).setPageInfo(babyModelQuery.getPageInfo()); + } + } + babyModelQuery.setPage(page); babyModelQuery.setLimit(limit); @@ -5633,7 +5675,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { .setData(results).setPageInfo(babyModelQuery.getPageInfo()); } - public BaseResponse getBabyFsList1(Integer page, Integer limit, String hospitalId, Date dateTime, Integer type) { + public BaseResponse getBabyFsList1(Integer page, Integer limit, String hospitalId, String streetId, Date dateTime, Integer type) { List results = new ArrayList<>(); @@ -5641,11 +5683,31 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { Date startDate=DateUtil.getDateMonthFirst(dateTime); Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); - if (StringUtils.isNotEmpty(hospitalId)) + if (StringUtils.isNotEmpty(hospitalId)|| StringUtils.isNotEmpty(streetId)) { - Criteria criteria = Criteria. + Criteria criteria = null; + + + if (StringUtils.isNotEmpty(hospitalId)) + { + criteria = Criteria. where("yn").is("1") .and("hospitalId").is(hospitalId); + } + else + { + List hids = getOrganization(streetId); + if (CollectionUtils.isNotEmpty(hids)) + { + criteria = Criteria. + where("yn").is("1") + .and("hospitalId").in(hids); + } + else + { + return new BaseListResponse(); + } + } if (type == 1) { //本月访视人数 @@ -5691,7 +5753,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { return new BaseListResponse(); } - public BaseResponse getBabyBuildCountList1(Integer page, Integer limit, String hospitalId, + public BaseResponse getBabyBuildCountList1(Integer page, Integer limit, String hospitalId,String streetId, Date dateTime, Integer type, Integer startMonthAge,Integer endMonthAge) { @@ -5736,12 +5798,27 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); BabyModelQuery babyQuery = new BabyModelQuery(); - if (StringUtils.isNotEmpty(hospitalId)) + if (StringUtils.isNotEmpty(hospitalId)|| StringUtils.isNotEmpty(streetId)) { babyQuery.setExistSource(false); //babyQuery.setDataStatus(true);//排除自动建档数据 babyQuery.setYn(YnEnums.YES.getId()); - babyQuery.setHospitalId(hospitalId); + if (StringUtils.isNotEmpty(hospitalId)) + { + babyQuery.setHospitalId(hospitalId); + } + else + { + List hids = getOrganization(streetId); + if (CollectionUtils.isNotEmpty(hids)) + { + babyQuery.setHospitalIdList(hids); + } + else + { + return new BaseListResponse(); + } + } Date currentDate1 = DateUtil.formatDate(new Date()); Date start1 = DateUtil.addMonth(currentDate1, 0); babyQuery.setBirthEnd(start1); @@ -5819,17 +5896,32 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { } - public BaseResponse getPregnantBuildCountList1(Integer page, Integer limit, String hospitalId, Date dateTime, Integer type) { + public BaseResponse getPregnantBuildCountList1(Integer page, Integer limit, String hospitalId,String streetId, Date dateTime, Integer type) { List results = new ArrayList<>(); Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); PatientsQuery patientsQuery=new PatientsQuery(); - if (StringUtils.isNotEmpty(hospitalId)) + if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(streetId)) { //孕13周之前建册的人数 patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setHospitalId(hospitalId); + if (StringUtils.isNotEmpty(hospitalId)) + { + patientsQuery.setHospitalId(hospitalId); + } + else + { + List hids = getOrganization(streetId); + if (CollectionUtils.isNotEmpty(hids)) + { + patientsQuery.setHospitalList(hids); + } + else + { + return new BaseListResponse(); + } + } patientsQuery.setBuildDaysStart(0); patientsQuery.setBuildDaysEnd(13*7-1); patientsQuery.setDueStatus(0); @@ -5874,16 +5966,35 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { .setData(results).setPageInfo(patientsQuery.getPageInfo()); } - public BaseResponse getChFsCountList1(Integer page, Integer limit, String hospitalId, Date dateTime) { + public BaseResponse getChFsCountList1(Integer page, Integer limit, String hospitalId,String streetId, Date dateTime) { List results = new ArrayList<>(); Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); - if (StringUtils.isNotEmpty(hospitalId)) + if (StringUtils.isNotEmpty(hospitalId)|| StringUtils.isNotEmpty(streetId)) { //传入的时间获取年的第一天 Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); - Criteria criteria = Criteria. - where("hospitalId").is(hospitalId).and("checkTime").lte(endDate).gte(startDateFirst).and("yn").is(1); + Criteria criteria = null; + + if (StringUtils.isNotEmpty(hospitalId)) + { + criteria = Criteria. + where("hospitalId").is(hospitalId).and("checkTime").lte(endDate).gte(startDateFirst).and("yn").is(1); + } + else + { + List hids = getOrganization(streetId); + if (CollectionUtils.isNotEmpty(hids)) + { + criteria = Criteria. + where("hospitalId").in(hids).and("checkTime").lte(endDate).gte(startDateFirst).and("yn").is(1); + } + else + { + return new BaseListResponse(); + } + } + PageResult pageResult = findMongoPage(PostReviewModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "visitDate")), page, limit); List postReviewModels = (List ) pageResult.getGrid(); @@ -5920,9 +6031,9 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { } - public BaseResponse getBabyEyeCheckItems1(Integer page, Integer limit, String hospitalId, Date dateTime) { + public BaseResponse getBabyEyeCheckItems1(Integer page, Integer limit, String hospitalId,String streetId, Date dateTime) { - if (StringUtils.isNotEmpty(hospitalId)) + if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(streetId)) { Date endDate = DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); Date currentDate1 = DateUtil.formatDate(new Date()); @@ -5933,7 +6044,22 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { BabyModelQuery babyQuery3 = new BabyModelQuery(); babyQuery3.setExistSource(false); babyQuery3.setYn(YnEnums.YES.getId()); - babyQuery3.setHospitalId(hospitalId); + if (StringUtils.isNotEmpty(hospitalId)) + { + babyQuery3.setHospitalId(hospitalId); + } + else + { + List hids = getOrganization(streetId); + if (CollectionUtils.isNotEmpty(hids)) + { + babyQuery3.setHospitalIdList(hids); + } + else + { + return new BaseListResponse(); + } + } Date start3 = DateUtil.addMonth(currentDate1, 0); babyQuery3.setBirthEnd(start3); Date end3 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -72 - 1), 1); @@ -5981,7 +6107,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { return RespBuilder.buildSuccess(null); } - public BaseResponse getBabyHealthList1(Integer page, Integer limit, String hospitalId, Date dateTime) { + public BaseResponse getBabyHealthList1(Integer page, Integer limit, String hospitalId,String streetId, Date dateTime) { List results = new ArrayList<>(); @@ -5989,12 +6115,27 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); BabyModelQuery babyQuery = new BabyModelQuery(); - if (StringUtils.isNotEmpty(hospitalId)) + if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(streetId)) { babyQuery.setExistSource(false); babyQuery.setYn(YnEnums.YES.getId()); - babyQuery.setHospitalId(hospitalId); + if (StringUtils.isNotEmpty(hospitalId)) + { + babyQuery.setHospitalId(hospitalId); + } + else + { + List hids = getOrganization(streetId); + if (CollectionUtils.isNotEmpty(hids)) + { + babyQuery.setHospitalIdList(hids); + } + else + { + return new BaseListResponse(); + } + } Date currentDate1 = DateUtil.formatDate(new Date()); Date start1 = DateUtil.addMonth(currentDate1, 0); @@ -6036,19 +6177,34 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { .setData(results).setPageInfo(babyQuery.getPageInfo()); } - public BaseResponse getBabySystemCountList1(Integer page, Integer limit, String hospitalId, Date dateTime, Integer type) { + public BaseResponse getBabySystemCountList1(Integer page, Integer limit, String hospitalId,String streetId, Date dateTime, Integer type) { List results = new ArrayList<>(); Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); BabyModelQuery babyQuery = new BabyModelQuery(); - if (StringUtils.isNotEmpty(hospitalId)) + if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(streetId)) { // babyQuery.setDataStatus(true);//排除自动建档数据 babyQuery.setExistSource(false); babyQuery.setYn(YnEnums.YES.getId()); - babyQuery.setHospitalId(hospitalId); + if (StringUtils.isNotEmpty(hospitalId)) + { + babyQuery.setHospitalId(hospitalId); + } + else + { + List hids = getOrganization(streetId); + if (CollectionUtils.isNotEmpty(hids)) + { + babyQuery.setHospitalIdList(hids); + } + else + { + return new BaseListResponse(); + } + } Date currentDate1 = DateUtil.formatDate(new Date()); Date start1 = DateUtil.addMonth(currentDate1, 0); babyQuery.setBirthEnd(start1); @@ -6095,16 +6251,31 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { .setData(results).setPageInfo(babyQuery.getPageInfo()); } - public BaseResponse getPregnantHealthCountList1(Integer page, Integer limit, String hospitalId, + public BaseResponse getPregnantHealthCountList1(Integer page, Integer limit, String hospitalId,String streetId, Date dateTime) { List results = new ArrayList<>(); Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); PatientsQuery patientsQuery=new PatientsQuery(); - if (StringUtils.isNotEmpty(hospitalId)) + if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(streetId)) { - patientsQuery.setHospitalId(hospitalId); + if (StringUtils.isNotEmpty(hospitalId)) + { + patientsQuery.setHospitalId(hospitalId); + } + else + { + List hids = getOrganization(streetId); + if (CollectionUtils.isNotEmpty(hids)) + { + patientsQuery.setHospitalList(hids); + } + else + { + return new BaseListResponse(); + } + } patientsQuery.setBuildDaysStart(0); patientsQuery.setBuildDaysEnd(1000); patientsQuery.setDueStatus(0); @@ -6159,16 +6330,31 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { .setData(results).setPageInfo(patientsQuery.getPageInfo()); } - public BaseResponse getPregnantSysCountList1(Integer page, Integer limit, String hospitalId, + public BaseResponse getPregnantSysCountList1(Integer page, Integer limit, String hospitalId,String streetId, Date dateTime) { List results = new ArrayList<>(); Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); PatientsQuery patientsQuery=new PatientsQuery(); - if (StringUtils.isNotEmpty(hospitalId)) + if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(streetId)) { - patientsQuery.setHospitalId(hospitalId); + if (StringUtils.isNotEmpty(hospitalId)) + { + patientsQuery.setHospitalId(hospitalId); + } + else + { + List hids = getOrganization(streetId); + if (CollectionUtils.isNotEmpty(hids)) + { + patientsQuery.setHospitalList(hids); + } + else + { + return new BaseListResponse(); + } + } Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); patientsQuery.setBookbuildingDateStart(startDateFirst); patientsQuery.setBookbuildingDateEnd(endDate); @@ -6215,19 +6401,34 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { } public BaseResponse getAntexRecords1(Integer page, Integer limit, - Date dateTime, String hospitalId,Integer type) { + Date dateTime, String hospitalId,String streetId,Integer type) { List results = new ArrayList<>(); Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); Date startDate=DateUtil.getDateMonthFirst(dateTime); Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); - if (StringUtils.isNotEmpty(hospitalId)) + if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(streetId)) { antExRecordQuery.setPage(page); antExRecordQuery.setLimit(limit); antExRecordQuery.setNeed("true"); - antExRecordQuery.setHospitalId(hospitalId); + if (StringUtils.isNotEmpty(hospitalId)) + { + antExRecordQuery.setHospitalId(hospitalId); + } + else + { + List hids = getOrganization(streetId); + if (CollectionUtils.isNotEmpty(hids)) + { + antExRecordQuery.setHospitalList(hids); + } + else + { + return new BaseListResponse(); + } + } if (type == 1) { -- 1.8.3.1