From 2950f6910243941d6ece536cd5406e8c1ececfd4 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 12 Aug 2016 18:10:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AEparentid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/MatDeliverFacade.java       | 33 ++++++++++++++--------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index 5f3326b..8dc74f0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -106,10 +106,10 @@ public class MatDeliverFacade {
                 List<BabyModel> babyModels = babyService.queryBabyWithQuery(babyModelQuery);
                 if (CollectionUtils.isEmpty(babyModels)) {
                     handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName, patients1);
-                }else{
-                    List<MaternalDeliverModel.Baby> babies=new ArrayList<>();
-                    for(BabyModel babyModel:babyModels){
-                        MaternalDeliverModel.Baby baby1 = new  MaternalDeliverModel.Baby(babyModel);
+                } else {
+                    List<MaternalDeliverModel.Baby> babies = new ArrayList<>();
+                    for (BabyModel babyModel : babyModels) {
+                        MaternalDeliverModel.Baby baby1 = new MaternalDeliverModel.Baby(babyModel);
                         babies.add(baby1);
                     }
                     maternalDeliverModel.setBaby(babies);
@@ -281,13 +281,26 @@ public class MatDeliverFacade {
         if (null == patients) {
             return new BaseResponse().setErrormsg("没有相关的产妇记录").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR);
         }*/
+        //外院的孕妇
+        Patients patients1 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 1);
+        //外院的产妇
+//        Patients patients2 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 3);
+
         //http://jira.healthbaby.com.cn/browse/WEB-204 修改bug
-        Patients patients =  antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 1);
-        if(null==patients){
-            return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行产分娩").setErrorcode(ErrorCodeConstants.NO_DATA);
+        //本院的孕妇
+        Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 1);
+        //本院产妇
+        Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 3);
+        //本院产妇，并且本院没建档需要提醒补录记录
+        if(null!=patients3 && null==patients){
+            patients=patients3;
+            //外院的孕妇在本院没有建档需要提醒建档
+        }else  if (null != patients1 && null == patients) {
+            return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA);
         }
 
 
+
         MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
         matDeliverQuery.setPid(patients.getPid());
         matDeliverQuery.setYn(YnEnums.YES.getId());
@@ -298,15 +311,13 @@ public class MatDeliverFacade {
         antExQuery.setParentId(patients.getId());
         antExQuery.setYn(YnEnums.YES.getId());
         List<AntenatalExaminationModel> examinationModel = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
-        HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getId(),false);
+        HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getId(), false);
         try {
             String tTireNumber = "";
 
             if (CollectionUtils.isNotEmpty(examinationModel)) {
                 if (null != examinationModel && StringUtils.isNotEmpty(examinationModel.get(0).getRiskFactor())) {
                     tTireNumber = examinationModel.get(0).getTireNumber();
-               /*     List l = JsonUtil.toList(examinationModel.get(0).getRiskFactor(), List.class);
-                    findBasicConfig(l,data);*/
                 }
             } else {
                 AntExChuQuery antExChuQuery = new AntExChuQuery();
@@ -315,8 +326,6 @@ public class MatDeliverFacade {
                 List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
                 if (CollectionUtils.isNotEmpty(antExChuModels)) {
                     tTireNumber = antExChuModels.get(0).getTireNumber();
-                  /*  List l = JsonUtil.toList(antExChuModels.get(0).getHighrisk(), List.class);
-                    findBasicConfig(l,data);*/
                 }
             }
 
-- 
1.8.3.1