From f96fd70ae1341fa6447120a9e27e5f7722b6865f Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 30 Aug 2017 14:20:48 +0800
Subject: [PATCH] update code

---
 .../java/com/lyms/platform/query/PatientsQuery.java | 20 ++++++++++++++++++++
 .../lyms/platform/operate/web/facade/LisFacade.java | 13 +++++++++++--
 .../platform/operate/web/utils/LisHandleTask.java   | 21 ++++++++++++++++++---
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
index 11e6a0e..975d1ac 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
@@ -368,6 +368,13 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
      * 就诊卡号
      */
     private String vcCardNo;
+
+
+    /**
+     * 就诊卡号
+     */
+    private List<String> vcCardNos;
+
     /**
      * 生日
      */
@@ -478,6 +485,14 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
     // 是否自动分娩
     private Integer isAutoFm = -1;
 
+    public List<String> getVcCardNos() {
+        return vcCardNos;
+    }
+
+    public void setVcCardNos(List<String> vcCardNos) {
+        this.vcCardNos = vcCardNos;
+    }
+
     public List<Integer> getSmsBuildTypeList() {
         return smsBuildTypeList;
     }
@@ -1078,6 +1093,11 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
             condition = condition.and("cardNo", cardNo, MongoOper.IS);
 
         }
+
+        if (null != vcCardNos) {
+            condition = condition.and("vcCardNo", vcCardNos, MongoOper.IN);
+        }
+
         if (StringUtils.isNotEmpty(phone)) {
             condition = condition.and("phone", phone, MongoOper.IS);
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
index 96da968..a9fce73 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
@@ -593,7 +593,16 @@ public class LisFacade {
                 {
                     if (StringUtils.isNotEmpty(pat.getVcCardNo()))
                     {
-                        vcCardNos.add(pat.getVcCardNo());
+                        //德州市妇幼保健院 解决德州妇幼孕妇换卡的问题
+                        if ("6".equals(HIS_VERSION) && "1000000114".equals(pat.getHospitalId()))
+                        {
+                            vcCardNos.addAll(dzfyHisService.getDzVcCardNos(pat.getVcCardNo()));
+                        }
+                        else
+                        {
+                            vcCardNos.add(pat.getVcCardNo());
+                        }
+
                     }
                     if (StringUtils.isNotEmpty(pat.getPhone()))
                     {
@@ -806,7 +815,7 @@ public class LisFacade {
                     end = lises.size();
                 }
                 final List<LisReportModel> models = lises.subList(i, end);
-                Callable c = new LisHandleTask(patientsService,models,map);
+                Callable c = new LisHandleTask(patientsService,models,map,dzfyHisService);
                 Future f = commonThreadPool.submit(c);
                 futures.add(f);
             }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java
index eebba92..ae8cf41 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java
@@ -1,8 +1,10 @@
 package com.lyms.platform.operate.web.utils;
 
+import com.lyms.hospitalapi.dzfy.DzfyHisService;
 import com.lyms.platform.biz.service.PatientsService;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.common.utils.PropertiesUtils;
 import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.permission.model.LisReportModel;
 import com.lyms.platform.pojo.Patients;
@@ -19,18 +21,22 @@ import java.util.concurrent.Callable;
  * Created by Administrator on 2017-05-15.
  */
 public class LisHandleTask implements Callable {
-
+    public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version");
     private PatientsService patientsService;
 
     private List<LisReportModel> lises;
 
     private   Map<String, String> hospitalMap;
+    private DzfyHisService dzfyHisService;
 
-    public LisHandleTask(PatientsService patientsService,List<LisReportModel> lises,Map<String, String> hospitalMap)
+    public LisHandleTask(PatientsService patientsService,List<LisReportModel> lises,
+                         Map<String, String> hospitalMap,
+                         DzfyHisService dzfyHisService)
     {
         this.patientsService = patientsService;
         this.lises = lises;
         this.hospitalMap = hospitalMap;
+        this.dzfyHisService = dzfyHisService;
     }
 
     @Override
@@ -55,7 +61,16 @@ public class LisHandleTask implements Callable {
                    patientsQuery.setYn(YnEnums.YES.getId());
                    if (StringUtils.isNotEmpty(lisReportModel.getVcCardNo()))
                    {
-                       patientsQuery.setVcCardNo(lisReportModel.getVcCardNo());
+
+                       //德州市妇幼保健院 解决德州妇幼孕妇换卡的问题
+                       if ("6".equals(HIS_VERSION) && "1000000114".equals(lisReportModel.getHospitalId()))
+                       {
+                           patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(lisReportModel.getVcCardNo()));
+                       }
+                       else
+                       {
+                           patientsQuery.setVcCardNo(lisReportModel.getVcCardNo());
+                       }
                        list.addAll(patientsService.queryPatient1(patientsQuery, "modified"));
                    }
                    if (StringUtils.isNotEmpty(lisReportModel.getPhone()))
-- 
1.8.3.1