From 761a43830b94e0030dd67c5a321cb1befb50a86a Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Thu, 5 Jan 2017 14:11:38 +0800
Subject: [PATCH] update bug

---
 .../operate/web/facade/FolicAcidFacade.java        | 58 +++++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

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 85d195e..fa6a4a5 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
@@ -33,6 +33,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.jws.Oneway;
 import javax.servlet.http.HttpServletResponse;
 import java.io.OutputStream;
 import java.util.*;
@@ -198,6 +199,7 @@ public class FolicAcidFacade {
                 }
             }
         }
+        List<Map> list = new ArrayList<>();
 
         if (archiveModel!=null){
             //妇女信息
@@ -206,7 +208,7 @@ public class FolicAcidFacade {
             archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId());
             archiveMap.put("username", archiveModel.getUsername());
             archiveMap.put("birthday",archiveModel.getBirthday() != null ? DateUtil.getyyyy_MM_dd(archiveModel.getBirthday()) : null);
-            archiveMap.put("age", archiveModel.getBirthday() != null ? "" : DateUtil.getAge(archiveModel.getBirthday()));
+            archiveMap.put("age", archiveModel.getBirthday() == null ? "" : DateUtil.getAge(archiveModel.getBirthday()));
             archiveMap.put("phone", archiveModel.getPhone());
             archiveMap.put("id", archiveModel.getId());
             if (StringUtils.isEmpty(archiveModel.getSex()) || archiveModel.getSex().equals(SystemConfig.WOMAN_ID )){
@@ -220,9 +222,63 @@ public class FolicAcidFacade {
             archiveMap.put("workUnit",archiveModel.getWorkUnit());
             archiveMap.put("buildDay",archiveModel.getBuildDay());
 
+            //获取历史发放记录
+            FolicAcidQuery folicAcidQuery = new FolicAcidQuery();
+            folicAcidQuery.setYn(YnEnums.YES.getId());
+            folicAcidQuery.setParentId(archiveModel.getId());
+
+            List<String> hospitalList = null;
+            //判断当前用户是否有区域权限
+            if (userId!=null){
+                hospitalList = new ArrayList<>();
+                String hospital = autoMatchFacade.getHospitalId(userId);
+                if(null!=hospital){
+                    //本院
+                    hospitalList.add(hospital);
+                }
+                //查询用户是否有区域权限
+                DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
+                dataPermissionsModelQuery.setUserId(userId);
+                List<DataPermissionsModel> permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery);
+                if (CollectionUtils.isNotEmpty(permissionsModels)) {
+                    Set<String> set = permissionsModels.get(0).getData().keySet();
+                    Iterator<String> it = set.iterator();
+                    while (it.hasNext()) {
+                        String id = it.next();
+                        if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(id) && !hospitalList.contains(id)) {
+                            hospitalList.add(id);
+                        }
+                    }
+                }
+                folicAcidQuery.setHospitalList(hospitalList);
+            }
+            List<FolicAcid> folicAcidList = folicAcidService.queryFolicAcid(folicAcidQuery);
+            if (CollectionUtils.isNotEmpty(folicAcidList)){
+                for (FolicAcid data: folicAcidList){
+                    Map<String,Object> acidMap = new HashMap<>();
+                    if (data.getPregnancyType()!=null){
+                        if (data.getPregnancyType()==1){
+                            acidMap.put("pregnancyType","孕前");
+                        }else if (data.getPregnancyType()==2){
+                            acidMap.put("pregnancyType",data.getPregnancyWeeks());
+                        }
+                    }
+                    acidMap.put("drawCount",data.getDrawCount());
+                    acidMap.put("drawTime",DateUtil.getyyyy_MM_dd(data.getDrawTime()));
+                    if (StringUtils.isNotEmpty(data.getHospitalId())){
+                        if (data.getHospitalId().equals(hospitalId)){
+                            acidMap.put("other",1);
+                        }else {
+                            acidMap.put("other",2);
+                        }
+                    }
+                    list.add(acidMap);
+                }
+            }
         }
         resultMap.put("folicAcidResult",folicAcid);
         resultMap.put("archiveResult",archiveMap);
+        resultMap.put("folicAcidHistory",list);
         BaseObjectResponse response = new BaseObjectResponse();
         response.setData(resultMap);
         response.setErrorcode(ErrorCodeConstants.SUCCESS);
-- 
1.8.3.1