From e9c98fc8a30b8d851bcacaadfaabc1695382376b Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 5 Dec 2016 16:47:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/biz/service/AntExRecordService.java   | 49 +++++++++++++++++++++-
 .../web/facade/AntenatalExaminationFacade.java     |  4 +-
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java
index 82cf03c..507a78f 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java
@@ -93,6 +93,50 @@ public class AntExRecordService {
         }
     }
 
+
+
+    private void syncSingle(String parentId){
+        AntExQuery antExQuery = new AntExQuery();
+        antExQuery.setYn(YnEnums.YES.getId());
+        antExQuery.setParentId(parentId);
+        //复诊
+        List<AntenatalExaminationModel> list = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC,"checkDate"));
+        for (AntenatalExaminationModel antEx : list) {
+            AntExRecordModel record = convert(antEx);
+            if (null != record) {
+                AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
+                antExRecordQuery.setParentId(record.getParentId());
+                antExRecordQuery.setcId(record.getCheckDoctor());
+                Integer count = count(antExRecordQuery);
+                if (null == count || 0 == count) {
+                    antExRecordDao.addOneRecord(record);
+                }
+            }
+        }
+
+
+        //初诊
+        AntExChuQuery antExChuQuery = new AntExChuQuery();
+        antExChuQuery.setYn(YnEnums.YES.getId());
+        antExChuQuery.setParentId(parentId);
+        List<AntExChuModel> antExChuModelList = antExService.queryAntExChu(antExChuQuery.convertToQuery());
+
+        if (CollectionUtils.isNotEmpty(antExChuModelList)) {
+            for (AntExChuModel antEx : antExChuModelList) {
+                AntExRecordModel record = convert(antEx);
+                if (null != record) {
+                    AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
+                    antExRecordQuery.setParentId(record.getParentId());
+                    antExRecordQuery.setcId(record.getCheckDoctor());
+                    Integer count = count(antExRecordQuery);
+                    if (null == count || 0 == count) {
+                        antExRecordDao.addOneRecord(record);
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * 处理删除检查
      *
@@ -103,8 +147,11 @@ public class AntExRecordService {
             return;
         }
         AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery();
-        antExRecordQuery1.setfId(parentId);
+        antExRecordQuery1.setParentId(parentId);
         antExRecordDao.findAndMove(antExRecordQuery1.convertToQuery());
+
+
+        syncSingle(parentId);
        /* //先删除掉该人的
         AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery();
         antExRecordQuery1.setParentId(parentId);
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 c9d8764..c2e41ff 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
@@ -1432,7 +1432,7 @@ public class AntenatalExaminationFacade {
                 setLashCTimes(hospital, antenatalExaminationModel.getParentId(), 2);
 
                 updateLastRisk(antenatalExaminationModel.getParentId());
-                recordService.handExRecord(antenatalExaminationModel.getId());
+                recordService.handExRecord(antenatalExaminationModel.getParentId());
             } else {
                 return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("当前产检记录不是本院最新的产检记录,不能删除");
             }
@@ -1480,7 +1480,7 @@ public class AntenatalExaminationFacade {
                 AntExChuModel antExChuModel1 = antenatalExaminationService.findOne(antExQueryRequest.getId());
                 setLashCTimes(hospital, antExChuModel1.getParentId(), 1);
                 updateLastRisk(antExChuModel1.getParentId());
-                recordService.handExRecord(antExChuModel1.getId());
+                recordService.handExRecord(antExChuModel1.getParentId());
             } else {
                 return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("当前产检记录不是本院最新的产检记录,不能删除");
             }
-- 
1.8.3.1