Commit a456a1ed85a6ef402359dbd4872c0ca164af4006
1 parent
3cf433bf69
Exists in
master
and in
6 other branches
产检
Showing 3 changed files with 29 additions and 16 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
a456a1e
| ... | ... | @@ -961,18 +961,24 @@ |
| 961 | 961 | if (CollectionUtils.isNotEmpty(list)) { |
| 962 | 962 | for (AntExManagerResult aer : list) { |
| 963 | 963 | Map<String, Object> data = new HashMap<>(); |
| 964 | - data.put("checkTime", aer.getCheckTime()); | |
| 964 | + data.put("vcCardNo", aer.getCheckTime()); | |
| 965 | 965 | data.put("name", aer.getName()); |
| 966 | 966 | data.put("age", aer.getAge()); |
| 967 | + data.put("cardNo", aer.getCardNo()); | |
| 967 | 968 | data.put("cDueWeek", aer.getcDueWeek()); |
| 969 | + data.put("isSieve", aer.getIsSieve()); | |
| 970 | + data.put("dueDate", aer.getDueDate()); | |
| 971 | + data.put("phone", aer.getPhone()); | |
| 968 | 972 | data.put("rLevel", getLevel(aer.getrLevel())); |
| 969 | 973 | data.put("riskFactor", aer.getRiskFactor()); |
| 970 | 974 | data.put("riskScore", aer.getRiskScore()); |
| 971 | - data.put("chTimes", aer.getChTimes()); | |
| 972 | 975 | data.put("tTimes", aer.gettTimes()); |
| 973 | - data.put("dueDate", aer.getDueDate()); | |
| 974 | - data.put("addr", aer.getAddr()); | |
| 975 | - data.put("checkHospital", aer.getCheckHospital()); | |
| 976 | + data.put("checkTime", aer.getChTimes()); | |
| 977 | + data.put("nextCheckTime", aer.getNextCheckTime()); | |
| 978 | + data.put("checkDoctor", aer.getCheckDoctor()); | |
| 979 | + data.put("registerAddress", aer.getAddress()); | |
| 980 | + data.put("postAddress", aer.getPostAddress()); | |
| 981 | + data.put("liveAddress", aer.getAddr()); | |
| 976 | 982 | datas.add(data); |
| 977 | 983 | } |
| 978 | 984 | } |
| 979 | 985 | |
| 980 | 986 | |
| 981 | 987 | |
| ... | ... | @@ -980,18 +986,23 @@ |
| 980 | 986 | |
| 981 | 987 | OutputStream out = httpServletResponse.getOutputStream(); |
| 982 | 988 | Map<String, String> cnames = new LinkedHashMap<>(); |
| 983 | - cnames.put("checkTime", "产检日期"); | |
| 989 | + cnames.put("vcCardNo", "条码号"); | |
| 984 | 990 | cnames.put("name", "姓名"); |
| 991 | + cnames.put("cardNo", "证件号码"); | |
| 985 | 992 | cnames.put("age", "年龄"); |
| 986 | - cnames.put("cDueWeek", "产检孕周"); | |
| 987 | - cnames.put("rLevel", "高危等级"); | |
| 988 | - cnames.put("riskFactor", "高危因素"); | |
| 989 | - cnames.put("riskScore", "高危评分"); | |
| 990 | - cnames.put("chTimes", "本院产检第次"); | |
| 991 | - cnames.put("tTimes", "总产检第次"); | |
| 993 | + cnames.put("cDueWeek", "当前孕周"); | |
| 994 | + cnames.put("isSieve", "是否产筛"); | |
| 992 | 995 | cnames.put("dueDate", "预产期"); |
| 993 | - cnames.put("addr", "居住地"); | |
| 994 | - cnames.put("checkHospital", "产检医院"); | |
| 996 | + cnames.put("phone", "联系电话"); | |
| 997 | + cnames.put("riskScore", "高危评分"); | |
| 998 | + cnames.put("riskFactor", "高危因素"); | |
| 999 | + cnames.put("tTimes", "检查次数"); | |
| 1000 | + cnames.put("checkTime", "产检时间"); | |
| 1001 | + cnames.put("checkDoctor", "产检医生"); | |
| 1002 | + cnames.put("nextCheckTime", "预约下次产检"); | |
| 1003 | + cnames.put("registerAddress", "户口所在地"); | |
| 1004 | + cnames.put("postAddress", "产后休养地"); | |
| 1005 | + cnames.put("liveAddress", "现住址"); | |
| 995 | 1006 | httpServletResponse.setContentType("application/octet-stream"); |
| 996 | 1007 | httpServletResponse.setCharacterEncoding("UTF-8"); |
| 997 | 1008 | httpServletResponse.setHeader("Content-Disposition", "attachment;fileName=" + "data.xls"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
a456a1e
| ... | ... | @@ -2420,7 +2420,9 @@ |
| 2420 | 2420 | |
| 2421 | 2421 | patientsQuery.setHusbandPhone(StringUtils.isEmpty(childbirthManagerRequest.getHusbandPhone()) ? null : childbirthManagerRequest.getHusbandPhone()); |
| 2422 | 2422 | patientsQuery.setQueryNo(StringUtils.isEmpty(childbirthManagerRequest.getQueryNo()) ? null : childbirthManagerRequest.getQueryNo()); |
| 2423 | - patientsQuery.setFmHospitalQueryList(hospitalList); | |
| 2423 | + //patientsQuery.setFmHospitalQueryList(hospitalList); | |
| 2424 | + | |
| 2425 | + patientsQuery.setFmHospitalList(hospitalList); | |
| 2424 | 2426 | patientsQuery.setFmAgeStart(StringUtils.isEmpty(childbirthManagerRequest.getStartAge()) ? null : Integer.valueOf(childbirthManagerRequest.getStartAge())); |
| 2425 | 2427 | patientsQuery.setFmAgeEnd(StringUtils.isEmpty(childbirthManagerRequest.getEndAge()) ? null : Integer.valueOf(childbirthManagerRequest.getEndAge())); |
| 2426 | 2428 | patientsQuery.setFmWeekStart(StringUtils.isEmpty(childbirthManagerRequest.getStartDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getStartDueWeek()) * 7); |