From 14c5345219f6fa03318c68546238b97de2bd84ac Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 17 Jan 2018 17:33:17 +0800
Subject: [PATCH] update code

---
 .../platform/msg/remote/AmsMessageService.java     |  2 +-
 .../web/controller/MeasureInfoController.java      | 17 ++++++++++++++
 .../operate/web/facade/MeasureInfoFacade.java      | 27 +++++++++++++++++++++-
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java
index e875a88..c36765f 100644
--- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java
+++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java
@@ -154,7 +154,7 @@ public class AmsMessageService {
     }
 
     public static void main(String[] args) {
-        Map<String,List<MessageContent>> list = getMessageTemplateMap("199",
+        Map<String,List<MessageContent>> list = getMessageTemplateMap("1000000115",
                 AmsServiceTypeEnum.YUN_GUIDE);
         List<MessageContent> msgs = list.get("年龄≥35岁");
         System.out.println(list);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
index 268fbcd..6460bef 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
+import java.util.Map;
 
 /**
  * 测量血糖和脉搏、身高和体重的值
@@ -200,4 +201,20 @@ public class MeasureInfoController extends BaseController {
     public BaseResponse updateMeasureInfo(@RequestBody MeasureInfoRequest measureInfoRequest, HttpServletRequest request) {
         return measureInfoFacade.updateMeasureInfo(measureInfoRequest);
     }
+
+
+    /**
+     * 查询测量基本信息
+     * valueType 值类型： 1 体重和身高 2 血压和脉搏 3 体温
+     * @return
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/queryClBaseInfo")
+    @ResponseBody
+    public Map queryClBaseInfo(@RequestParam(value = "certType", required = true) String certType,
+                               @RequestParam(value = "certNo", required = true) String certNo,
+                               @RequestParam(value = "hospitalId", required = true) String hospitalId,
+                               HttpServletRequest request
+    ) {
+        return measureInfoFacade.queryClBaseInfo(certType, certNo, hospitalId);
+    }
 }
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 e66ff70..cfcf56f 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
@@ -204,7 +204,7 @@ public class MeasureInfoFacade {
         {
             message = "信息记录成功，今天您还可以测量"+count+"次体温";
         }
-        map.put("errormsg",message);
+        map.put("errormsg", message);
         return map;
     }
 
@@ -257,4 +257,29 @@ public class MeasureInfoFacade {
         model.setVisitId(measureInfoRequest.getVisitId());
         return model;
     }
+
+    public Map queryClBaseInfo(String certType, String certNo,String hospitalId) {
+        Map<String,String> map = new HashMap<>();
+        MeasureInfoQuery query = new MeasureInfoQuery();
+        query.setHospitalId(hospitalId);
+        query.setCertType(certType);
+        query.setCertNo(certNo);
+        query.setSort(" record_time desc ");
+        query.setNeed("true");
+        List<MeasureInfoModel> list = mysqlMeasureInfoService.queryMeasureInfoList(query);
+        if (CollectionUtils.isNotEmpty(list))
+        {
+            MeasureInfoModel model = list.get(0);
+            map.put("userName",model.getUserName() == null ? "" : model.getUserName());
+            map.put("certType",model.getCertType()  == null ? "" : model.getCertType());
+            map.put("certNo",model.getCertNo() == null ? "" : model.getCertNo());
+            map.put("sex",String.valueOf(model.getSex()));
+            map.put("age",model.getAge() == null ? "" : String.valueOf(model.getAge()));
+            map.put("vcCardNo",model.getVcCardNo() == null ? "" : model.getVcCardNo());
+            map.put("phone",model.getPhone() == null ? "" : model.getPhone());
+            map.put("zyNo",model.getZyNo() == null ? "" : model.getZyNo());
+            map.put("visitId",model.getVisitId() == null ? "" : model.getVisitId());
+        }
+        return map;
+    }
 }
-- 
1.8.3.1