From f97736644e472c37fefe2193518b459ba90cff79 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 9 Jan 2020 11:45:36 +0800 Subject: [PATCH] update --- .../web/controller/BabayDeathController.java | 101 --------------------- .../web/controller/BabyDeathController.java | 101 +++++++++++++++++++++ .../web/service/impl/BabyDeathServerImpl.java | 2 +- 3 files changed, 102 insertions(+), 102 deletions(-) delete mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabayDeathController.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyDeathController.java diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabayDeathController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabayDeathController.java deleted file mode 100644 index fed35b0..0000000 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabayDeathController.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.lyms.platform.operate.web.controller; - -import com.fasterxml.jackson.annotation.JsonAlias; -import com.lyms.platform.common.annotation.TokenRequired; -import com.lyms.platform.common.base.BaseController; -import com.lyms.platform.common.result.BaseListResponse; -import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.operate.web.request.*; -import com.lyms.platform.operate.web.service.IBabyDeathServer; -import com.lyms.platform.operate.web.service.IPregnantDeathServer; -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.ResponseBody; - -import javax.servlet.http.HttpServletRequest; - -/** - * @author dongqin - * @description 儿童死亡报告卡 - * @date 16:05 2019/11/29 - **/ -@Controller -@RequestMapping("/babyDeath") -public class BabayDeathController extends BaseController { - - @Autowired - private IBabyDeathServer babyDeathServer; - - /** - * - * 根据身份证号获取对应的建档信息 - * - * @param param - * @return - */ - @RequestMapping(method = RequestMethod.GET, value = "/getPatientInfoByIdCard") - @ResponseBody - @TokenRequired - public BaseResponse getPatientInfoByIdCard(@JsonAlias CommonParamRequest param,HttpServletRequest request) { - return babyDeathServer.getPatientInfoByIdCard(param,getUserId(request)); - } - - - /** - * 保存单个 - * - * @param param - * @return - */ - @RequestMapping(method = RequestMethod.POST, value = "/add") - @ResponseBody - @TokenRequired - public BaseResponse add(@RequestBody BabyDeathRequest param, HttpServletRequest request) { - param.setUserId(getUserId(request).toString()); - return babyDeathServer.add(param,getUserId(request)); - } - - /** - * 编辑单个 - * - * @param param - * @return - */ - @RequestMapping(method = RequestMethod.POST, value = "/edit") - @ResponseBody - @TokenRequired - public BaseResponse edit( @RequestBody BabyDeathRequest param) { - return babyDeathServer.edit(param); - } - - /** - * 列表 - * - * @param param - * @return - */ - @RequestMapping(method = RequestMethod.GET, value = "/listPage") - @ResponseBody - @TokenRequired - public BaseListResponse listPage(@JsonAlias BabyDeathListRequest param,HttpServletRequest request) { - return babyDeathServer.listPage(param,getUserId(request)); - } - - /** - * 单个查询 - * - * @param param - * @return - */ - @RequestMapping(method = RequestMethod.GET, value = "/detail") - @ResponseBody - @TokenRequired - public BaseResponse detail( @JsonAlias BabyDeathRequest param) { - return babyDeathServer.detail(param); - } - - -} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyDeathController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyDeathController.java new file mode 100644 index 0000000..92493e0 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyDeathController.java @@ -0,0 +1,101 @@ +package com.lyms.platform.operate.web.controller; + +import com.fasterxml.jackson.annotation.JsonAlias; +import com.lyms.platform.common.annotation.TokenRequired; +import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.request.*; +import com.lyms.platform.operate.web.service.IBabyDeathServer; +import com.lyms.platform.operate.web.service.IPregnantDeathServer; +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.ResponseBody; + +import javax.servlet.http.HttpServletRequest; + +/** + * @author dongqin + * @description 儿童死亡报告卡 + * @date 16:05 2019/11/29 + **/ +@Controller +@RequestMapping("/babyDeath") +public class BabyDeathController extends BaseController { + + @Autowired + private IBabyDeathServer babyDeathServer; + + /** + * + * 根据身份证号获取对应的建档信息 + * + * @param param + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getPatientInfoByIdCard") + @ResponseBody + @TokenRequired + public BaseResponse getPatientInfoByIdCard(@JsonAlias CommonParamRequest param,HttpServletRequest request) { + return babyDeathServer.getPatientInfoByIdCard(param,getUserId(request)); + } + + + /** + * 保存单个 + * + * @param param + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/add") + @ResponseBody + @TokenRequired + public BaseResponse add(@RequestBody BabyDeathRequest param, HttpServletRequest request) { + param.setUserId(getUserId(request).toString()); + return babyDeathServer.add(param,getUserId(request)); + } + + /** + * 编辑单个 + * + * @param param + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/edit") + @ResponseBody + @TokenRequired + public BaseResponse edit( @RequestBody BabyDeathRequest param) { + return babyDeathServer.edit(param); + } + + /** + * 列表 + * + * @param param + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/listPage") + @ResponseBody + @TokenRequired + public BaseListResponse listPage(@JsonAlias BabyDeathListRequest param,HttpServletRequest request) { + return babyDeathServer.listPage(param,getUserId(request)); + } + + /** + * 单个查询 + * + * @param param + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/detail") + @ResponseBody + @TokenRequired + public BaseResponse detail( @JsonAlias BabyDeathRequest param) { + return babyDeathServer.detail(param); + } + + +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyDeathServerImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyDeathServerImpl.java index 197fbfe..c29ce60 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyDeathServerImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyDeathServerImpl.java @@ -240,7 +240,7 @@ public class BabyDeathServerImpl implements IBabyDeathServer { Query query = new Query(); String code = param.getCode(); if (StringUtils.isNotEmpty(code)) { - query.addCriteria(Criteria.where("code").is(code)); + query.addCriteria(Criteria.where("number").is(code)); } String cardNo = param.getCardNo(); -- 1.8.3.1