From a84a411d36a28236b3d8cda40c835e59037b0fec Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Mon, 8 Oct 2018 12:02:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=89=8D=E8=AF=8A=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/pojo/DiagnosisModel.java     |  6 ++++-
 .../operate/web/facade/DiagnosisFacaed.java        | 28 +++++++++++++++++++---
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java
index aade684..265cefe 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java
@@ -431,7 +431,11 @@ public class DiagnosisModel extends BaseModel {
         map.put("resultDate",DateUtil.getyyyy_MM_dd(resultDate));
         map.put("CsStatus",CsStatus);
         map.put("tireNumber",tireNumber);
-        map.put("sieveProject",sieveProject.toString());
+        if(sieveProject != null && sieveProject.size() > 0){
+            map.put("sieveProject",sieveProject.toString());
+        }
+        map.put("ztfeText",ztfeText);
+        map.put("refStatus",refStatus);
         return map;
     }
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java
index 8a447b0..d136eed 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java
@@ -145,9 +145,9 @@ public class DiagnosisFacaed {
                 }else{
                     if(1 == sieveModel.getStatus()){//未筛查
                         diagnosisResult.setIsCqSieve("0");
-                    }else if(2 == sieveModel.getStatus()){//已筛查
+                    }else if(2 == sieveModel.getStatus()){//筛查中
                         diagnosisResult.setIsCqSieve("2");
-                    }else if(3 == sieveModel.getStatus()){//筛查中
+                    }else if(3 == sieveModel.getStatus()){//已产筛
                         diagnosisResult.setIsCqSieve("1");
                     }
                 }
@@ -483,7 +483,14 @@ public class DiagnosisFacaed {
                         diagnosisModel.setTireNumber(sieveModel.getTireNumber().toString());
                     }
                     if(null != sieveModel.getStatus()){
-                        diagnosisModel.setCsStatus(sieveModel.getStatus().toString());
+                        if(1 == sieveModel.getStatus()){
+                            diagnosisModel.setCsStatus("0");
+                        }else if(2 == sieveModel.getStatus()){
+                            diagnosisModel.setCsStatus("2");
+                        }else if(3 == sieveModel.getStatus()){
+                            diagnosisModel.setCsStatus("1");
+                        }
+                        //diagnosisModel.setCsStatus(sieveModel.getStatus().toString());
                     }
                     if(null != sieveModel.getZtfx()){
                         if (0 == sieveModel.getZtfx()) {
@@ -498,6 +505,21 @@ public class DiagnosisFacaed {
                             diagnosisModel.setZtfx("2");
                             diagnosisModel.setZtfeText("高风险");
                         }
+
+                        //产筛项目
+                        SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
+                        sieveApplyOrderQuery.setParentId(patients.getId());
+                        sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
+                        List<SieveApplyOrderModel> applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
+                        List sList = new ArrayList();
+                        if(applyOrderModels != null && applyOrderModels.size() > 0){
+                            SieveApplyOrderModel sieveAppModel = applyOrderModels.get(0);
+                            if (StringUtils.isNotEmpty(sieveAppModel.getCheckItem())) {
+                                sList = JsonUtil.jkstr2Obj(sieveAppModel.getCheckItem(), List.class);
+                            }
+                        }
+                        diagnosisModel.setSieveProject(sList);
+
                     }
 
                 }
-- 
1.8.3.1