From d6133a94a27ae0bae5f40797883cd1dd03b3cc82 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 3 Dec 2019 14:39:52 +0800
Subject: [PATCH] update

---
 .../java/com/lyms/hospitalapi/pojo/CheckResponse.java |  9 +++++++++
 .../lyms/platform/operate/web/facade/LisFacade.java   |  1 +
 .../operate/web/facade/MeasureInfoFacade.java         | 19 +++++++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResponse.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResponse.java
index 07215ef..9b82b5f 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResponse.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResponse.java
@@ -25,6 +25,15 @@ public class CheckResponse {
     private String lisTypeName;
     private String title;
     private Date modified;
+    private String typeName;
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
 
     public String getLisTypeName() {
         return lisTypeName;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
index 12b63f6..746d8e8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
@@ -329,6 +329,7 @@ public class LisFacade {
                 if (lis.getAge() != null) {
                     check.setAge(lis.getAge().toString());
                 }
+                check.setTypeName(lis.getType());
 
                 //聊城显示修改
                 check.setApplyDate(lis.getPublishTime() != null ? lis.getPublishTime() :
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
index a503a56..f394fe2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
@@ -872,6 +872,25 @@ public class MeasureInfoFacade {
         }
 
         Patients pat = patientses.get(0);
+
+        //如果当前查询到的档案和已经测量过的体重记录对应的档案不一致 就取体重测量的档案
+        List<PatientWeight> patientWeights = patientWeightService2.queryPatientWeight(Query.query(Criteria.where("pid").is(pat.getPid())));
+        if (CollectionUtils.isNotEmpty(patientWeights))
+        {
+            PatientWeight patientWeight = patientWeights.get(0);
+            if (!patientWeight.getPatientId().equals(pat.getId()))
+            {
+                PatientsQuery patientsQuery1 = new PatientsQuery();
+                patientsQuery1.setId(patientWeight.getPatientId());
+                List<Patients> pes = patientsService.queryPatient(patientsQuery1);
+                if (CollectionUtils.isNotEmpty(pes))
+                {
+                    pat = pes.get(0);
+                }
+            }
+        }
+
+
         Map<String, String> patInfo = getPatInfo(pat, hospitalId, certType);
         objectResponse.setData(patInfo);
         objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
-- 
1.8.3.1