From baa45f778442250adfd5b195d449606c7bd0ad2b Mon Sep 17 00:00:00 2001
From: shiyang <wtt@qq.com>
Date: Wed, 13 Oct 2021 15:55:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=87=E5=A5=B3=E5=81=A5=E5=BA=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=A9=9A=E6=A3=80=E4=BF=A1=E6=81=AF=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E5=88=B0=E5=AD=95=E5=89=8D=E4=BC=98=E7=94=9F(?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/impl/PreEugebicsServiceImpl.java   | 82 +++++++++++-----------
 1 file changed, 42 insertions(+), 40 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
index 44d8c9d..16f2926 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
@@ -211,46 +211,6 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen
             }
             list.add(one);
         }
-        //隆化 婚检同步信息(女)
-        if (StringUtils.isNotEmpty(cardNo)) {
-            //这里cardno传入是男性证件num，所以用配偶证件num
-            //女性档案同步
-            PremaritalCheckup premaritalCheckup=mongoTemplate.findOne(Query.query(Criteria.where("spouseCertificateNum").is(cardNo)), PremaritalCheckup.class);
-            if(null!=premaritalCheckup){
-                Map<String,Object> wifeBaseInfo =new HashMap<>();
-                //末次月经
-                wifeBaseInfo.put("lastMenses",premaritalCheckup.getLastMenses());
-                Map<String,Object> wifePhysiqueCheck =new HashMap<>();
-                //血压
-                wifePhysiqueCheck.put("bp", premaritalCheckup.getBp());
-                //心率
-                wifePhysiqueCheck.put("heartRate", premaritalCheckup.getHeartRate());
-                //抽血编号
-                list.get(0).setWifeCxNum(premaritalCheckup.getCxNum());
-                //写入一般情况map
-                list.get(0).setWifeBaseInfo(wifeBaseInfo);
-                //写入体格检查map
-                list.get(0).setWifePhysiqueCheck(wifePhysiqueCheck);
-            }
-            //男性档案同步
-            PremaritalCheckup premaritalCheckup2=mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo)), PremaritalCheckup.class);
-            if(null!=premaritalCheckup2){
-                Map<String,Object> husbandPhysiqueCheck =new HashMap<>();
-                //血压
-                husbandPhysiqueCheck.put("bp", premaritalCheckup2.getBp());
-                //心率
-                husbandPhysiqueCheck.put("heartRate", premaritalCheckup2.getHeartRate());
-                //睾丸(单选，选择扪及/未们及)
-                husbandPhysiqueCheck.put("gaowan", premaritalCheckup2.getGaoWan());
-                //睾丸体积左右
-                husbandPhysiqueCheck.put("volumeLeft", premaritalCheckup2.getVolumeLeft());
-                husbandPhysiqueCheck.put("volumeRight", premaritalCheckup2.getVolumeRight());
-                //抽血编号
-                list.get(0).setHusbandCxNum(premaritalCheckup2.getCxNum());
-                //写入体格检查map
-                list.get(0).setHusbandPhysiqueCheck(husbandPhysiqueCheck);
-            }
-        }
 
             BaseResponse baseResponse = new BaseResponse();
         baseResponse.setObject(list);
@@ -776,6 +736,48 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen
             }
 
         }
+
+        //隆化 婚检同步信息(女)
+        if (StringUtils.isNotEmpty(cardNo)) {
+            //这里cardno传入是男性证件num，所以用配偶证件num
+            //女性档案同步
+            PremaritalCheckup premaritalCheckup=mongoTemplate.findOne(Query.query(Criteria.where("spouseCertificateNum").is(cardNo)), PremaritalCheckup.class);
+            if(null!=premaritalCheckup){
+                Map<String,Object> wifeBaseInfo =new HashMap<>();
+                //末次月经
+                wifeBaseInfo.put("lastMenses",premaritalCheckup.getLastMenses());
+                Map<String,Object> wifePhysiqueCheck =new HashMap<>();
+                //血压
+                wifePhysiqueCheck.put("bp", premaritalCheckup.getBp());
+                //心率
+                wifePhysiqueCheck.put("heartRate", premaritalCheckup.getHeartRate());
+                //抽血编号
+                map.put("wifeCxNum",premaritalCheckup.getCxNum());
+                //写入一般情况map
+                map.put("wifeBaseInfo",wifeBaseInfo);
+                //写入体格检查map
+                map.put("wifePhysiqueCheck",wifePhysiqueCheck);
+            }
+            //男性档案同步
+            PremaritalCheckup premaritalCheckup2=mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo)), PremaritalCheckup.class);
+            if(null!=premaritalCheckup2){
+                Map<String,Object> husbandPhysiqueCheck =new HashMap<>();
+                //血压
+                husbandPhysiqueCheck.put("bp", premaritalCheckup2.getBp());
+                //心率
+                husbandPhysiqueCheck.put("heartRate", premaritalCheckup2.getHeartRate());
+                //睾丸(单选，选择扪及/未们及)
+                husbandPhysiqueCheck.put("gaowan", premaritalCheckup2.getGaoWan());
+                //睾丸体积左右
+                husbandPhysiqueCheck.put("volumeLeft", premaritalCheckup2.getVolumeLeft());
+                husbandPhysiqueCheck.put("volumeRight", premaritalCheckup2.getVolumeRight());
+                //抽血编号
+                map.put("husbandCxNum",premaritalCheckup2.getCxNum());
+                //写入体格检查map
+                map.put("husbandPhysiqueCheck",husbandPhysiqueCheck);
+            }
+        }
+
         return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map);
     }
 
-- 
1.8.3.1