From 523e2cc86aa226479a33763aabeaf7a98f6fcb54 Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Sun, 2 Jun 2019 21:46:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/query/ChargeRecordQuery.java   | 14 ++++++++++++++
 .../platform/operate/web/facade/BabyNutritionFacade.java  | 15 +++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ChargeRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ChargeRecordQuery.java
index 41383cf..cf4c8b2 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/ChargeRecordQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/ChargeRecordQuery.java
@@ -8,6 +8,7 @@ import com.lyms.platform.common.dao.operator.MongoQuery;
 import org.springframework.data.mongodb.core.query.Criteria;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * Created by Administrator on 2016/6/21 0021.
@@ -17,6 +18,8 @@ public class ChargeRecordQuery extends BaseQuery implements IConvertToNativeQuer
 
     private String id;
 
+    private List<String> ids;
+
     private Integer yn;
 
     //医院id
@@ -39,6 +42,13 @@ public class ChargeRecordQuery extends BaseQuery implements IConvertToNativeQuer
     private Date createdStart;
     private Date createdEnd;
 
+    public List<String> getIds() {
+        return ids;
+    }
+
+    public void setIds(List<String> ids) {
+        this.ids = ids;
+    }
 
     //结算状态
     private Integer status;
@@ -54,6 +64,10 @@ public class ChargeRecordQuery extends BaseQuery implements IConvertToNativeQuer
             condition = condition.and("id", id, MongoOper.IS);
         }
 
+        if (null != ids) {
+            condition = condition.and("id", ids, MongoOper.IN);
+        }
+
         if (null != hospitalId) {
             condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
index f41f110..cf7269f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
@@ -1122,6 +1122,21 @@ public class BabyNutritionFacade {
         }
         chargeRecordQuery.setCreatedStart(startTime);
         chargeRecordQuery.setCreatedEnd(endTime);
+        if (request.getInterpretDoctorId() != null) {
+            String interpretDoctorId = request.getInterpretDoctorId();
+            List<HealthChargeModel> models = mongoTemplate.find(Query.query(Criteria.where("doctorId").is(interpretDoctorId).
+                    and("healthType").is("5").and("status").is("2")), HealthChargeModel.class);
+            ArrayList<String> list = new ArrayList<>();
+            if (CollectionUtils.isEmpty(models)) {
+                return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(listData).setPageInfo(chargeRecordQuery.getPageInfo());
+            }
+            for (HealthChargeModel model : models){
+                list.add(model.getChargeRecordId());
+            }
+            if (list.size() > 0) {
+                chargeRecordQuery.setIds(list);
+            }
+        }
 
         List<ChargeRecordModel> list = chargeRecordService.queryChargeRecordList(chargeRecordQuery);
         if (CollectionUtils.isNotEmpty(list)) {
-- 
1.8.3.1