From e7e9da51880bf2ba7376413a2a5bcf66a22c9291 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Mon, 29 Jun 2020 10:08:49 +0800
Subject: [PATCH] update

---
 .../platform/operate/web/facade/SieveFacade.java   | 30 +++++++++++++++++-----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
index b7ff198..ac8d3bf 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
@@ -1082,9 +1082,9 @@ public class SieveFacade {
             sieveApplyOrderQuery1.setLymsSieveId(lymsSieveId);//20200609 wtt,使用产筛申请单id查询因为这里会有多个不是单个
         }
         sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
-
+        Patients pat = null;
         if (CollectionUtils.isNotEmpty(localPatients)) {
-            Patients pat = localPatients.get(0);
+            pat = localPatients.get(0);
             HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(pat.getPid(), false);
             PatientBaseResult patientBaseResult = new PatientBaseResult();
             patientBaseResult.convert(pat);
@@ -1172,9 +1172,12 @@ public class SieveFacade {
                 result.put("nasalBone", sieveApply.getNasalBone());
                 result.put("monozygous", sieveApply.getMonozygous());
                 result.put("patientType", sieveApply.getPatientType());
-                result.put("caiyangyunzhou", sieveApply.getCaiyangyunzhou());
-
-
+                if( pat!= null && StringUtils.isEmpty(sieveApply.getCaiyangyunzhou())){
+                    yunZhouMth(sieveApply,pat);
+                    result.put("caiyangyunzhou", sieveApply.getCaiyangyunzhou());
+                }else {
+                    result.put("caiyangyunzhou", sieveApply.getCaiyangyunzhou());
+                }
                 result.put("id", sieveApply.getId());
                 result.put("parentId", sieveApply.getParentId());
                 result.put("check", sieveApply.getCheckItem());
@@ -1215,7 +1218,12 @@ public class SieveFacade {
                 result.put("fetusNum", sieveApply.getFetusNum());
                 result.put("fetusAbnormalInfo", sieveApply.getFetusAbnormalInfo());
                 result.put("sieveModel", sieveApply.getSieveModel());
-                result.put("ultrasonicNtWeek", sieveApply.getUltrasonicNtWeek());
+                if(pat!=null && StringUtils.isEmpty(sieveApply.getUltrasonicNtWeek())){
+                    yunZhouMth(sieveApply,pat);
+                    result.put("ultrasonicNtWeek", sieveApply.getUltrasonicNtWeek());
+                }else {
+                    result.put("ultrasonicNtWeek", sieveApply.getUltrasonicNtWeek());
+                }
                 result.put("ultrasonicNtVal", sieveApply.getUltrasonicNtVal());
                 result.put("serumScreeningRisk", sieveApply.getSerumScreeningRisk());
                 result.put("syndrome21", sieveApply.getSyndrome21());
@@ -1366,6 +1374,16 @@ public class SieveFacade {
 
         return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map);
     }
+    private void yunZhouMth(SieveApplyOrderModel sieveApplyOrderModel, Patients p) {
+        //打印需要 根据采样时间算出采样孕周
+        if(sieveApplyOrderModel.getCollectionDate()!=null && p.getLastMenses()!=null){
+            sieveApplyOrderModel.setCaiyangyunzhou(DateUtil.getWeekDesc(p.getLastMenses(),sieveApplyOrderModel.getBcCheckDate()));
+        }
+        // 根据B超时间算出B超孕周
+        if(sieveApplyOrderModel.getBcCheckDate()!=null && p.getLastMenses()!=null){
+            sieveApplyOrderModel.setUltrasonicNtWeek(DateUtil.getWeekDesc(p.getLastMenses(),sieveApplyOrderModel.getBcCheckDate()));
+        }
+    }
 
     /**
      * 查询产筛申请信息和结果信息
-- 
1.8.3.1