From 33b39803c4e8a2d8c246f5087995ebccca362531 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 20 Jan 2020 15:11:09 +0800 Subject: [PATCH] update --- .../lyms/platform/pojo/ResidentsArchiveModel.java | 9 +++++++++ .../web/controller/PreEugenicsBaseController.java | 22 +++++++++++++++------- .../operate/web/facade/ResidentsArchiveFacade.java | 2 ++ .../web/request/ResidentsArchiveAddRequest.java | 13 +++++++++++++ .../operate/web/result/ResidentsArchiveResult.java | 11 +++++++++++ .../operate/web/service/IFormReportService.java | 2 ++ .../operate/web/service/IPreEugenicsService.java | 8 +++++++- .../web/service/impl/PreEugebicsServiceImpl.java | 9 +++++++++ 8 files changed, 68 insertions(+), 8 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java index 59cd996..c3f0dad 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java @@ -174,6 +174,15 @@ public class ResidentsArchiveModel extends BaseModel { private String znstzk;//子女身体状况（0：健康；1：疾病） private String jtbm;//注明具体病名 + private String photo; + + public String getPhoto() { + return photo; + } + + public void setPhoto(String photo) { + this.photo = photo; + } public String getStop() { return stop; 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 f1b90a7..b19865c 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 @@ -4,11 +4,7 @@ import javax.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; 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 org.springframework.web.bind.annotation.*; import com.fasterxml.jackson.annotation.JsonAlias; import com.lyms.platform.common.annotation.TokenRequired; @@ -58,7 +54,7 @@ public class PreEugenicsBaseController extends BaseController { public BaseResponse add( @RequestBody PreEugenicsBaseRequest param, HttpServletRequest request) { Integer userId = getUserId(request); param.setCreateUser(userId.toString()); - return iPreEugenicsService.add(param,getUserId(request)); + return iPreEugenicsService.add(param, getUserId(request)); } /** @@ -86,7 +82,7 @@ public class PreEugenicsBaseController extends BaseController { @ResponseBody @TokenRequired public BaseListResponse listPage(@JsonAlias PreEugenicsBaseListRequest param,HttpServletRequest request) { - return iPreEugenicsService.listPage(param,getUserId(request)); + return iPreEugenicsService.listPage(param, getUserId(request)); } /** @@ -102,4 +98,16 @@ public class PreEugenicsBaseController extends BaseController { return iPreEugenicsService.detail(param); } + + /** + * 删除孕前优生 + * @param id + * @return + */ + @RequestMapping(method = RequestMethod.DELETE, value = "/delete/{id}") + @ResponseBody + @TokenRequired + public BaseResponse delete(@PathVariable String id) { + return iPreEugenicsService.delete(id); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index 6ba7621..fcafec7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -621,6 +621,8 @@ public class ResidentsArchiveFacade { result.setZnstzk(model.getZnstzk()); result.setJtbm(model.getJtbm()); + + result.setPhoto(model.getPhoto()); return result; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java index 7c3f9d6..797d6ac 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java @@ -153,10 +153,15 @@ public class ResidentsArchiveAddRequest implements IBasicRequestConvert { * @return */ BaseResponse getPatientInfoByIdCard(CommonParamRequest param,Integer userId); + + } 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 01e602c..6717628 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,8 +1,14 @@ package com.lyms.platform.operate.web.service; +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 IFormReportService { - + /** + * 删除 + * @param id + * @return + */ + BaseResponse delete(String id); } 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 21573d5..66f2472 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 @@ -416,4 +416,13 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen baseResponse.setObject(result); return baseResponse; } + + @Override + public BaseResponse delete(String id) { + if (StringUtils.isEmpty(id)) { + return new BaseResponse(); + } + mongoTemplate.remove(Query.query(Criteria.where("id").is(id)), PreEugenicsBaseModel.class); + return new BaseResponse(); + } } \ No newline at end of file -- 1.8.3.1