diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
index 2effd5b..78cfcd3 100644
--- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
+++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java
index 8f89dd6..a4e7d44 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java
@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.Date;
/**
@@ -44,6 +45,19 @@ public class NewbornVisitControoler extends BaseController {
return visitService.list(startDate, endDate, doctor, getUserId(request), key, page, limit);
}
+ /**
+ * 新生儿访视导出
+ * @param startDate 访视开始日期
+ * @param endDate 访视结束日期
+ * @param doctor 访视医生
+ * @param key 儿童姓名(模糊查询)/母亲联系方式/母亲证件号
+ * @return
+ */
+ @RequestMapping(value = "/export", method = RequestMethod.GET)
+ public void export(HttpServletRequest request, HttpServletResponse response, Date startDate, Date endDate, String doctor, String key, Integer page, Integer limit) {
+ visitService.export(startDate, endDate, doctor, getUserId(request), response, key);
+ }
+
@RequestMapping(value = "/init", method = RequestMethod.GET)
@ResponseBody
public BaseObjectResponse init() {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java
index 4be63af..ccbc934 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java
@@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.service;
import com.lyms.platform.common.result.BaseObjectResponse;
import com.lyms.platform.pojo.NewbornVisit;
+import javax.servlet.http.HttpServletResponse;
import java.util.Date;
public interface INewbornVisitService extends IBaseService {
@@ -12,4 +13,6 @@ public interface INewbornVisitService extends IBaseService {
BaseObjectResponse addOrUpdate(Integer userId, NewbornVisit newbornVisit);
BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit);
+
+ void export(Date startDate, Date endDate, String doctor, Integer userId, HttpServletResponse response, String key);
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
index 50a99bb..895459e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
@@ -14,6 +14,7 @@ import com.lyms.platform.operate.web.facade.AutoMatchFacade;
import com.lyms.platform.operate.web.service.INewbornVisitService;
import com.lyms.platform.operate.web.utils.CollectionUtils;
import com.lyms.platform.operate.web.utils.MongoUtil;
+import com.lyms.platform.operate.web.utils.ResponseUtil;
import com.lyms.platform.permission.dao.slave.UsersMapper;
import com.lyms.platform.permission.model.Users;
import com.lyms.platform.pojo.*;
@@ -28,6 +29,7 @@ import org.springframework.data.mongodb.core.query.Update;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
+import javax.servlet.http.HttpServletResponse;
import java.util.*;
/**
@@ -175,4 +177,43 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit
return RespBuilder.buildSuccess(newbornVisits);
}
+ @Override
+ public void export(Date startDate, Date endDate, String doctor, Integer userId, HttpServletResponse response, String key) {
+ BaseObjectResponse rest = list(startDate, endDate, doctor, userId, key, 1, Integer.MAX_VALUE);
+ PageResult pageResult = (PageResult) rest.getData();
+ List