diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 7fd0dc6..56be907 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -41,8 +41,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.OutputStream; import java.util.*; import java.util.concurrent.Future; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; /** @@ -827,7 +825,7 @@ public class PatientFacade { List> datas = new ArrayList<>(); Map cnames = new LinkedHashMap<>(); if (patientsQueryRequest.getQueryType() != null) { - // 0 高危孕妇 1 全部孕妇 2全部产妇 + // 0 高危孕妇 1 全部孕妇 2全部产妇 3产后孕妇统计导出 if (patientsQueryRequest.getQueryType() == 0) { listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, userId, null, Boolean.FALSE); List list = listResponse.getData(); @@ -932,6 +930,30 @@ public class PatientFacade { cnames.put("lName", "登记人"); cnames.put("serviceType", "服务类型"); cnames.put("serviceStatus", "服务状态"); + }else if(patientsQueryRequest.getQueryType() == 3){ + listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 3, userId, null, Boolean.FALSE); + List list = listResponse.getData(); + for (Object obj : list) { + Map data = new HashMap<>(); + QuanChanResult rp = (QuanChanResult) obj; + data.put("name", rp.getName()); + data.put("realPhone", rp.getRealPhone()); + data.put("cTime", rp.getcTime()); + data.put("dueWeek", rp.getDueWeek()); + data.put("fCh", rp.getfCh()); + data.put("addr", rp.getAddr()); + data.put("street", rp.getStreet()); + data.put("registerAddr", rp.getRegisterAddr()); + datas.add(data); + } + cnames.put("name", "姓名"); + cnames.put("realPhone", "分娩年龄"); + cnames.put("cTime", "产后天数"); + cnames.put("dueWeek", "分娩日期"); + cnames.put("fCh", "分娩医院"); + cnames.put("addr", "居住地"); + cnames.put("street", "乡镇/街道名称"); + cnames.put("registerAddr", "户籍地"); } }