From 56c61c1101af545fd3bde776aee27962300c8a54 Mon Sep 17 00:00:00 2001 From: dongqin <123456> Date: Mon, 2 Dec 2019 09:12:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/pojo/CervicalCancerModel.java | 14 ++++- .../web/controller/PreEugenicsBaseController.java | 9 --- .../web/result/CervicalCancerModelResult.java | 7 +++ .../operate/web/service/CervicalCancerService.java | 43 +------------- .../operate/web/service/IFormReportService.java | 49 ++++++++++++++++ .../operate/web/service/IPreEugenicsService.java | 51 +--------------- .../service/impl/CervicalCancerServiceImpl.java | 68 +++++++++++++--------- .../web/service/impl/PreEugebicsServiceImpl.java | 5 -- 8 files changed, 111 insertions(+), 135 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CervicalCancerModelResult.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IFormReportService.java 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 14099c3..b3340c7 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 @@ -1,6 +1,7 @@ package com.lyms.platform.pojo; import java.util.Date; +import java.util.Map; import org.springframework.data.mongodb.core.mapping.Document; @@ -46,6 +47,7 @@ public class CervicalCancerModel extends BaseModel { private String areaStr; private String streetId; private String streetStr; + private String address; /** * 末次月经 @@ -65,7 +67,7 @@ public class CervicalCancerModel extends BaseModel { /** * 表单数据，前端同事自定义 */ - private Object formData; + private Map formData; /** * 创建人id @@ -74,6 +76,14 @@ public class CervicalCancerModel extends BaseModel { private Date created; + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + public String getCreateUser() { return createUser; } @@ -230,7 +240,7 @@ public class CervicalCancerModel extends BaseModel { return formData; } - public void setFormData(Object formData) { + public void setFormData(Map formData) { this.formData = formData; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java index 6f78635..4be4b85 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java @@ -101,13 +101,4 @@ public class PreEugenicsBaseController extends BaseController { return iPreEugenicsService.detail(param); } - - @RequestMapping(value = "getPreEugenicsBase") - @ResponseBody - public BaseResponse getPreEugenicsBaseInfo(@RequestParam(value = "cardNo") String cardNo, - @RequestParam(value = "vcCardNo") String vcCardNo, HttpServletRequest request) { - - return iPreEugenicsService.getPreEugenicsBaseInfo(cardNo, vcCardNo, getUserId(request)); - } - } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CervicalCancerModelResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CervicalCancerModelResult.java new file mode 100644 index 0000000..1b48417 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CervicalCancerModelResult.java @@ -0,0 +1,7 @@ +package com.lyms.platform.operate.web.result; + +import com.lyms.platform.pojo.CervicalCancerModel; + +public class CervicalCancerModelResult extends CervicalCancerModel { + +} 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 665c4ec..4264355 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 @@ -1,49 +1,8 @@ package com.lyms.platform.operate.web.service; -import com.lyms.platform.common.result.BaseListResponse; -import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.request.CervicalCancerListRequest; import com.lyms.platform.operate.web.request.CervicalCancerRequest; -public interface CervicalCancerService { +public interface CervicalCancerService extends IFormReportService { - /** - * 保存单个 - * - * @param param - * @return - */ - BaseResponse add(CervicalCancerRequest param); - - /** - * 编辑单个 - * - * @param param - * @return - */ - BaseResponse edit(CervicalCancerRequest param); - - /** - * 列表 - * - * @param param - * @return - */ - BaseListResponse listPage(CervicalCancerListRequest param); - - /** - * 单个查询 - * - * @param param - * @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/IFormReportService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IFormReportService.java new file mode 100644 index 0000000..f33caa0 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IFormReportService.java @@ -0,0 +1,49 @@ +package com.lyms.platform.operate.web.service; + +import com.lyms.platform.common.dao.BaseQuery; +import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseModel; +import com.lyms.platform.common.result.BaseResponse; + +public interface IFormReportService { + + /** + * 保存单个 + * + * @param param + * @return + */ + BaseResponse add(Q param); + + /** + * 编辑单个 + * + * @param param + * @return + */ + BaseResponse edit(Q param); + + /** + * 列表 + * + * @param param + * @return + */ + BaseListResponse listPage(S param); + + /** + * 单个查询 + * + * @param param + * @return + */ + BaseResponse detail(Q param); + + /** + * 根据身份证号获取对应的信息 + * + * @param idCard + * @return + */ + BaseResponse getPatientInfoByIdCard(String idCard); +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java index e9dc6e4..01e602c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java @@ -1,57 +1,8 @@ package com.lyms.platform.operate.web.service; -import com.lyms.platform.common.result.BaseListResponse; -import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.request.PreEugenicsBaseListRequest; import com.lyms.platform.operate.web.request.PreEugenicsBaseRequest; -public interface IPreEugenicsService extends IBaseService { - /** - * 通过身份证就诊卡查询 孕前优生基本信息 - * - * @param cardNo - * @param vcCardNo - * @return - */ - BaseResponse getPreEugenicsBaseInfo(String cardNo, String vcCardNo, Integer userId); +public interface IPreEugenicsService extends IFormReportService { - /** - * 根据身份证号获取对应的孕前优生信息 - * - * @param idCard - * @return - */ - BaseResponse getPatientInfoByIdCard(String idCard); - - /** - * 保存单个 - * - * @param param - * @return - */ - BaseResponse add(PreEugenicsBaseRequest param); - - /** - * 编辑单个 - * - * @param param - * @return - */ - BaseResponse edit(PreEugenicsBaseRequest param); - - /** - * 列表 - * - * @param param - * @return - */ - BaseListResponse listPage(PreEugenicsBaseListRequest param); - - /** - * 单个查询 - * - * @param param - * @return - */ - BaseResponse detail(PreEugenicsBaseRequest param); } 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 64be37f..f24c57e 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 @@ -4,6 +4,7 @@ import java.util.Date; import java.util.List; import java.util.Map; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; @@ -22,6 +23,7 @@ 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.result.CervicalCancerModelResult; import com.lyms.platform.operate.web.service.CervicalCancerService; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.CommonsHelper; @@ -122,12 +124,16 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { @Override public BaseResponse detail(CervicalCancerRequest param) { String id = param.getId(); - if (StringUtils.isNum(id)) { + if (StringUtils.isEmpty(id)) { return new BaseResponse(); } + CervicalCancerModelResult result = new CervicalCancerModelResult(); CervicalCancerModel model = mongoTemplate.findOne(Query.query(Criteria.where("id").is(id)), CervicalCancerModel.class); + if (model != null) { + BeanUtils.copyProperties(model, result); + } BaseResponse baseResponse = new BaseResponse(); - baseResponse.setObject(model); + baseResponse.setObject(result); return baseResponse; } @@ -139,32 +145,40 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { */ @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); + CervicalCancerModel modelByIdCardNo = mongoTemplate.findOne(Query.query(Criteria.where("idCardNo").is(idCard)), CervicalCancerModel.class); + CervicalCancerModelResult result = new CervicalCancerModelResult(); + if (modelByIdCardNo == null) { + 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); + String provinceId = model.getProvinceId(); + // 省市区 + result.setProvinceId(provinceId); + result.setProvinceStr(CommonsHelper.getName1(provinceId, basicConfigService)); + String cityId = model.getCityId(); + result.setCityId(cityId); + result.setCityStr(CommonsHelper.getName1(cityId, basicConfigService)); + String areaId = model.getAreaId(); + result.setAreaId(areaId); + result.setAreaStr(CommonsHelper.getName1(areaId, basicConfigService)); + String streetId = model.getStreetId(); + result.setStreetId(streetId); + result.setStreetStr(CommonsHelper.getName1(streetId, basicConfigService)); + + result.setLastMenstrual(model.getMcyj()); + result.setName(model.getUsername()); + result.setAge(model.getAge()); + result.setPhone(model.getPhone()); + result.setIdCardNo(model.getCertificateNum()); + BaseResponse baseResponse = new BaseResponse(); + baseResponse.setObject(result); + return baseResponse; } - 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; + CervicalCancerRequest param = new CervicalCancerRequest(); + param.setId(modelByIdCardNo.getId()); + return detail(param); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java index 7e71c36..2f7fbc6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java @@ -44,11 +44,6 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen @Autowired private BasicConfigService basicConfigService; - - @Override - public BaseResponse getPreEugenicsBaseInfo(String cardNo, String vcCardNo, Integer userId) { - return null; - } /** * 根据身份证号获取对应的孕前优生信息 -- 1.8.3.1