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 6c22615..e2dd828 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 @@ -549,11 +549,59 @@ public class AreaCountController extends BaseController { @RequestParam( required = false) String streetId, @RequestParam Integer type, // 1本月活产 2累计活产 @RequestParam Date dateTime) { - LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return patientSyncMysqlFacade.getBabyFmList(page,limit,areaId,streetId,dateTime,type); } /** + * + * @param request + * @param page + * @param limit + * @param areaId + * @param streetId + * @param type + * @param update + * @param dateTime + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getBabyFmListTest") + @ResponseBody + public BaseResponse getBabyFmListTest(HttpServletRequest request, + Integer page, Integer limit, + @RequestParam String areaId, + @RequestParam( required = false) String streetId, + @RequestParam Integer type, // 1本月活产 2累计活产 + @RequestParam( required = false) Integer update, + @RequestParam Date dateTime) { + return patientSyncMysqlFacade.getBabyFmListTest(page,limit,areaId,streetId,dateTime,type,update); + } + + + @RequestMapping(method = RequestMethod.GET, value = "/getBabyFmListTestPatient") + @ResponseBody + public BaseResponse getBabyFmListTestPatient(HttpServletRequest request, + Integer page, Integer limit, + @RequestParam String areaId, + @RequestParam( required = false) String streetId, + @RequestParam Integer type, // 1本月活产 2累计活产 + @RequestParam Date dateTime) { + return patientSyncMysqlFacade.getBabyFmListTestPatient(page,limit,areaId,streetId,dateTime,type); + } + + @RequestMapping(method = RequestMethod.GET, value = "/getBabyFmListTestPatientUpdate") + @ResponseBody + public BaseResponse getBabyFmListTestPatientUpdate(HttpServletRequest request, + Integer page, Integer limit, + @RequestParam String areaId, + @RequestParam( required = false) String streetId, + @RequestParam Integer type, // 1本月活产 2累计活产 + @RequestParam( required = false) Integer update, + @RequestParam Date dateTime) { + return patientSyncMysqlFacade.getBabyFmListTestPatientUpdate(page,limit,areaId,streetId,dateTime,type,update); + } + + + /** * 新生儿访视 * @param request * @param page diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index a0859f2..437e720 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -6543,4 +6543,51 @@ public class TestController extends BaseController { } return "success"; } + + + /** + * 查询一段时间内隆化县的双胎数量 + * @param start + * @param end + * @return + */ + @RequestMapping(value = "/queryFmTireNumber2", method = RequestMethod.GET) + @ResponseBody + public String queryFmTireNumber2(String start,String end) { + Criteria criteria = Criteria.where("yn").is(YnEnums.YES.getId()); + criteria.and("dueDate1").gte(DateUtil.parseYMD(start)).lte(DateUtil.parseYMD(end)).and("tireNumber").gte(2); + List models = mongoTemplate.find(new Query(criteria),MaternalDeliverModel.class); + StringBuffer sb = new StringBuffer(); + if (CollectionUtils.isNotEmpty(models)) + { + System.out.println(" 双胎记录数"+ models.size()); + for (MaternalDeliverModel model : models) + { + try { + if (!StringUtils.isNotEmpty(model.getParentId())) + { + System.out.println("双胎没有档案的parentId="+model.getParentId()); + continue; + } + Patients patients = patientsService.findOnePatientById(model.getParentId()); + if (patients == null) { + System.out.println("双胎没有档案的孕妇=" + model.getParentId()); + continue; + } + if (patients.getAreaRegisterId() != null && "130".equals(patients.getAreaRegisterId())) + { + sb.append(patients.getCardNo()); + sb.append(","); + } + } + catch (Exception e) + { + continue; + } + + } + } + return sb.toString(); + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 64e3cfb..4d12523 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -2026,6 +2026,7 @@ public class AntExRecordFacade { { String source = patients.getId(); patients.setId(null); + patients.setCreated(new Date()); patients.setSource(source); patients.setEnable("2");//隐藏档案 patients.setHospitalId(nutritionInfoRequest.getHospitalId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index e57eed8..70085a3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -3581,7 +3581,7 @@ public class AntenatalExaminationFacade { patientsQuery.setType(type); patientsQuery.setHospitalList(hospitalId); patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setBuildType(1); + patientsQuery.setBuildType(0); if (isEnable) { patientsQuery.setEnable("2"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 727a61c..014b430 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -796,7 +796,7 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setLhaxisl(request.getLhaxisl()); model.setSf(request.getSf()); - model.setSfRea(request.getSfRea()); + model.setSfRea(request.getSfReason()); model.setXb(request.getXb()); model.setNextSfType(request.getNextSfType()); model.setFypg(request.getFypg()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index f8920db..6f6bd43 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2613,36 +2613,50 @@ public class MatDeliverFacade { // 传入了医院id hospitalList.add(childbirthManagerRequest.getHospitalId()); } else { - // 没传入医院id - // 先判断是否传入了传条件 - // 未传入查询条件 - if (StringUtils.isEmpty(childbirthManagerRequest.getHospitalProvinceId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalCityId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalAreaId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalId())) { - hospitalList.add(autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId())); - DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); - dataPermissionsModelQuery.setUserId(childbirthManagerRequest.getOperatorId()); - List dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery); - if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) { - Map data = dataPermissionsModelList.get(0).getData(); - for (Object hospitalId : data.keySet()) { - if (StringUtils.isNotEmpty(hospitalId.toString()) && !hospitalList.contains(hospitalId.toString())) { - hospitalList.add(hospitalId.toString()); - } - } - } - } else { - // 传入了查询条件 - OrganizationQuery organizationQuery = new OrganizationQuery(); - organizationQuery.setProvinceId(childbirthManagerRequest.getHospitalProvinceId()); - organizationQuery.setCityId(childbirthManagerRequest.getHospitalCityId()); - organizationQuery.setAreaId(childbirthManagerRequest.getHospitalAreaId()); - organizationQuery.setYn(YnEnums.YES.getId()); - List organizationList = organizationService.queryHospitals(organizationQuery); - if (CollectionUtils.isNotEmpty(organizationList)) { - for (Organization organization : organizationList) { - hospitalList.add(organization.getId().toString()); - } + // 传入了查询条件 + OrganizationQuery organizationQuery = new OrganizationQuery(); + organizationQuery.setProvinceId(childbirthManagerRequest.getHospitalProvinceId()); + organizationQuery.setCityId(childbirthManagerRequest.getHospitalCityId()); + organizationQuery.setAreaId(childbirthManagerRequest.getHospitalAreaId()); + organizationQuery.setYn(YnEnums.YES.getId()); + List organizationList = organizationService.queryHospitals(organizationQuery); + if (CollectionUtils.isNotEmpty(organizationList)) { + for (Organization organization : organizationList) { + hospitalList.add(organization.getId().toString()); } } + + +// // 没传入医院id +// // 先判断是否传入了传条件 +// // 未传入查询条件 +// if (StringUtils.isEmpty(childbirthManagerRequest.getHospitalProvinceId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalCityId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalAreaId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalId())) { +// hospitalList.add(autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId())); +// DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); +// dataPermissionsModelQuery.setUserId(childbirthManagerRequest.getOperatorId()); +// List dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery); +// if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) { +// Map data = dataPermissionsModelList.get(0).getData(); +// for (Object hospitalId : data.keySet()) { +// if (StringUtils.isNotEmpty(hospitalId.toString()) && !hospitalList.contains(hospitalId.toString())) { +// hospitalList.add(hospitalId.toString()); +// } +// } +// } +// } else { +// // 传入了查询条件 +// OrganizationQuery organizationQuery = new OrganizationQuery(); +// organizationQuery.setProvinceId(childbirthManagerRequest.getHospitalProvinceId()); +// organizationQuery.setCityId(childbirthManagerRequest.getHospitalCityId()); +// organizationQuery.setAreaId(childbirthManagerRequest.getHospitalAreaId()); +// organizationQuery.setYn(YnEnums.YES.getId()); +// List organizationList = organizationService.queryHospitals(organizationQuery); +// if (CollectionUtils.isNotEmpty(organizationList)) { +// for (Organization organization : organizationList) { +// hospitalList.add(organization.getId().toString()); +// } +// } +// } } } if (!childbirthManagerRequest.isExcel() && childbirthManagerRequest.getHloseBloodType() == null @@ -2678,6 +2692,7 @@ public class MatDeliverFacade { if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())&&"2100001605".equals(hid)) { patientsQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor()); } + System.out.println("fm patient query = "+ patientsQuery.convertToQuery().convertToMongoQuery()); List patientsList = patientsService.queryPatient(patientsQuery); // 这里就设置分页内容 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 b5fb539..2f884af 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 @@ -3995,6 +3995,233 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { .setData(results).setPageInfo(babyModelQuery.getPageInfo()); } + + public BaseResponse getBabyFmListTest(Integer page, Integer limit, String areaId, + String streetId, Date dateTime, Integer type,Integer update) { + List results = new ArrayList<>(); + //获得区县下的街道 + List streetIds = getRegionsStreetIds( areaId, streetId); + Date startDate=DateUtil.getDateMonthFirst(dateTime); + Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); + BabyModelQuery babyModelQuery = new BabyModelQuery(); + if (CollectionUtils.isNotEmpty(streetIds)) + { + babyModelQuery.setExistSource(false); + babyModelQuery.setDataStatus(false); + babyModelQuery.setBuildType(2); + babyModelQuery.setPregnancyOut("0"); + babyModelQuery.setStreetIds(streetIds); + + babyModelQuery.setPage(page); + babyModelQuery.setLimit(limit); + babyModelQuery.setNeed("Need"); + babyModelQuery.setOrder("birth"); + if (type == 1) + { //本月活产数 + babyModelQuery.setBirthStart(startDate); + babyModelQuery.setBirthEnd(endDate); + } + else + { + //传入的时间获取年的第一天 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); + babyModelQuery.setBirthStart(startDateFirst); + //累计活产数 + babyModelQuery.setBirthEnd(endDate); + } + System.out.println("活产"+babyModelQuery.convertToQuery().convertToMongoQuery().toString()); + List datas = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); + if (CollectionUtils.isNotEmpty(datas)) + { + for (BabyModel model : datas) + { + + if(model.getParentId() != null) + { + Patients patients = patientsService.findOnePatientById(model.getParentId()); + if (patients != null && patients.getAreaRegisterId() != null + && !patients.getAreaRegisterId().equals(model.getAreaId())) + { + results.add(patients.getCardNo()); + if (update != null) + { + model.setProvinceId(patients.getProvinceRegisterId()); + model.setCityId(patients.getCityRegisterId()); + model.setAreaId(patients.getAreaRegisterId()); + model.setStreetId(patients.getStreetRegisterId()); + model.setAddress(patients.getAddressRegister()); + System.out.println("更新儿童的地址 "+model.getMcertNo()); + babyBookbuildingService.updateBabyBuild(model,model.getId()); + } + } + } + } + } + } + return new BaseListResponse().setErrorcode(0).setErrormsg("成功") + .setData(results).setPageInfo(babyModelQuery.getPageInfo()); + } + + + public BaseResponse getBabyFmListTestPatient(Integer page, Integer limit, String areaId, + String streetId, Date dateTime, Integer type) { + + Map maps = new HashMap<>(); + //传入的时间获取年的第一天 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); + Date startDate=DateUtil.getDateMonthFirst(dateTime); + Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); + + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setIsAutoFm(YnEnums.NO.getId()); + patientsQuery.setType(3); + patientsQuery.setProvinceRegisterId("1"); + patientsQuery.setCityRegisterId("9"); + patientsQuery.setAreaRegisterId("130"); + + patientsQuery.setFmDateStart(startDateFirst); + patientsQuery.setFmDateEnd(endDate); + + System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); + List patientsList = patientsService.queryPatient(patientsQuery); + System.out.println("分娩孕妇数量"+ patientsList.size()); + List cardNoList = new ArrayList <>(); + for (Patients patients : patientsList) { + cardNoList.add(patients.getCardNo()); + } + + List results = new ArrayList<>(); + List results1 = new ArrayList<>(); + //获得区县下的街道 + List streetIds = getRegionsStreetIds( areaId, streetId); + + BabyModelQuery babyModelQuery = new BabyModelQuery(); + if (CollectionUtils.isNotEmpty(streetIds)) + { + babyModelQuery.setExistSource(false); + babyModelQuery.setDataStatus(false); + babyModelQuery.setBuildType(2); + babyModelQuery.setPregnancyOut("0"); + babyModelQuery.setStreetIds(streetIds); + + babyModelQuery.setPage(page); + babyModelQuery.setLimit(limit); + babyModelQuery.setNeed("Need"); + babyModelQuery.setOrder("birth"); + if (type == 1) + { //本月活产数 + babyModelQuery.setBirthStart(startDate); + babyModelQuery.setBirthEnd(endDate); + } + else + { + + babyModelQuery.setBirthStart(startDateFirst); + //累计活产数 + babyModelQuery.setBirthEnd(endDate); + } + List babyMcertNos = new ArrayList<>(); + System.out.println("活产"+babyModelQuery.convertToQuery().convertToMongoQuery().toString()); + List datas = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); + if (CollectionUtils.isNotEmpty(datas)) + { + for (BabyModel model : datas) + { + babyMcertNos.add(model.getMcertNo()); + if (!cardNoList.contains(model.getMcertNo())) + { + results.add(model.getMcertNo()); + } + } + + for (String cardNo : cardNoList) + { + if (!babyMcertNos.contains(cardNo)) + { + results1.add(cardNo); + } + } + + maps.put("babyMcertNoPatient",results); + maps.put("patientCardNoBabyMcertNo",results1); + } + } + return new BaseObjectResponse().setErrorcode(0).setErrormsg("成功") + .setData(maps); + } + + + + public BaseResponse getBabyFmListTestPatientUpdate(Integer page, Integer limit, String areaId, + String streetId, Date dateTime, Integer type,Integer update) { + List results = new ArrayList<>(); + Map maps = new HashMap<>(); + //传入的时间获取年的第一天 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); + Date startDate=DateUtil.getDateMonthFirst(dateTime); + Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); + + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setIsAutoFm(YnEnums.NO.getId()); + patientsQuery.setType(3); + patientsQuery.setProvinceRegisterId("1"); + patientsQuery.setCityRegisterId("9"); + patientsQuery.setAreaRegisterId("130"); + + patientsQuery.setFmDateStart(startDateFirst); + patientsQuery.setFmDateEnd(endDate); + + System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); + List patientsList = patientsService.queryPatient(patientsQuery); + System.out.println("分娩孕妇数量"+ patientsList.size()); + for (Patients patients : patientsList) { + BabyModelQuery babyModelQuery = new BabyModelQuery(); + babyModelQuery.setParentId(patients.getId()); +// babyModelQuery.setExistSource(false); +// babyModelQuery.setDataStatus(false); +// babyModelQuery.setBuildType(2); +// babyModelQuery.setPregnancyOut("0"); +// babyModelQuery.setMcertNo(patients.getCardNo()); +// +// babyModelQuery.setPage(page); +// babyModelQuery.setLimit(limit); +// babyModelQuery.setNeed("Need"); +// babyModelQuery.setOrder("birth"); + babyModelQuery.setBirthStart(startDateFirst); + //累计活产数 + babyModelQuery.setBirthEnd(endDate); + System.out.println("活产"+babyModelQuery.convertToQuery().convertToMongoQuery().toString()); + List datas = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); + if (CollectionUtils.isNotEmpty(datas)) + { + for (BabyModel model : datas) + { + if (patients != null && patients.getAreaRegisterId() != null + && !patients.getAreaRegisterId().equals(model.getAreaId())) + { + results.add(patients.getCardNo()); + if (update != null) + { + model.setProvinceId(patients.getProvinceRegisterId()); + model.setCityId(patients.getCityRegisterId()); + model.setAreaId(patients.getAreaRegisterId()); + model.setStreetId(patients.getStreetRegisterId()); + model.setAddress(patients.getAddressRegister()); + System.out.println("更新儿童的地址 "+model.getMcertNo()); + babyBookbuildingService.updateBabyBuild(model,model.getId()); + } + } + } + } + maps.put("updateBabyHomeAddress",results); + } + return new BaseObjectResponse().setErrorcode(0).setErrormsg("成功") + .setData(maps); + } + + public BaseResponse getBabyFsList(Integer page, Integer limit, String areaId, String streetId, Date dateTime, Integer type) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java index 8b3e9ae..304edc7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java @@ -707,7 +707,7 @@ public class BabyCheckRequest { //屈光筛查 private Map qgscResult; private String sf;//是否失访 - private String sfRea;//失访原因 + private String sfReason;//失访原因 private String xb;//胸部 private String nextSfType;//下次随访类型 private String fypg;//发育评估 @@ -823,12 +823,12 @@ public class BabyCheckRequest { this.sf = sf; } - public String getSfRea() { - return sfRea; + public String getSfReason() { + return sfReason; } - public void setSfRea(String sfRea) { - this.sfRea = sfRea; + public void setSfReason(String sfReason) { + this.sfReason = sfReason; } public String getXb() {