Commit 16e63175f0f6449a2395607668645836a9d29dce
1 parent
036df639b3
Exists in
master
and in
6 other branches
update
Showing 3 changed files with 61 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java
View file @
16e6317
| ... | ... | @@ -218,6 +218,14 @@ |
| 218 | 218 | return folviteService.deleteProvide(id); |
| 219 | 219 | } |
| 220 | 220 | |
| 221 | + @RequestMapping(value = "querFolviteRecordInfo/{id}", method = RequestMethod.GET) | |
| 222 | + @ResponseBody | |
| 223 | + @TokenRequired | |
| 224 | + public BaseResponse querFolviteRecordInfo(@PathVariable("id") String id) { | |
| 225 | + | |
| 226 | + return folviteService.querFolviteRecordInfo(id); | |
| 227 | + } | |
| 228 | + | |
| 221 | 229 | |
| 222 | 230 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/FolviteService.java
View file @
16e6317
| ... | ... | @@ -68,6 +68,13 @@ |
| 68 | 68 | */ |
| 69 | 69 | BaseResponse deleteProvide(String id); |
| 70 | 70 | |
| 71 | + /** | |
| 72 | + * 通过建档id 查询建档详情+ 方法历史记录 | |
| 73 | + * | |
| 74 | + * @param id | |
| 75 | + * @return | |
| 76 | + */ | |
| 77 | + BaseResponse querFolviteRecordInfo(String id); | |
| 71 | 78 | |
| 72 | 79 | List<FolviteRecordModel> queryFolviteList(FolviteQuery folviteQuery); |
| 73 | 80 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
View file @
16e6317
| ... | ... | @@ -235,6 +235,52 @@ |
| 235 | 235 | } |
| 236 | 236 | |
| 237 | 237 | @Override |
| 238 | + public BaseResponse querFolviteRecordInfo(String id) { | |
| 239 | + Map<String, Object> responseMap = new HashMap<>(); | |
| 240 | + FolviteRecordModel queryOne = folviteMapper.queryOne(id); | |
| 241 | + Map<String, Object> data = new HashMap<>(); | |
| 242 | + List<Map<String, Object>> listMap = new ArrayList<>(); | |
| 243 | + if (queryOne != null) { | |
| 244 | + data.put("id", queryOne.getId()); | |
| 245 | + data.put("name", queryOne.getName()); | |
| 246 | + data.put("age", DateUtil.getAge(queryOne.getBirthday())); | |
| 247 | + data.put("sex", queryOne.getSex()); | |
| 248 | + data.put("birth", DateUtil.getyyyy_MM_dd(queryOne.getBirthday())); | |
| 249 | + data.put("phone", queryOne.getPhone()); | |
| 250 | + data.put("sumNumber", queryOne.getReceiveSum()); | |
| 251 | + data.put("address", CommonsHelper.getResidence(queryOne.getDomicileProvince(), queryOne.getDomicileCity(), | |
| 252 | + queryOne.getDomicileArea(), queryOne.getDomicileCountry(), queryOne.getDomicileAddress(), basicConfigService)); | |
| 253 | + data.put("drawTime", DateUtil.getyyyy_MM_dd(queryOne.getDrawTime())); | |
| 254 | + data.put("ispregnancy", queryOne.getIspregnancy()); | |
| 255 | + } | |
| 256 | + FolviteRecordQuery recordQuery = new FolviteRecordQuery(); | |
| 257 | + recordQuery.setFolviteId(queryOne.getId()); | |
| 258 | + recordQuery.setSort("receive_date asc"); | |
| 259 | + List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery); | |
| 260 | + if (CollectionUtils.isNotEmpty(folviteRecordModels)) { | |
| 261 | + for (FolviteReceiveRecordModel folviteRecordModel : folviteRecordModels) { | |
| 262 | + Map<String, Object> recordMap = new HashMap<>(); | |
| 263 | + recordMap.put("drawCount", folviteRecordModel.getReceiveNumber()); | |
| 264 | + recordMap.put("drawTime", DateUtil.getyyyy_MM_dd(folviteRecordModel.getReceiveDate())); | |
| 265 | + recordMap.put("id", folviteRecordModel.getId()); | |
| 266 | + recordMap.put("other", folviteRecordModel.getIsconceive()); | |
| 267 | + if (folviteRecordModel.getIsconceive() == 0) { | |
| 268 | + recordMap.put("pregnancyType", "孕前"); | |
| 269 | + } else { | |
| 270 | + recordMap.put("pregnancyType", "孕" + folviteRecordModel.getReceiveWeek() + "周"); | |
| 271 | + } | |
| 272 | + listMap.add(recordMap); | |
| 273 | + } | |
| 274 | + } | |
| 275 | + BaseResponse response = new BaseResponse(); | |
| 276 | + responseMap.put("baseInfo", data); | |
| 277 | + responseMap.put("history", listMap); | |
| 278 | + response.setObject(responseMap); | |
| 279 | + return response; | |
| 280 | + } | |
| 281 | + | |
| 282 | + | |
| 283 | + @Override | |
| 238 | 284 | public List<FolviteRecordModel> queryFolviteList(FolviteQuery folviteQuery) { |
| 239 | 285 | if (folviteQuery.getNeed() != null) { |
| 240 | 286 | folviteQuery.mysqlBuild(folviteMapper.queryFolviteListCount(folviteQuery)); |