From 71238abfdd7546a71bafd7dc2ca33e1863682e4f Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 28 Jul 2020 15:50:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E8=A7=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/TestController.java     | 52 ++++++++++++++++++++++
 .../operate/web/facade/MatdeliverFollowFacade.java |  7 +--
 2 files changed, 56 insertions(+), 3 deletions(-)

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 de8babe..44fcead 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
@@ -3762,4 +3762,56 @@ public class TestController extends BaseController {
     }
 
 
+    /**
+     * 更新建档的产后修养地址到分娩记录中，如果没有产后修养地址就用居住地址
+     * @param hospitalId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/updateFmPostAddress", method = RequestMethod.GET)
+    public String updateFmPostAddress(@RequestParam(required = false) String hospitalId, String startDate, String endDate) {
+        final MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
+        matDeliverQuery.setYn(YnEnums.YES.getId());
+        matDeliverQuery.setCreatedStart(DateUtil.parseYMD(startDate));
+        matDeliverQuery.setEndStart(DateUtil.parseYMD(endDate));
+        if (StringUtils.isNotEmpty(hospitalId)) {
+            matDeliverQuery.setFmHospital(hospitalId);
+        }
+        // 查询
+        List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
+        System.out.println("本次读取了【" + maternalDeliverModelList.size() + "】条数据");
+        int batchSize = 1000;
+        int end = 0;
+        for (int i = 0; i < maternalDeliverModelList.size(); i += batchSize) {
+            end = (end + batchSize);
+            if (end > maternalDeliverModelList.size()) {
+                end = maternalDeliverModelList.size();
+            }
+            final List<MaternalDeliverModel> tempList = maternalDeliverModelList.subList(i, end);
+            commonThreadPool.execute(new Runnable() {
+                @Override
+                public void run() {
+                    if (CollectionUtils.isNotEmpty(tempList)) {
+                        for (MaternalDeliverModel maternalDeliverModel : tempList) {
+                            Patients patients2 = patientsService.findOnePatientById(maternalDeliverModel.getParentId());
+                            if (patients2 != null) {
+                                //设置产后访视的地址
+                                maternalDeliverModel.setProvincePostRestId(patients2.getProvincePostRestId() != null ? patients2.getProvincePostRestId() : patients2.getProvinceRegisterId());
+                                maternalDeliverModel.setCityPostRestId(patients2.getCityPostRestId() != null ? patients2.getCityPostRestId() : patients2.getCityRegisterId());
+                                maternalDeliverModel.setAreaPostRestId(patients2.getAreaPostRestId() != null ? patients2.getAreaPostRestId() : patients2.getAreaRegisterId());
+                                maternalDeliverModel.setStreetRegisterId(patients2.getStreetPostRestId() != null ? patients2.getStreetPostRestId() : patients2.getStreetRegisterId());
+                                maternalDeliverModel.setAddressPostRest(patients2.getAddressPostRest() != null ? patients2.getAddressPostRest() : patients2.getAddressRegister());
+                                matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId());
+                                System.out.println(maternalDeliverModel.getId());
+                            }
+                        }
+                    }
+                }
+            });
+        }
+        return "updateFmPostAddress start......";
+    }
+
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
index 68d2fcc..f36455a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
@@ -255,9 +255,10 @@ public class MatdeliverFollowFacade {
                 maternalDeliverModel.setMatFollowId(matdeliverFollowModel.getId());
 
                 //  添加访视医院id
-                if (com.lyms.platform.common.utils.StringUtils.isEmpty(maternalDeliverModel.getFsHospital())) {
-                    maternalDeliverModel.setFsHospital(hospitalId);
-                }
+//                if (com.lyms.platform.common.utils.StringUtils.isEmpty(maternalDeliverModel.getFsHospital())) {
+//                    maternalDeliverModel.setFsHospital(hospitalId);
+//                }
+                maternalDeliverModel.setFsHospital(hospitalId);
                 updateMaternalDeliver(matDeliverFollowAddRequest, maternalDeliverModel);
             } else {
                 log.error("分娩记录随访没有找到随访记录，传入随访id：" + matDeliverFollowAddRequest.getDeliverId());
-- 
1.8.3.1