From 5b38fe7f9b323511f3142527e5c86b6e3205b76d Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Tue, 13 Dec 2016 15:37:03 +0800
Subject: [PATCH] update folic

---
 .../web/controller/FolicAcidController.java        |  5 +-
 .../operate/web/facade/FolicAcidFacade.java        |  9 ++--
 .../platform/operate/web/utils/FunvCommonUtil.java | 58 ++++++++++++++++------
 3 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java
index bc61089..b574add 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java
@@ -42,10 +42,11 @@ public class FolicAcidController extends BaseController{
     //获取单个发放记录
     @RequestMapping(value = "/getFolicAcid", method = RequestMethod.GET)
     @ResponseBody
-//    @TokenRequired
+    @TokenRequired
     public BaseObjectResponse getFolicAcid(@Valid FolicAcidQueryRequest folicAcidQueryRequest,
                                          HttpServletRequest request) {
-        return folicAcidFacade.getFolicAcid(folicAcidQueryRequest);
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        return folicAcidFacade.getFolicAcid(folicAcidQueryRequest,loginState.getId());
     }
 
     //叶酸发放管理
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
index bd567f8..74c48f2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
@@ -159,12 +159,14 @@ public class FolicAcidFacade {
         return id;
     }
 
-    public BaseObjectResponse getFolicAcid(FolicAcidQueryRequest queryRequest){
+    public BaseObjectResponse getFolicAcid(FolicAcidQueryRequest queryRequest,Integer userId){
         Map<String, Object> archiveMap = null;
         FolicAcid folicAcid = null;
         ResidentsArchiveModel archiveModel = null;
         Map<String, Object> resultMap = new HashMap<>();
 
+        String hospitalId = autoMatchFacade.getHospitalId(userId);
+
         //查询妇女信息
         if (StringUtils.isNotEmpty(queryRequest.getId())){
             folicAcid = folicAcidService.getFolicAcid(queryRequest.getId());
@@ -173,10 +175,11 @@ public class FolicAcidFacade {
             }
         }else {
             ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
-            archiveQuery.setYn(1);
-            archiveQuery.setHospitalId(queryRequest.getHospitalId());
+            archiveQuery.setYn(YnEnums.YES.getId());
+            archiveQuery.setHospitalId(hospitalId);
             if (StringUtils.isNotEmpty(queryRequest.getCardNo())){
                 archiveQuery.setCertificateNum(queryRequest.getCardNo());
+                archiveQuery.setCertificateTypeId(queryRequest.getCertificateTypeId());
                 List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery);
                 if (CollectionUtils.isNotEmpty(modelList)){
                     archiveModel = modelList.get(0);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java
index fdf8634..8063711 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java
@@ -13,6 +13,8 @@ public class FunvCommonUtil {
     public static String NOT = "无";
     public static String NORMAL = "正常";
     public static String ABNORMAL = "异常";
+    public static String YES = "是";
+    public static String NO = "否";
 
     //返回中间四位数为*号的手机号
     public static String getXingPhone(String phone){
@@ -23,26 +25,54 @@ public class FunvCommonUtil {
         return "";
     }
 
-    public static String havaOrNOString(String s){
-        if (StringUtils.isNotEmpty(s)){
-            if (s.equals("1")){
-                return HAVE;
-            }else {
-                return NOT;
+    public static String havaOrNOString(String s,Integer type) {
+        if (StringUtils.isNotEmpty(s)) {
+            if (type == 1) {
+                if (s.equals("1")) {
+                    return HAVE;
+                } else {
+                    return NOT;
+                }
+            } else if (type == 2) {
+                if (s.equals("1")) {
+                    return NORMAL;
+                } else {
+                    return ABNORMAL;
+                }
+            } else if (type == 3) {
+                if (s.equals("1")) {
+                    return YES;
+                } else {
+                    return NO;
+                }
             }
         }
-        return NOT;
+        return "";
     }
 
-    public static String havaOrNOInteger(Integer i){
-        if (i!=null){
-            if (i==1){
-                return HAVE;
-            }else {
-                return NOT;
+    public static String havaOrNOInteger(Integer s,Integer type) {
+        if (s != null) {
+            if (type == 1) {
+                if (s == 1 ) {
+                    return HAVE;
+                } else {
+                    return NOT;
+                }
+            } else if (type == 2) {
+                if (s == 1) {
+                    return NORMAL;
+                } else {
+                    return ABNORMAL;
+                }
+            } else if (type == 3) {
+                if (s == 1) {
+                    return YES;
+                } else {
+                    return NO;
+                }
             }
         }
-        return NOT;
+        return "";
     }
 
 }
-- 
1.8.3.1