Commit 71238abfdd7546a71bafd7dc2ca33e1863682e4f
1 parent
e005ecba02
Exists in
master
and in
6 other branches
访视
Showing 2 changed files with 56 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
View file @
71238ab
| ... | ... | @@ -3762,5 +3762,57 @@ |
| 3762 | 3762 | } |
| 3763 | 3763 | |
| 3764 | 3764 | |
| 3765 | + /** | |
| 3766 | + * 更新建档的产后修养地址到分娩记录中，如果没有产后修养地址就用居住地址 | |
| 3767 | + * @param hospitalId | |
| 3768 | + * @param startDate | |
| 3769 | + * @param endDate | |
| 3770 | + * @return | |
| 3771 | + */ | |
| 3772 | + @ResponseBody | |
| 3773 | + @RequestMapping(value = "/updateFmPostAddress", method = RequestMethod.GET) | |
| 3774 | + public String updateFmPostAddress(@RequestParam(required = false) String hospitalId, String startDate, String endDate) { | |
| 3775 | + final MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); | |
| 3776 | + matDeliverQuery.setYn(YnEnums.YES.getId()); | |
| 3777 | + matDeliverQuery.setCreatedStart(DateUtil.parseYMD(startDate)); | |
| 3778 | + matDeliverQuery.setEndStart(DateUtil.parseYMD(endDate)); | |
| 3779 | + if (StringUtils.isNotEmpty(hospitalId)) { | |
| 3780 | + matDeliverQuery.setFmHospital(hospitalId); | |
| 3781 | + } | |
| 3782 | + // 查询 | |
| 3783 | + List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery); | |
| 3784 | + System.out.println("本次读取了【" + maternalDeliverModelList.size() + "】条数据"); | |
| 3785 | + int batchSize = 1000; | |
| 3786 | + int end = 0; | |
| 3787 | + for (int i = 0; i < maternalDeliverModelList.size(); i += batchSize) { | |
| 3788 | + end = (end + batchSize); | |
| 3789 | + if (end > maternalDeliverModelList.size()) { | |
| 3790 | + end = maternalDeliverModelList.size(); | |
| 3791 | + } | |
| 3792 | + final List<MaternalDeliverModel> tempList = maternalDeliverModelList.subList(i, end); | |
| 3793 | + commonThreadPool.execute(new Runnable() { | |
| 3794 | + @Override | |
| 3795 | + public void run() { | |
| 3796 | + if (CollectionUtils.isNotEmpty(tempList)) { | |
| 3797 | + for (MaternalDeliverModel maternalDeliverModel : tempList) { | |
| 3798 | + Patients patients2 = patientsService.findOnePatientById(maternalDeliverModel.getParentId()); | |
| 3799 | + if (patients2 != null) { | |
| 3800 | + //设置产后访视的地址 | |
| 3801 | + maternalDeliverModel.setProvincePostRestId(patients2.getProvincePostRestId() != null ? patients2.getProvincePostRestId() : patients2.getProvinceRegisterId()); | |
| 3802 | + maternalDeliverModel.setCityPostRestId(patients2.getCityPostRestId() != null ? patients2.getCityPostRestId() : patients2.getCityRegisterId()); | |
| 3803 | + maternalDeliverModel.setAreaPostRestId(patients2.getAreaPostRestId() != null ? patients2.getAreaPostRestId() : patients2.getAreaRegisterId()); | |
| 3804 | + maternalDeliverModel.setStreetRegisterId(patients2.getStreetPostRestId() != null ? patients2.getStreetPostRestId() : patients2.getStreetRegisterId()); | |
| 3805 | + maternalDeliverModel.setAddressPostRest(patients2.getAddressPostRest() != null ? patients2.getAddressPostRest() : patients2.getAddressRegister()); | |
| 3806 | + matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId()); | |
| 3807 | + System.out.println(maternalDeliverModel.getId()); | |
| 3808 | + } | |
| 3809 | + } | |
| 3810 | + } | |
| 3811 | + } | |
| 3812 | + }); | |
| 3813 | + } | |
| 3814 | + return "updateFmPostAddress start......"; | |
| 3815 | + } | |
| 3816 | + | |
| 3765 | 3817 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
View file @
71238ab
| ... | ... | @@ -255,9 +255,10 @@ |
| 255 | 255 | maternalDeliverModel.setMatFollowId(matdeliverFollowModel.getId()); |
| 256 | 256 | |
| 257 | 257 | // 添加访视医院id |
| 258 | - if (com.lyms.platform.common.utils.StringUtils.isEmpty(maternalDeliverModel.getFsHospital())) { | |
| 259 | - maternalDeliverModel.setFsHospital(hospitalId); | |
| 260 | - } | |
| 258 | +// if (com.lyms.platform.common.utils.StringUtils.isEmpty(maternalDeliverModel.getFsHospital())) { | |
| 259 | +// maternalDeliverModel.setFsHospital(hospitalId); | |
| 260 | +// } | |
| 261 | + maternalDeliverModel.setFsHospital(hospitalId); | |
| 261 | 262 | updateMaternalDeliver(matDeliverFollowAddRequest, maternalDeliverModel); |
| 262 | 263 | } else { |
| 263 | 264 | log.error("分娩记录随访没有找到随访记录，传入随访id：" + matDeliverFollowAddRequest.getDeliverId()); |