From 3a8430c21c7a7407ddb20ae0bf128b37ee4132d7 Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Tue, 9 Oct 2018 16:35:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=89=8D=E8=AF=8A=E6=96=AD=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/DiagnosisFacaed.java        | 51 +++++++++++++++++-----
 1 file changed, 39 insertions(+), 12 deletions(-)

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 a04c4dc..ac07740 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
@@ -463,10 +463,49 @@ public class DiagnosisFacaed {
      */
     public DiagnosisManagerResult queryDiagnosisLab(DiagnosisAddRequest dataresult,Integer userId){
         List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
+        List<String> pList = new ArrayList<String>();
         DiagnosisManagerResult diagnosisManagerResult = new DiagnosisManagerResult();
         String hospital = autoMatchFacade.getHospitalId(userId);
         dataresult.setHospitalId(hospital);
         DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
+        if(null != dataresult.getQueryNo()){
+            PatientsQuery patientsQuery = new PatientsQuery();
+            patientsQuery.setQueryNo(dataresult.getQueryNo());
+            patientsQuery.setHospitalId(hospital);
+            List<Patients> list = patientsService.queryPatient(patientsQuery);
+            if(list != null && list.size() > 0){
+                for(Patients patient : list){
+                    pList.add(patient.getId());
+                }
+            }else{
+                return diagnosisManagerResult;
+            }
+        }
+        if(pList != null && pList.size() > 0){
+            diagnosisQuery.setParentIdList(pList);
+        }
+        if(null != dataresult.getDiaResult()){
+            diagnosisQuery.setDiaResult(dataresult.getDiaResult());
+        }
+        if (null != dataresult.getApplyWeekStart()){
+            diagnosisQuery.setApplyWeeksStart(7 * Integer.valueOf(dataresult.getApplyWeekStart()));
+        }
+        if (null != dataresult.getApplyWeekEnd()){
+            diagnosisQuery.setApplyWeeksEnd(7 * Integer.valueOf(dataresult.getApplyWeekEnd()) + 6);
+        }
+        if (null != dataresult.getNowWeeksStart()) {
+            diagnosisQuery.setLastMensesEnd(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(dataresult.getNowWeeksStart() * 7)));
+        }
+        if (null != dataresult.getNowWeeksEnd()) {
+            diagnosisQuery.setLastMensesStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(dataresult.getNowWeeksEnd() * 7) - 6));
+        }
+        if(null != dataresult.getDiaStatus()){
+            diagnosisQuery.setDiaStatus(dataresult.getDiaStatus());
+        }
+        if(null != dataresult.getRsResult()){
+            diagnosisQuery.setRsResult(dataresult.getRsResult());
+        }
+
         if(StringUtils.isNotEmpty(dataresult.getApplyDate())){
             String[] dates = dataresult.getApplyDate().split(" - ");
             diagnosisQuery.setApplyDateStart(DateUtil.parseYMD(dates[0]));
@@ -475,15 +514,6 @@ public class DiagnosisFacaed {
                 diagnosisQuery.setApplyDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
             }
         }
-        if(null != dataresult.getCollectHospitalId()){
-            diagnosisQuery.setCollectHospitalId(dataresult.getCollectHospitalId());
-        }
-        if(null != dataresult.getSpecimenNo()){
-            diagnosisQuery.setSpecimenNo(dataresult.getSpecimenNo());
-        }
-        if(null != dataresult.getDiaStatus()){
-            diagnosisQuery.setDiaStatus(dataresult.getDiaStatus());
-        }
         if(null != dataresult.getResultDate()){
             String[] dates = dataresult.getResultDate().split(" - ");
             diagnosisQuery.setResultDateStart(DateUtil.parseYMD(dates[0]));
@@ -491,9 +521,6 @@ public class DiagnosisFacaed {
                 diagnosisQuery.setResultDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
             }
         }
-        if(null != dataresult.getQueryNo()){
-            diagnosisQuery.setQueryNo(dataresult.getQueryNo());
-        }
         //只查询状态为已申请和已接收的
         List<String> listString = new ArrayList<String>();
         listString.add("1");
-- 
1.8.3.1