From 13c300c65ccd3d807dad209bab515dfc271567cf Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 5 Dec 2016 18:08:10 +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

---
 .../com/lyms/platform/biz/service/AntExRecordService.java    | 12 ++++++------
 .../operate/web/facade/AntenatalExaminationFacade.java       |  8 ++++++--
 2 files changed, 12 insertions(+), 8 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 507a78f..c52162c 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
@@ -95,17 +95,17 @@ public class AntExRecordService {
 
 
 
-    private void syncSingle(String parentId){
+    private void syncSingle(String pid){
         AntExQuery antExQuery = new AntExQuery();
         antExQuery.setYn(YnEnums.YES.getId());
-        antExQuery.setParentId(parentId);
+        antExQuery.setPid(pid);
         //复诊
         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.setPid(record.getPid());
                 antExRecordQuery.setcId(record.getCheckDoctor());
                 Integer count = count(antExRecordQuery);
                 if (null == count || 0 == count) {
@@ -118,7 +118,7 @@ public class AntExRecordService {
         //初诊
         AntExChuQuery antExChuQuery = new AntExChuQuery();
         antExChuQuery.setYn(YnEnums.YES.getId());
-        antExChuQuery.setParentId(parentId);
+        antExChuQuery.setPid(pid);
         List<AntExChuModel> antExChuModelList = antExService.queryAntExChu(antExChuQuery.convertToQuery());
 
         if (CollectionUtils.isNotEmpty(antExChuModelList)) {
@@ -126,7 +126,7 @@ public class AntExRecordService {
                 AntExRecordModel record = convert(antEx);
                 if (null != record) {
                     AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
-                    antExRecordQuery.setParentId(record.getParentId());
+                    antExRecordQuery.setPid(record.getPid());
                     antExRecordQuery.setcId(record.getCheckDoctor());
                     Integer count = count(antExRecordQuery);
                     if (null == count || 0 == count) {
@@ -147,7 +147,7 @@ public class AntExRecordService {
             return;
         }
         AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery();
-        antExRecordQuery1.setParentId(parentId);
+        antExRecordQuery1.setPid(parentId);
         antExRecordDao.findAndMove(antExRecordQuery1.convertToQuery());
 
 
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 a027377..a74d249 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
@@ -272,7 +272,9 @@ public class AntenatalExaminationFacade {
 
             //初诊,修改产检管理
 //            antenatalExaminationService.updateAntExRecord(antExChuModel.getId(), 1);
-            recordService.handExRecord(antExChuModel.getParentId());
+            if(StringUtils.isNotEmpty(antExChuModel.getPid())) {
+                recordService.handExRecord(antExChuModel.getPid());
+            }
         } else {
             AntExChuQuery antExChuQuery1 = new AntExChuQuery();
             antExChuQuery1.setParentId(excAddRequest.getParentId());
@@ -313,7 +315,9 @@ public class AntenatalExaminationFacade {
                 //修改本院最后一次定义高危
                 updateLastRhTime(patients.getId(), hospitalId);
                 setLashCTimes(hospitalId, antExChuModel.getParentId(), 1);
-                recordService.handExRecord(antExChuModel.getParentId());
+                if(StringUtils.isNotEmpty(antExChuModel.getPid())){
+                    recordService.handExRecord(antExChuModel.getPid());
+                }
                 if (null != patients.getBuildType() && patients.getBuildType() == 3) {
                     Patients patients1 = new Patients();
                     patients1.setEnable("1");
-- 
1.8.3.1