Commit 93261048027f433d54cc8ce86485ca481b86c008
1 parent
bd4083d431
Exists in
master
and in
6 other branches
区域-孕产妇管理-全部产妇导出调整
Showing 1 changed file with 18 additions and 18 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
9326104
| ... | ... | @@ -2261,18 +2261,18 @@ |
| 2261 | 2261 | data.put("name", rp.getName()); |
| 2262 | 2262 | data.put("age", rp.getAge()); |
| 2263 | 2263 | data.put("dueWeek", rp.getDueWeek()); |
| 2264 | - data.put("cTime", rp.getcTime()); | |
| 2264 | + data.put("createdWeek", rp.getCreatedWeek()); | |
| 2265 | + data.put("cTimes", rp.getcTimes()); | |
| 2266 | + data.put("tireNumber", rp.getTireNumber()); | |
| 2265 | 2267 | data.put("rLevel", getLevel(rp.getrLevel())); |
| 2266 | 2268 | data.put("rFactor", rp.getrFactor()); |
| 2267 | - data.put("nextCheckTime", rp.getNextCheckTime()); | |
| 2268 | - data.put("cTimes", rp.getcTimes()); | |
| 2269 | - data.put("cHTimes", rp.getcHTimes()); | |
| 2270 | - data.put("checkDoctor", rp.getCheckDoctor()); | |
| 2271 | - data.put("lName", rp.getlName()); | |
| 2272 | - data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : StringUtils.encryPhone(rp.getRealPhone())); | |
| 2269 | + data.put("registerAddr", rp.getRegisterAddr()); | |
| 2273 | 2270 | data.put("addr", rp.getAddr()); |
| 2274 | - data.put("serviceType", "服务类型"); | |
| 2275 | - data.put("serviceStatus", "服务类型"); | |
| 2271 | + data.put("fCh", rp.getfCh()); | |
| 2272 | + data.put("firstBH", rp.getFirstBH()); | |
| 2273 | + data.put("bTime", rp.getbTime()); | |
| 2274 | + data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : StringUtils.encryPhone(rp.getRealPhone())); | |
| 2275 | + data.put("cardNo", patientsQueryRequest.getIsEncry() == 0 ? rp.getCardNo() : StringUtils.encryCardNo(rp.getCardNo())); | |
| 2276 | 2276 | datas.add(data); |
| 2277 | 2277 | } |
| 2278 | 2278 | } |
| 2279 | 2279 | |
| 2280 | 2280 | |
| ... | ... | @@ -2326,18 +2326,18 @@ |
| 2326 | 2326 | cnames.put("name", "姓名"); |
| 2327 | 2327 | cnames.put("age", "分娩年龄"); |
| 2328 | 2328 | cnames.put("dueWeek", "分娩日期"); |
| 2329 | - cnames.put("cTime", "产后时间"); | |
| 2329 | + cnames.put("createdWeek", "建档孕周"); | |
| 2330 | + cnames.put("cTimes", "总复查次数"); | |
| 2331 | + cnames.put("tireNumber", "胎数"); | |
| 2330 | 2332 | cnames.put("rLevel", "高危等级"); |
| 2331 | 2333 | cnames.put("rFactor", "高危风险因素"); |
| 2332 | - cnames.put("nextCheckTime", "预约下次复查"); | |
| 2333 | - cnames.put("cTimes", "总复查次数"); | |
| 2334 | - cnames.put("cHTimes", "本院复查次数"); | |
| 2335 | - cnames.put("checkDoctor", "检查医生"); | |
| 2336 | - cnames.put("phone", "联系方式"); | |
| 2337 | - cnames.put("lName", "登记人"); | |
| 2334 | + cnames.put("registerAddr", "户籍地址"); | |
| 2338 | 2335 | cnames.put("addr", "居住地"); |
| 2339 | - cnames.put("serviceType", "服务类型"); | |
| 2340 | - cnames.put("serviceStatus", "服务状态"); | |
| 2336 | + cnames.put("fCh", "分娩医院"); | |
| 2337 | + cnames.put("firstBH", "首次建档医院"); | |
| 2338 | + cnames.put("bTime", "建档日期"); | |
| 2339 | + cnames.put("phone", "联系方式"); | |
| 2340 | + cnames.put("cardNo", "身份证号码"); | |
| 2341 | 2341 | } |
| 2342 | 2342 | OutputStream out = response.getOutputStream(); |
| 2343 | 2343 | ExcelUtil.toExcel(out, datas, cnames); |