From 7e32d0ad5437d56876161f0e1456f1e96d5b3e0b Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Fri, 9 Dec 2016 15:04:49 +0800
Subject: [PATCH] update

---
 .../web/facade/PremaritalCheckupFacade.java        | 44 ++++++++++++----------
 1 file changed, 24 insertions(+), 20 deletions(-)

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 d98d0c4..00a7601 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
@@ -164,12 +164,12 @@ public class PremaritalCheckupFacade {
      * @param request
      * @return
      */
-    public BaseListResponse queryPremaritalCheckup(PremaritalCheckupQueryRequest request){
+    public BaseListResponse queryPremaritalCheckup(PremaritalCheckupQueryRequest request) {
 
-        List<String> parentIds = new ArrayList<>();
+        List<String> parentIds = null;
 
         //用姓名和联系方式查询到的居民建档ID
-        if (StringUtils.isNotEmpty(request.getUsername()) || StringUtils.isNotEmpty(request.getPhone()) || StringUtils.isNotEmpty(request.getCardNo())){
+        if (StringUtils.isNotEmpty(request.getUsername()) || StringUtils.isNotEmpty(request.getPhone()) || StringUtils.isNotEmpty(request.getCardNo())) {
             ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
             archiveQuery.setYn(YnEnums.YES.getId());
             archiveQuery.setUsername(request.getUsername());
@@ -177,10 +177,13 @@ public class PremaritalCheckupFacade {
             archiveQuery.setPhone(request.getPhone());
             archiveQuery.setHospitalId(request.getHospitalId());
             List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery);
-            if (CollectionUtils.isNotEmpty(modelList)){
-                for (ResidentsArchiveModel model : modelList){
+            parentIds = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(modelList)) {
+                for (ResidentsArchiveModel model : modelList) {
                     parentIds.add(model.getId());
                 }
+            }else {
+                parentIds.add("-1");
             }
         }
         PremaritalCheckupQuery query = new PremaritalCheckupQuery();
@@ -188,14 +191,15 @@ public class PremaritalCheckupFacade {
         query.setLimit(request.getLimit());
         query.setNeed("y");
         query.setYn(YnEnums.YES.getId());
+
         query.setYiXueYiJian(request.getYiXueYiJian());
 
-        if(StringUtils.isNotEmpty(request.getPremaritalUpTime())){
+        if (StringUtils.isNotEmpty(request.getPremaritalUpTime())) {
             String[] dates = request.getPremaritalUpTime().split(" - ");
             query.setPremaritalUpTimeStart(DateUtil.parseYMD(dates[0]));
-            if(dates.length>=2){
-                Date date= DateUtil.parseYMD(dates[1]);
-                if(null!=date){
+            if (dates.length >= 2) {
+                Date date = DateUtil.parseYMD(dates[1]);
+                if (null != date) {
                     long d = date.getTime() + 86398000;
                     date = new Date(d);
                 }
@@ -204,28 +208,28 @@ public class PremaritalCheckupFacade {
         }
         query.setSexType(request.getSexType());
 
-        if (CollectionUtils.isNotEmpty(parentIds)){
+        if (parentIds!=null) {
             query.setParentIds(parentIds);
         }
 
         List<PremaritalCheckup> data = premaritalCheckupService.queryPremaritalCheckup(query);
         List<Map> list = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(data)){
-            for (PremaritalCheckup checkup : data){
-                Map<String,Object> map = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(data)) {
+            for (PremaritalCheckup checkup : data) {
+                Map<String, Object> map = new HashMap<>();
                 ResidentsArchiveModel model = residentsArchiveService.getResident(checkup.getParentId());
-                map.put("premaritalUpTime", checkup.getPremaritalUpTime());
+                map.put("premaritalUpTime", DateUtil.getyyyy_MM_dd(checkup.getPremaritalUpTime()));
                 map.put("username", model.getUsername());
-                map.put("certificateNum",model.getCertificateNum());
+                map.put("certificateNum", model.getCertificateNum());
                 map.put("phone", model.getPhone());
-                if (checkup.getJianChaJieGuo() != null && checkup.getJianChaJieGuo()== PhysiologyStatusEnum.NORMAL.getId()){
+                if (checkup.getJianChaJieGuo() != null && checkup.getJianChaJieGuo() == PhysiologyStatusEnum.NORMAL.getId()) {
                     map.put("jianChaJieGuo", PhysiologyStatusEnum.NORMAL.getTitle());
-                }else {
+                } else {
                     map.put("jianChaJieGuo", checkup.getJianChaDetails());
                 }
-                map.put("yiXueYiJian", checkup.getYiXueYiJian() ==null ? "" :MedicalAdviceEnum.getEnum(checkup.getYiXueYiJian()).getTitle());
-                map.put("residence", CommonsHelper.getResidence(model.getProvinceId(),model.getCityId(),model.getAreaId(),model.getStreetId(),
-                        model.getAddress(),basicConfigService));
+                map.put("yiXueYiJian", checkup.getYiXueYiJian() == null ? "" : MedicalAdviceEnum.getEnum(checkup.getYiXueYiJian()).getTitle());
+                map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(),
+                        model.getAddress(), basicConfigService));
                 map.put("hunJianDoctor", checkup.getHunJianDoctor());
                 map.put("id", checkup.getId());
                 list.add(map);
-- 
1.8.3.1