From bac5881921360a7b0ed292542841d93e05b9f343 Mon Sep 17 00:00:00 2001 From: dongqin <123456> Date: Tue, 26 Nov 2019 14:30:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=AB=E9=A2=88=E7=99=8C=E4=B8=AA=E6=A1=88?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/common/utils/MapUtil.java | 26 ++++++++++++ .../lyms/platform/pojo/CervicalCancerModel.java | 13 ------ .../web/controller/CervicalCancerController.java | 15 +++++++ .../operate/web/service/CervicalCancerService.java | 8 ++++ .../service/impl/CervicalCancerServiceImpl.java | 48 ++++++++++++++++++++-- 5 files changed, 94 insertions(+), 16 deletions(-) create mode 100644 platform-common/src/main/java/com/lyms/platform/common/utils/MapUtil.java diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/MapUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/MapUtil.java new file mode 100644 index 0000000..a8b9f6f --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/MapUtil.java @@ -0,0 +1,26 @@ +package com.lyms.platform.common.utils; + +import java.util.Map; + +import org.springframework.cglib.beans.BeanMap; + +import com.google.common.collect.Maps; + +/** + * @author dongqin + * @description map 工具类 + * @date 11:30 2019/11/26 + **/ +public class MapUtil { + + public static Map beanToMap(T bean) { + Map map = Maps.newHashMap(); + if (bean != null) { + BeanMap beanMap = BeanMap.create(bean); + for (Object key : beanMap.keySet()) { + map.put(key + "", beanMap.get(key)); + } + } + return map; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java index cd21624..2d5e902 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java @@ -20,11 +20,6 @@ public class CervicalCancerModel extends BaseModel { private String id; /** - * 妇女id - */ - private String pid; - - /** * 建档id */ private String parentId; @@ -90,14 +85,6 @@ public class CervicalCancerModel extends BaseModel { this.id = id; } - public String getPid() { - return pid; - } - - public void setPid(String pid) { - this.pid = pid; - } - public String getParentId() { return parentId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java index 604d5f8..6157c7b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java @@ -5,6 +5,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import com.fasterxml.jackson.annotation.JsonAlias; @@ -29,6 +30,20 @@ public class CervicalCancerController extends BaseController { @Autowired private CervicalCancerService cervicalCancerService; + /** + * + * 根据身份证号获取对应的建档信息 + * + * @param idCard + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getPatientInfoByIdCard") + @ResponseBody + @TokenRequired + public BaseResponse getPatientInfoByIdCard(@RequestParam String idCard) { + return cervicalCancerService.getPatientInfoByIdCard(idCard); + } + /** * 保存单个 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/CervicalCancerService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/CervicalCancerService.java index 3b4fba1..665c4ec 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/CervicalCancerService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/CervicalCancerService.java @@ -38,4 +38,12 @@ public interface CervicalCancerService { * @return */ BaseResponse detail(CervicalCancerRequest param); + + /** + * 根据身份证号获取对应的建档信息 + * + * @param idCard + * @return + */ + BaseResponse getPatientInfoByIdCard(String idCard); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java index b4def38..64be37f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.service.impl; import java.util.Date; import java.util.List; +import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; @@ -11,17 +12,21 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Service; +import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.MapUtil; import com.lyms.platform.common.utils.MongoConvertHelper; import com.lyms.platform.common.utils.ReflectionUtils; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.CervicalCancerListRequest; import com.lyms.platform.operate.web.request.CervicalCancerRequest; import com.lyms.platform.operate.web.service.CervicalCancerService; -import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.operate.web.utils.CollectionUtils; +import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.pojo.CervicalCancerModel; -import com.lyms.platform.pojo.MatdeliverFollowPushModel; +import com.lyms.platform.pojo.ResidentsArchiveModel; @Service public class CervicalCancerServiceImpl implements CervicalCancerService { @@ -30,7 +35,7 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { private MongoTemplate mongoTemplate; @Autowired - private UsersService usersService; + private BasicConfigService basicConfigService; /** * 保存单个 @@ -125,4 +130,41 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { baseResponse.setObject(model); return baseResponse; } + + /** + * 根据身份证号获取对应的建档信息 + * + * @param idCard + * @return + */ + @Override + public BaseResponse getPatientInfoByIdCard(String idCard) { + List models = mongoTemplate.find(Query.query(Criteria.where("certificateNum").is(idCard)).with(new Sort(Sort.Direction.DESC, "created")), ResidentsArchiveModel.class); + if (CollectionUtils.isEmpty(models)) { + return new BaseResponse("查无数据，请先到妇女建档进行建档操作", ErrorCodeConstants.NO_DATA); + } + ResidentsArchiveModel model = models.get(0); + Map map = MapUtil.beanToMap(model); + String provinceId = model.getProvinceId(); + map.put("provinceId", provinceId); + map.put("provinceStr", CommonsHelper.getName1(provinceId,basicConfigService)); + String cityId = model.getCityId(); + map.put("cityId", cityId); + map.put("cityStr", CommonsHelper.getName1(cityId,basicConfigService)); + String areaId = model.getAreaId(); + map.put("areaId", areaId); + map.put("areaStr", CommonsHelper.getName1(areaId,basicConfigService)); + String streetId = model.getStreetId(); + map.put("streetId", streetId); + map.put("streetStr", CommonsHelper.getName1(streetId,basicConfigService)); + map.put("lastMenstrual", model.getMcyj()); + map.put("name", model.getUsername()); + map.put("age", model.getAge()); + map.put("phone", model.getPhone()); + map.put("idCardNo", model.getCertificateNum()); + + BaseResponse baseResponse = new BaseResponse(); + baseResponse.setObject(map); + return baseResponse; + } } -- 1.8.3.1