From 82616a7c0623c8724b45440a020f5dd7928df4c4 Mon Sep 17 00:00:00 2001 From: wtt Date: Thu, 10 Dec 2020 14:46:25 +0800 Subject: [PATCH] update --- .../platform/common/enums/CheckMonthQhdEnums.java | 19 ++++++++++ .../web/controller/BabyEyeCheckController.java | 15 ++++++++ .../platform/operate/web/facade/SieveFacade.java | 5 ++- .../operate/web/service/BabyEyeCheckService.java | 1 + .../web/service/impl/BabyEyeCheckServiceImpl.java | 42 ++++++++++++++++++++++ 5 files changed, 81 insertions(+), 1 deletion(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/CheckMonthQhdEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/CheckMonthQhdEnums.java index 28a28e1..4923375 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/CheckMonthQhdEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/CheckMonthQhdEnums.java @@ -2,6 +2,11 @@ package com.lyms.platform.common.enums; import com.lyms.platform.common.utils.StringUtils; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * 秦皇岛新的，检查月龄 */ @@ -51,6 +56,20 @@ public enum CheckMonthQhdEnums { return null; } + public static List getCheckMonthQhdEnums() { + List mapList = new ArrayList <>(); + CheckMonthQhdEnums[] values = CheckMonthQhdEnums.values(); + for (CheckMonthQhdEnums value : values) { + Map map = new HashMap(); + map.put("name", value.getName()); + map.put("state","1");//1未做眼保健 2做了眼保健 + map.put("id",""); + map.put("checkTime",""); + mapList.add(map); + } + return mapList; + } + CheckMonthQhdEnums(Integer id, String name){ this.id = id; this.name = name; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java index d95743c..aa79f23 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java @@ -69,6 +69,21 @@ public class BabyEyeCheckController extends BaseController { public BaseResponse queryQhdBase(@PathVariable String id, HttpServletRequest request) { return babyEyeCheckService.queryQhdBase(getUserId(request), id); } + + /** + * 获取档案和检查信息，儿童眼保健检查的检查套餐记录 + * + * @param id + * @param request + * @Author: 武涛涛 + * @Date: 2020/8/5 16:04 + */ + @ResponseBody + @TokenRequired + @RequestMapping(value = "/queryQhdBaseListState/{id}", method = RequestMethod.GET) + public BaseResponse queryQhdBaseListState(@PathVariable String id, HttpServletRequest request) { + return babyEyeCheckService.queryQhdBaseListState(getUserId(request), id); + } /** * 儿保检查获取眼保健检查结果信息 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 88784f0..0c7ea65 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -1141,8 +1141,9 @@ public class SieveFacade { PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setHospitalId(hospitalId); +// patientsQuery.setHospitalId(hospitalId); patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setType(1); if (StringUtils.isNotEmpty(cardNo)) { patientsQuery.setPhoneOrCert(cardNo); } else if (StringUtils.isNotEmpty(vcCardNo)) { @@ -3186,6 +3187,7 @@ public class SieveFacade { private void cnamesRegionalCqsievesWcMap(Map cnames) { cnames.put("姓名", "姓名"); cnames.put("年龄", "年龄"); + cnames.put("联系方式", "联系方式"); cnames.put("申请时间", "申请时间"); cnames.put("申请孕周", "申请孕周"); cnames.put("采血时间", "采血时间"); @@ -3253,6 +3255,7 @@ public class SieveFacade { Map data = new HashMap<>(); data.put("姓名", sive.getName()); data.put("年龄", sive.getAge()); + data.put("联系方式", sive.getPhone()); data.put("申请时间", sive.getApplyTime()); data.put("申请孕周", sive.getDueWeek()); data.put("采血时间", sive.getCollectionDate()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java index 76e1689..2623d92 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java @@ -38,6 +38,7 @@ public interface BabyEyeCheckService extends IBaseService { BaseResponse query(Integer userId, String babyId); BaseResponse queryQhd(Integer userId, String babyId); BaseResponse queryQhdBase(Integer userId, String babyId); + BaseResponse queryQhdBaseListState(Integer userId, String babyId); BaseResponse queryShowQhd( String babyId); BaseResponse listInit(Integer userId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index 3aef5a2..2f91ff7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -1704,6 +1704,48 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC } @Override + public BaseResponse queryQhdBaseListState(Integer userId, String babyId) { + List hospitalIds = organizationGroupsFacade.findGroupHospital(userId, false); + if (CollectionUtils.isEmpty(hospitalIds)) { + return RespBuilder.buildSuccess(); + } + List> rest = new ArrayList<>(); + List babyEyeChecks = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("hospitalId").in(hospitalIds).and("yn").ne("0")) + .with(new Sort(Sort.Direction.ASC, "checkTime")), BabyEyeCheck.class); + + List checkMonthQhdEnums1 = CheckMonthQhdEnums.getCheckMonthQhdEnums(); + for (BabyEyeCheck babyEyeCheck : babyEyeChecks) { + Map temp = new HashMap<>(); + if (StringUtils.isNotEmpty(babyEyeCheck.getEdition())) { + //处理老数据 + if ("0".equals(babyEyeCheck.getCheckMonthId())) { + babyEyeCheck.setCheckMonthId("1"); + } else if ("9".equals(babyEyeCheck.getCheckMonthId())) { + babyEyeCheck.setCheckMonthId("12"); + } else if ("18".equals(babyEyeCheck.getCheckMonthId())) { + babyEyeCheck.setCheckMonthId("24"); + } + temp.put("checkMonth", CheckMonthQhdEnums.getName(babyEyeCheck.getCheckMonthId())); + } else { + temp.put("checkMonth", CheckMonthEnums.getName(babyEyeCheck.getCheckMonthId())); + } + try { + for (int i = 0; i < checkMonthQhdEnums1.size(); i++) { + Map map = checkMonthQhdEnums1.get(i); + if( map.get("name").toString().equals(temp.get("checkMonth").toString())){ + map.put("state", "2"); + map.put("id", babyEyeCheck.getId()); + map.put("checkTime", babyEyeCheck.getCheckTime() == null ? null : DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); + continue; + } + } + } catch (Exception e) { + } + } + return RespBuilder.buildSuccess(checkMonthQhdEnums1); + } + + @Override public BaseResponse queryShowQhd(String babyId) { Date firstSecond = DateUtil.getDayFirstSecond(new Date()); Date dayLastSecond = DateUtil.getDayLastSecond(new Date()); -- 1.8.3.1