Commit 7955f8cb726b3c2cbeeb64d3437f0dd363eab068
1 parent
425aaa302e
Exists in
master
and in
6 other branches
工位
Showing 8 changed files with 374 additions and 36 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java
View file @
7955f8c
... | ... | @@ -549,9 +549,57 @@ |
549 | 549 | @RequestParam( required = false) String streetId, |
550 | 550 | @RequestParam Integer type, // 1本月活产 2累计活产 |
551 | 551 | @RequestParam Date dateTime) { |
552 | - LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
553 | 552 | return patientSyncMysqlFacade.getBabyFmList(page,limit,areaId,streetId,dateTime,type); |
554 | 553 | } |
554 | + | |
555 | + /** | |
556 | + * | |
557 | + * @param request | |
558 | + * @param page | |
559 | + * @param limit | |
560 | + * @param areaId | |
561 | + * @param streetId | |
562 | + * @param type | |
563 | + * @param update | |
564 | + * @param dateTime | |
565 | + * @return | |
566 | + */ | |
567 | + @RequestMapping(method = RequestMethod.GET, value = "/getBabyFmListTest") | |
568 | + @ResponseBody | |
569 | + public BaseResponse getBabyFmListTest(HttpServletRequest request, | |
570 | + Integer page, Integer limit, | |
571 | + @RequestParam String areaId, | |
572 | + @RequestParam( required = false) String streetId, | |
573 | + @RequestParam Integer type, // 1本月活产 2累计活产 | |
574 | + @RequestParam( required = false) Integer update, | |
575 | + @RequestParam Date dateTime) { | |
576 | + return patientSyncMysqlFacade.getBabyFmListTest(page,limit,areaId,streetId,dateTime,type,update); | |
577 | + } | |
578 | + | |
579 | + | |
580 | + @RequestMapping(method = RequestMethod.GET, value = "/getBabyFmListTestPatient") | |
581 | + @ResponseBody | |
582 | + public BaseResponse getBabyFmListTestPatient(HttpServletRequest request, | |
583 | + Integer page, Integer limit, | |
584 | + @RequestParam String areaId, | |
585 | + @RequestParam( required = false) String streetId, | |
586 | + @RequestParam Integer type, // 1本月活产 2累计活产 | |
587 | + @RequestParam Date dateTime) { | |
588 | + return patientSyncMysqlFacade.getBabyFmListTestPatient(page,limit,areaId,streetId,dateTime,type); | |
589 | + } | |
590 | + | |
591 | + @RequestMapping(method = RequestMethod.GET, value = "/getBabyFmListTestPatientUpdate") | |
592 | + @ResponseBody | |
593 | + public BaseResponse getBabyFmListTestPatientUpdate(HttpServletRequest request, | |
594 | + Integer page, Integer limit, | |
595 | + @RequestParam String areaId, | |
596 | + @RequestParam( required = false) String streetId, | |
597 | + @RequestParam Integer type, // 1本月活产 2累计活产 | |
598 | + @RequestParam( required = false) Integer update, | |
599 | + @RequestParam Date dateTime) { | |
600 | + return patientSyncMysqlFacade.getBabyFmListTestPatientUpdate(page,limit,areaId,streetId,dateTime,type,update); | |
601 | + } | |
602 | + | |
555 | 603 | |
556 | 604 | /** |
557 | 605 | * 新生儿访视 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
View file @
7955f8c
... | ... | @@ -6543,5 +6543,52 @@ |
6543 | 6543 | } |
6544 | 6544 | return "success"; |
6545 | 6545 | } |
6546 | + | |
6547 | + | |
6548 | + /** | |
6549 | + * 查询一段时间内隆化县的双胎数量 | |
6550 | + * @param start | |
6551 | + * @param end | |
6552 | + * @return | |
6553 | + */ | |
6554 | + @RequestMapping(value = "/queryFmTireNumber2", method = RequestMethod.GET) | |
6555 | + @ResponseBody | |
6556 | + public String queryFmTireNumber2(String start,String end) { | |
6557 | + Criteria criteria = Criteria.where("yn").is(YnEnums.YES.getId()); | |
6558 | + criteria.and("dueDate1").gte(DateUtil.parseYMD(start)).lte(DateUtil.parseYMD(end)).and("tireNumber").gte(2); | |
6559 | + List<MaternalDeliverModel> models = mongoTemplate.find(new Query(criteria),MaternalDeliverModel.class); | |
6560 | + StringBuffer sb = new StringBuffer(); | |
6561 | + if (CollectionUtils.isNotEmpty(models)) | |
6562 | + { | |
6563 | + System.out.println(" 双胎记录数"+ models.size()); | |
6564 | + for (MaternalDeliverModel model : models) | |
6565 | + { | |
6566 | + try { | |
6567 | + if (!StringUtils.isNotEmpty(model.getParentId())) | |
6568 | + { | |
6569 | + System.out.println("双胎没有档案的parentId="+model.getParentId()); | |
6570 | + continue; | |
6571 | + } | |
6572 | + Patients patients = patientsService.findOnePatientById(model.getParentId()); | |
6573 | + if (patients == null) { | |
6574 | + System.out.println("双胎没有档案的孕妇=" + model.getParentId()); | |
6575 | + continue; | |
6576 | + } | |
6577 | + if (patients.getAreaRegisterId() != null && "130".equals(patients.getAreaRegisterId())) | |
6578 | + { | |
6579 | + sb.append(patients.getCardNo()); | |
6580 | + sb.append(","); | |
6581 | + } | |
6582 | + } | |
6583 | + catch (Exception e) | |
6584 | + { | |
6585 | + continue; | |
6586 | + } | |
6587 | + | |
6588 | + } | |
6589 | + } | |
6590 | + return sb.toString(); | |
6591 | + } | |
6592 | + | |
6546 | 6593 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
7955f8c
... | ... | @@ -2026,6 +2026,7 @@ |
2026 | 2026 | { |
2027 | 2027 | String source = patients.getId(); |
2028 | 2028 | patients.setId(null); |
2029 | + patients.setCreated(new Date()); | |
2029 | 2030 | patients.setSource(source); |
2030 | 2031 | patients.setEnable("2");//隐藏档案 |
2031 | 2032 | patients.setHospitalId(nutritionInfoRequest.getHospitalId()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
7955f8c
... | ... | @@ -3581,7 +3581,7 @@ |
3581 | 3581 | patientsQuery.setType(type); |
3582 | 3582 | patientsQuery.setHospitalList(hospitalId); |
3583 | 3583 | patientsQuery.setYn(YnEnums.YES.getId()); |
3584 | - patientsQuery.setBuildType(1); | |
3584 | + patientsQuery.setBuildType(0); | |
3585 | 3585 | if (isEnable) { |
3586 | 3586 | patientsQuery.setEnable("2"); |
3587 | 3587 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
7955f8c
... | ... | @@ -796,7 +796,7 @@ |
796 | 796 | model.setLhaxisl(request.getLhaxisl()); |
797 | 797 | |
798 | 798 | model.setSf(request.getSf()); |
799 | - model.setSfRea(request.getSfRea()); | |
799 | + model.setSfRea(request.getSfReason()); | |
800 | 800 | model.setXb(request.getXb()); |
801 | 801 | model.setNextSfType(request.getNextSfType()); |
802 | 802 | model.setFypg(request.getFypg()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
7955f8c
... | ... | @@ -2613,36 +2613,50 @@ |
2613 | 2613 | // 传入了医院id |
2614 | 2614 | hospitalList.add(childbirthManagerRequest.getHospitalId()); |
2615 | 2615 | } else { |
2616 | - // 没传入医院id | |
2617 | - // 先判断是否传入了传条件 | |
2618 | - // 未传入查询条件 | |
2619 | - if (StringUtils.isEmpty(childbirthManagerRequest.getHospitalProvinceId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalCityId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalAreaId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalId())) { | |
2620 | - hospitalList.add(autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId())); | |
2621 | - DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); | |
2622 | - dataPermissionsModelQuery.setUserId(childbirthManagerRequest.getOperatorId()); | |
2623 | - List <DataPermissionsModel> dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery); | |
2624 | - if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) { | |
2625 | - Map data = dataPermissionsModelList.get(0).getData(); | |
2626 | - for (Object hospitalId : data.keySet()) { | |
2627 | - if (StringUtils.isNotEmpty(hospitalId.toString()) && !hospitalList.contains(hospitalId.toString())) { | |
2628 | - hospitalList.add(hospitalId.toString()); | |
2629 | - } | |
2630 | - } | |
2616 | + // 传入了查询条件 | |
2617 | + OrganizationQuery organizationQuery = new OrganizationQuery(); | |
2618 | + organizationQuery.setProvinceId(childbirthManagerRequest.getHospitalProvinceId()); | |
2619 | + organizationQuery.setCityId(childbirthManagerRequest.getHospitalCityId()); | |
2620 | + organizationQuery.setAreaId(childbirthManagerRequest.getHospitalAreaId()); | |
2621 | + organizationQuery.setYn(YnEnums.YES.getId()); | |
2622 | + List <Organization> organizationList = organizationService.queryHospitals(organizationQuery); | |
2623 | + if (CollectionUtils.isNotEmpty(organizationList)) { | |
2624 | + for (Organization organization : organizationList) { | |
2625 | + hospitalList.add(organization.getId().toString()); | |
2631 | 2626 | } |
2632 | - } else { | |
2633 | - // 传入了查询条件 | |
2634 | - OrganizationQuery organizationQuery = new OrganizationQuery(); | |
2635 | - organizationQuery.setProvinceId(childbirthManagerRequest.getHospitalProvinceId()); | |
2636 | - organizationQuery.setCityId(childbirthManagerRequest.getHospitalCityId()); | |
2637 | - organizationQuery.setAreaId(childbirthManagerRequest.getHospitalAreaId()); | |
2638 | - organizationQuery.setYn(YnEnums.YES.getId()); | |
2639 | - List <Organization> organizationList = organizationService.queryHospitals(organizationQuery); | |
2640 | - if (CollectionUtils.isNotEmpty(organizationList)) { | |
2641 | - for (Organization organization : organizationList) { | |
2642 | - hospitalList.add(organization.getId().toString()); | |
2643 | - } | |
2644 | - } | |
2645 | 2627 | } |
2628 | + | |
2629 | + | |
2630 | +// // 没传入医院id | |
2631 | +// // 先判断是否传入了传条件 | |
2632 | +// // 未传入查询条件 | |
2633 | +// if (StringUtils.isEmpty(childbirthManagerRequest.getHospitalProvinceId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalCityId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalAreaId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalId())) { | |
2634 | +// hospitalList.add(autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId())); | |
2635 | +// DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); | |
2636 | +// dataPermissionsModelQuery.setUserId(childbirthManagerRequest.getOperatorId()); | |
2637 | +// List <DataPermissionsModel> dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery); | |
2638 | +// if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) { | |
2639 | +// Map data = dataPermissionsModelList.get(0).getData(); | |
2640 | +// for (Object hospitalId : data.keySet()) { | |
2641 | +// if (StringUtils.isNotEmpty(hospitalId.toString()) && !hospitalList.contains(hospitalId.toString())) { | |
2642 | +// hospitalList.add(hospitalId.toString()); | |
2643 | +// } | |
2644 | +// } | |
2645 | +// } | |
2646 | +// } else { | |
2647 | +// // 传入了查询条件 | |
2648 | +// OrganizationQuery organizationQuery = new OrganizationQuery(); | |
2649 | +// organizationQuery.setProvinceId(childbirthManagerRequest.getHospitalProvinceId()); | |
2650 | +// organizationQuery.setCityId(childbirthManagerRequest.getHospitalCityId()); | |
2651 | +// organizationQuery.setAreaId(childbirthManagerRequest.getHospitalAreaId()); | |
2652 | +// organizationQuery.setYn(YnEnums.YES.getId()); | |
2653 | +// List <Organization> organizationList = organizationService.queryHospitals(organizationQuery); | |
2654 | +// if (CollectionUtils.isNotEmpty(organizationList)) { | |
2655 | +// for (Organization organization : organizationList) { | |
2656 | +// hospitalList.add(organization.getId().toString()); | |
2657 | +// } | |
2658 | +// } | |
2659 | +// } | |
2646 | 2660 | } |
2647 | 2661 | } |
2648 | 2662 | if (!childbirthManagerRequest.isExcel() && childbirthManagerRequest.getHloseBloodType() == null |
... | ... | @@ -2678,6 +2692,7 @@ |
2678 | 2692 | if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())&&"2100001605".equals(hid)) { |
2679 | 2693 | patientsQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor()); |
2680 | 2694 | } |
2695 | + System.out.println("fm patient query = "+ patientsQuery.convertToQuery().convertToMongoQuery()); | |
2681 | 2696 | List <Patients> patientsList = patientsService.queryPatient(patientsQuery); |
2682 | 2697 | |
2683 | 2698 | // 这里就设置分页内容 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
View file @
7955f8c
... | ... | @@ -3995,6 +3995,233 @@ |
3995 | 3995 | .setData(results).setPageInfo(babyModelQuery.getPageInfo()); |
3996 | 3996 | } |
3997 | 3997 | |
3998 | + | |
3999 | + public BaseResponse getBabyFmListTest(Integer page, Integer limit, String areaId, | |
4000 | + String streetId, Date dateTime, Integer type,Integer update) { | |
4001 | + List<String> results = new ArrayList<>(); | |
4002 | + //获得区县下的街道 | |
4003 | + List<String> streetIds = getRegionsStreetIds( areaId, streetId); | |
4004 | + Date startDate=DateUtil.getDateMonthFirst(dateTime); | |
4005 | + Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); | |
4006 | + BabyModelQuery babyModelQuery = new BabyModelQuery(); | |
4007 | + if (CollectionUtils.isNotEmpty(streetIds)) | |
4008 | + { | |
4009 | + babyModelQuery.setExistSource(false); | |
4010 | + babyModelQuery.setDataStatus(false); | |
4011 | + babyModelQuery.setBuildType(2); | |
4012 | + babyModelQuery.setPregnancyOut("0"); | |
4013 | + babyModelQuery.setStreetIds(streetIds); | |
4014 | + | |
4015 | + babyModelQuery.setPage(page); | |
4016 | + babyModelQuery.setLimit(limit); | |
4017 | + babyModelQuery.setNeed("Need"); | |
4018 | + babyModelQuery.setOrder("birth"); | |
4019 | + if (type == 1) | |
4020 | + { //本月活产数 | |
4021 | + babyModelQuery.setBirthStart(startDate); | |
4022 | + babyModelQuery.setBirthEnd(endDate); | |
4023 | + } | |
4024 | + else | |
4025 | + { | |
4026 | + //传入的时间获取年的第一天 | |
4027 | + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); | |
4028 | + babyModelQuery.setBirthStart(startDateFirst); | |
4029 | + //累计活产数 | |
4030 | + babyModelQuery.setBirthEnd(endDate); | |
4031 | + } | |
4032 | + System.out.println("活产"+babyModelQuery.convertToQuery().convertToMongoQuery().toString()); | |
4033 | + List<BabyModel> datas = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); | |
4034 | + if (CollectionUtils.isNotEmpty(datas)) | |
4035 | + { | |
4036 | + for (BabyModel model : datas) | |
4037 | + { | |
4038 | + | |
4039 | + if(model.getParentId() != null) | |
4040 | + { | |
4041 | + Patients patients = patientsService.findOnePatientById(model.getParentId()); | |
4042 | + if (patients != null && patients.getAreaRegisterId() != null | |
4043 | + && !patients.getAreaRegisterId().equals(model.getAreaId())) | |
4044 | + { | |
4045 | + results.add(patients.getCardNo()); | |
4046 | + if (update != null) | |
4047 | + { | |
4048 | + model.setProvinceId(patients.getProvinceRegisterId()); | |
4049 | + model.setCityId(patients.getCityRegisterId()); | |
4050 | + model.setAreaId(patients.getAreaRegisterId()); | |
4051 | + model.setStreetId(patients.getStreetRegisterId()); | |
4052 | + model.setAddress(patients.getAddressRegister()); | |
4053 | + System.out.println("更新儿童的地址 "+model.getMcertNo()); | |
4054 | + babyBookbuildingService.updateBabyBuild(model,model.getId()); | |
4055 | + } | |
4056 | + } | |
4057 | + } | |
4058 | + } | |
4059 | + } | |
4060 | + } | |
4061 | + return new BaseListResponse().setErrorcode(0).setErrormsg("成功") | |
4062 | + .setData(results).setPageInfo(babyModelQuery.getPageInfo()); | |
4063 | + } | |
4064 | + | |
4065 | + | |
4066 | + public BaseResponse getBabyFmListTestPatient(Integer page, Integer limit, String areaId, | |
4067 | + String streetId, Date dateTime, Integer type) { | |
4068 | + | |
4069 | + Map<String,Object> maps = new HashMap<>(); | |
4070 | + //传入的时间获取年的第一天 | |
4071 | + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); | |
4072 | + Date startDate=DateUtil.getDateMonthFirst(dateTime); | |
4073 | + Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); | |
4074 | + | |
4075 | + PatientsQuery patientsQuery = new PatientsQuery(); | |
4076 | + patientsQuery.setYn(YnEnums.YES.getId()); | |
4077 | + patientsQuery.setIsAutoFm(YnEnums.NO.getId()); | |
4078 | + patientsQuery.setType(3); | |
4079 | + patientsQuery.setProvinceRegisterId("1"); | |
4080 | + patientsQuery.setCityRegisterId("9"); | |
4081 | + patientsQuery.setAreaRegisterId("130"); | |
4082 | + | |
4083 | + patientsQuery.setFmDateStart(startDateFirst); | |
4084 | + patientsQuery.setFmDateEnd(endDate); | |
4085 | + | |
4086 | + System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); | |
4087 | + List <Patients> patientsList = patientsService.queryPatient(patientsQuery); | |
4088 | + System.out.println("分娩孕妇数量"+ patientsList.size()); | |
4089 | + List <String> cardNoList = new ArrayList <>(); | |
4090 | + for (Patients patients : patientsList) { | |
4091 | + cardNoList.add(patients.getCardNo()); | |
4092 | + } | |
4093 | + | |
4094 | + List<String> results = new ArrayList<>(); | |
4095 | + List<String> results1 = new ArrayList<>(); | |
4096 | + //获得区县下的街道 | |
4097 | + List<String> streetIds = getRegionsStreetIds( areaId, streetId); | |
4098 | + | |
4099 | + BabyModelQuery babyModelQuery = new BabyModelQuery(); | |
4100 | + if (CollectionUtils.isNotEmpty(streetIds)) | |
4101 | + { | |
4102 | + babyModelQuery.setExistSource(false); | |
4103 | + babyModelQuery.setDataStatus(false); | |
4104 | + babyModelQuery.setBuildType(2); | |
4105 | + babyModelQuery.setPregnancyOut("0"); | |
4106 | + babyModelQuery.setStreetIds(streetIds); | |
4107 | + | |
4108 | + babyModelQuery.setPage(page); | |
4109 | + babyModelQuery.setLimit(limit); | |
4110 | + babyModelQuery.setNeed("Need"); | |
4111 | + babyModelQuery.setOrder("birth"); | |
4112 | + if (type == 1) | |
4113 | + { //本月活产数 | |
4114 | + babyModelQuery.setBirthStart(startDate); | |
4115 | + babyModelQuery.setBirthEnd(endDate); | |
4116 | + } | |
4117 | + else | |
4118 | + { | |
4119 | + | |
4120 | + babyModelQuery.setBirthStart(startDateFirst); | |
4121 | + //累计活产数 | |
4122 | + babyModelQuery.setBirthEnd(endDate); | |
4123 | + } | |
4124 | + List<String> babyMcertNos = new ArrayList<>(); | |
4125 | + System.out.println("活产"+babyModelQuery.convertToQuery().convertToMongoQuery().toString()); | |
4126 | + List<BabyModel> datas = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); | |
4127 | + if (CollectionUtils.isNotEmpty(datas)) | |
4128 | + { | |
4129 | + for (BabyModel model : datas) | |
4130 | + { | |
4131 | + babyMcertNos.add(model.getMcertNo()); | |
4132 | + if (!cardNoList.contains(model.getMcertNo())) | |
4133 | + { | |
4134 | + results.add(model.getMcertNo()); | |
4135 | + } | |
4136 | + } | |
4137 | + | |
4138 | + for (String cardNo : cardNoList) | |
4139 | + { | |
4140 | + if (!babyMcertNos.contains(cardNo)) | |
4141 | + { | |
4142 | + results1.add(cardNo); | |
4143 | + } | |
4144 | + } | |
4145 | + | |
4146 | + maps.put("babyMcertNoPatient",results); | |
4147 | + maps.put("patientCardNoBabyMcertNo",results1); | |
4148 | + } | |
4149 | + } | |
4150 | + return new BaseObjectResponse().setErrorcode(0).setErrormsg("成功") | |
4151 | + .setData(maps); | |
4152 | + } | |
4153 | + | |
4154 | + | |
4155 | + | |
4156 | + public BaseResponse getBabyFmListTestPatientUpdate(Integer page, Integer limit, String areaId, | |
4157 | + String streetId, Date dateTime, Integer type,Integer update) { | |
4158 | + List<String> results = new ArrayList<>(); | |
4159 | + Map<String,Object> maps = new HashMap<>(); | |
4160 | + //传入的时间获取年的第一天 | |
4161 | + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); | |
4162 | + Date startDate=DateUtil.getDateMonthFirst(dateTime); | |
4163 | + Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); | |
4164 | + | |
4165 | + PatientsQuery patientsQuery = new PatientsQuery(); | |
4166 | + patientsQuery.setYn(YnEnums.YES.getId()); | |
4167 | + patientsQuery.setIsAutoFm(YnEnums.NO.getId()); | |
4168 | + patientsQuery.setType(3); | |
4169 | + patientsQuery.setProvinceRegisterId("1"); | |
4170 | + patientsQuery.setCityRegisterId("9"); | |
4171 | + patientsQuery.setAreaRegisterId("130"); | |
4172 | + | |
4173 | + patientsQuery.setFmDateStart(startDateFirst); | |
4174 | + patientsQuery.setFmDateEnd(endDate); | |
4175 | + | |
4176 | + System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); | |
4177 | + List <Patients> patientsList = patientsService.queryPatient(patientsQuery); | |
4178 | + System.out.println("分娩孕妇数量"+ patientsList.size()); | |
4179 | + for (Patients patients : patientsList) { | |
4180 | + BabyModelQuery babyModelQuery = new BabyModelQuery(); | |
4181 | + babyModelQuery.setParentId(patients.getId()); | |
4182 | +// babyModelQuery.setExistSource(false); | |
4183 | +// babyModelQuery.setDataStatus(false); | |
4184 | +// babyModelQuery.setBuildType(2); | |
4185 | +// babyModelQuery.setPregnancyOut("0"); | |
4186 | +// babyModelQuery.setMcertNo(patients.getCardNo()); | |
4187 | +// | |
4188 | +// babyModelQuery.setPage(page); | |
4189 | +// babyModelQuery.setLimit(limit); | |
4190 | +// babyModelQuery.setNeed("Need"); | |
4191 | +// babyModelQuery.setOrder("birth"); | |
4192 | + babyModelQuery.setBirthStart(startDateFirst); | |
4193 | + //累计活产数 | |
4194 | + babyModelQuery.setBirthEnd(endDate); | |
4195 | + System.out.println("活产"+babyModelQuery.convertToQuery().convertToMongoQuery().toString()); | |
4196 | + List<BabyModel> datas = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); | |
4197 | + if (CollectionUtils.isNotEmpty(datas)) | |
4198 | + { | |
4199 | + for (BabyModel model : datas) | |
4200 | + { | |
4201 | + if (patients != null && patients.getAreaRegisterId() != null | |
4202 | + && !patients.getAreaRegisterId().equals(model.getAreaId())) | |
4203 | + { | |
4204 | + results.add(patients.getCardNo()); | |
4205 | + if (update != null) | |
4206 | + { | |
4207 | + model.setProvinceId(patients.getProvinceRegisterId()); | |
4208 | + model.setCityId(patients.getCityRegisterId()); | |
4209 | + model.setAreaId(patients.getAreaRegisterId()); | |
4210 | + model.setStreetId(patients.getStreetRegisterId()); | |
4211 | + model.setAddress(patients.getAddressRegister()); | |
4212 | + System.out.println("更新儿童的地址 "+model.getMcertNo()); | |
4213 | + babyBookbuildingService.updateBabyBuild(model,model.getId()); | |
4214 | + } | |
4215 | + } | |
4216 | + } | |
4217 | + } | |
4218 | + maps.put("updateBabyHomeAddress",results); | |
4219 | + } | |
4220 | + return new BaseObjectResponse().setErrorcode(0).setErrormsg("成功") | |
4221 | + .setData(maps); | |
4222 | + } | |
4223 | + | |
4224 | + | |
3998 | 4225 | public BaseResponse getBabyFsList(Integer page, Integer limit, String areaId, String streetId, Date dateTime, Integer type) { |
3999 | 4226 | |
4000 | 4227 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java
View file @
7955f8c
... | ... | @@ -707,7 +707,7 @@ |
707 | 707 | //屈光筛查 |
708 | 708 | private Map<String, String> qgscResult; |
709 | 709 | private String sf;//是否失访 |
710 | - private String sfRea;//失访原因 | |
710 | + private String sfReason;//失访原因 | |
711 | 711 | private String xb;//胸部 |
712 | 712 | private String nextSfType;//下次随访类型 |
713 | 713 | private String fypg;//发育评估 |
714 | 714 | |
... | ... | @@ -823,12 +823,12 @@ |
823 | 823 | this.sf = sf; |
824 | 824 | } |
825 | 825 | |
826 | - public String getSfRea() { | |
827 | - return sfRea; | |
826 | + public String getSfReason() { | |
827 | + return sfReason; | |
828 | 828 | } |
829 | 829 | |
830 | - public void setSfRea(String sfRea) { | |
831 | - this.sfRea = sfRea; | |
830 | + public void setSfReason(String sfReason) { | |
831 | + this.sfReason = sfReason; | |
832 | 832 | } |
833 | 833 | |
834 | 834 | public String getXb() { |