diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index c6326b6..347795c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -961,18 +961,24 @@ public class AntExRecordFacade { if (CollectionUtils.isNotEmpty(list)) { for (AntExManagerResult aer : list) { Map data = new HashMap<>(); - data.put("checkTime", aer.getCheckTime()); + data.put("vcCardNo", aer.getCheckTime()); data.put("name", aer.getName()); data.put("age", aer.getAge()); + data.put("cardNo", aer.getCardNo()); data.put("cDueWeek", aer.getcDueWeek()); + data.put("isSieve", aer.getIsSieve()); + data.put("dueDate", aer.getDueDate()); + data.put("phone", aer.getPhone()); data.put("rLevel", getLevel(aer.getrLevel())); data.put("riskFactor", aer.getRiskFactor()); data.put("riskScore", aer.getRiskScore()); - data.put("chTimes", aer.getChTimes()); data.put("tTimes", aer.gettTimes()); - data.put("dueDate", aer.getDueDate()); - data.put("addr", aer.getAddr()); - data.put("checkHospital", aer.getCheckHospital()); + data.put("checkTime", aer.getChTimes()); + data.put("nextCheckTime", aer.getNextCheckTime()); + data.put("checkDoctor", aer.getCheckDoctor()); + data.put("registerAddress", aer.getAddress()); + data.put("postAddress", aer.getPostAddress()); + data.put("liveAddress", aer.getAddr()); datas.add(data); } } @@ -980,18 +986,23 @@ public class AntExRecordFacade { OutputStream out = httpServletResponse.getOutputStream(); Map cnames = new LinkedHashMap<>(); - cnames.put("checkTime", "产检日期"); + cnames.put("vcCardNo", "条码号"); cnames.put("name", "姓名"); + cnames.put("cardNo", "证件号码"); cnames.put("age", "年龄"); - cnames.put("cDueWeek", "产检孕周"); - cnames.put("rLevel", "高危等级"); - cnames.put("riskFactor", "高危因素"); - cnames.put("riskScore", "高危评分"); - cnames.put("chTimes", "本院产检第次"); - cnames.put("tTimes", "总产检第次"); + cnames.put("cDueWeek", "当前孕周"); + cnames.put("isSieve", "是否产筛"); cnames.put("dueDate", "预产期"); - cnames.put("addr", "居住地"); - cnames.put("checkHospital", "产检医院"); + cnames.put("phone", "联系电话"); + cnames.put("riskScore", "高危评分"); + cnames.put("riskFactor", "高危因素"); + cnames.put("tTimes", "检查次数"); + cnames.put("checkTime", "产检时间"); + cnames.put("checkDoctor", "产检医生"); + cnames.put("nextCheckTime", "预约下次产检"); + cnames.put("registerAddress", "户口所在地"); + cnames.put("postAddress", "产后休养地"); + cnames.put("liveAddress", "现住址"); httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.setCharacterEncoding("UTF-8"); httpServletResponse.setHeader("Content-Disposition", "attachment;fileName=" + "data.xls"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 3b656de..81a8ae1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2420,7 +2420,9 @@ public class MatDeliverFacade { patientsQuery.setHusbandPhone(StringUtils.isEmpty(childbirthManagerRequest.getHusbandPhone()) ? null : childbirthManagerRequest.getHusbandPhone()); patientsQuery.setQueryNo(StringUtils.isEmpty(childbirthManagerRequest.getQueryNo()) ? null : childbirthManagerRequest.getQueryNo()); - patientsQuery.setFmHospitalQueryList(hospitalList); + //patientsQuery.setFmHospitalQueryList(hospitalList); + + patientsQuery.setFmHospitalList(hospitalList); patientsQuery.setFmAgeStart(StringUtils.isEmpty(childbirthManagerRequest.getStartAge()) ? null : Integer.valueOf(childbirthManagerRequest.getStartAge())); patientsQuery.setFmAgeEnd(StringUtils.isEmpty(childbirthManagerRequest.getEndAge()) ? null : Integer.valueOf(childbirthManagerRequest.getEndAge())); patientsQuery.setFmWeekStart(StringUtils.isEmpty(childbirthManagerRequest.getStartDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getStartDueWeek()) * 7); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java index 21aa433..1f1126d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java @@ -73,7 +73,7 @@ public class AntExManagerResult { //产后修养地 private String postAddress; - //居住地址 + //户籍地址 private String address; public String getCardNo() {