From 4af0c2c95e196b322234a7581aaf23634c7ac109 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 18 Mar 2020 14:05:02 +0800
Subject: [PATCH] update

---
 .../platform/operate/web/facade/BoneFacade.java    | 28 +++++++++++++++++-----
 .../web/facade/PremaritalCheckupFacade.java        |  4 ++++
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java
index 0414a2c..25f7a5e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java
@@ -14,10 +14,7 @@ import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.operate.web.utils.FunvCommonUtil;
-import com.lyms.platform.pojo.BabyModel;
-import com.lyms.platform.pojo.BoneModel;
-import com.lyms.platform.pojo.MicroelementModel;
-import com.lyms.platform.pojo.Patients;
+import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.BabyModelQuery;
 import com.lyms.platform.query.BoneQuery;
 import com.lyms.platform.query.PatientsQuery;
@@ -25,6 +22,8 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
@@ -54,6 +53,9 @@ public class BoneFacade {
     @Autowired
     private BabyBookbuildingService babyBookbuildingService;
 
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
     public BaseResponse queryBoneList(String queryNo, Integer start, Integer end, Integer age, String vcCardNo,Integer type ,Integer page, Integer limit, Integer userId) {
 
 
@@ -201,6 +203,7 @@ public class BoneFacade {
         BoneModel model = BoneService.queryOneBone(query);
         if (model != null)
         {
+            //孕期骨密度报告
             if (type == 0)
             {
                 Patients pat = patientsService.findOnePatientById(model.getPatientId());
@@ -224,6 +227,7 @@ public class BoneFacade {
                 int week = DateUtil.getWeek(lastMenses,model.getCreated());
 
             }
+            //儿童骨密度报告
             else
             {
                 BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(model.getPatientId());
@@ -244,9 +248,21 @@ public class BoneFacade {
                 data.put("sex", babyModel.getSex() == null ? "" : SexEnum.getTextById(babyModel.getSex()));
                 data.put("created", DateUtil.getyyyy_MM_dd(model.getCreated()));
                 int month =  DateUtil.getBabyAgeMonth(babyModel.getBirth(),model.getCreated());
-            }
-
 
+                List<BoneConfigModel> configModels = mongoTemplate.find(
+                        Query.query(Criteria.where("type").is(1)), BoneConfigModel.class);
+                if (CollectionUtils.isNotEmpty(configModels))
+                {
+                    for (BoneConfigModel configModel : configModels)
+                    {
+                        if (configModel.getStart() <= month && month <= configModel.getEnd())
+                        {
+                            List<String> contents = model.getResult() == 0 ?configModel.getNormals() : (model.getResult() == 1 ? configModel.getReduces() : configModel.getSerious());
+                            data.put("contents",contents);
+                        }
+                    }
+                }
+            }
         }
 
         healthChargeFacade.addHealthCharge(hospitalId,8, model.getPatientId(), 1, 1, userId, doctorId, false);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
index d9e6d4f..3751dcc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
@@ -202,6 +202,10 @@ public class PremaritalCheckupFacade {
                 {
                     ResidentsArchiveModel model = modelList.get(0);
                     spouseCode = model.getCode() == null ? "" :  String.valueOf(model.getCode());
+
+                    checkupResult.setSpouseName(model.getUsername());
+                    checkupResult.setSpouseCertificateTypeId(model.getCertificateTypeId());
+                    checkupResult.setSpouseCertificateNum(model.getCertificateNum());
                 }
             }
 
-- 
1.8.3.1