jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 33b39803c4e8a2d8c246f5087995ebccca362531

Authored by liquanyu
1 parent 0dc5e2bb40
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 8 changed files with 68 additions and 8 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java View file @ 33b3980
... ... @@ -174,6 +174,15 @@
174 174 private String znstzk;//子女身体状况（0：健康；1：疾病）
175 175 private String jtbm;//注明具体病名
176 176  
  177 + private String photo;
  178 +
  179 + public String getPhoto() {
  180 + return photo;
  181 + }
  182 +
  183 + public void setPhoto(String photo) {
  184 + this.photo = photo;
  185 + }
177 186  
178 187 public String getStop() {
179 188 return stop;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java View file @ 33b3980
... ... @@ -4,11 +4,7 @@
4 4  
5 5 import org.springframework.beans.factory.annotation.Autowired;
6 6 import org.springframework.stereotype.Controller;
7   -import org.springframework.web.bind.annotation.RequestBody;
8   -import org.springframework.web.bind.annotation.RequestMapping;
9   -import org.springframework.web.bind.annotation.RequestMethod;
10   -import org.springframework.web.bind.annotation.RequestParam;
11   -import org.springframework.web.bind.annotation.ResponseBody;
  7 +import org.springframework.web.bind.annotation.*;
12 8  
13 9 import com.fasterxml.jackson.annotation.JsonAlias;
14 10 import com.lyms.platform.common.annotation.TokenRequired;
... ... @@ -58,7 +54,7 @@
58 54 public BaseResponse add( @RequestBody PreEugenicsBaseRequest param, HttpServletRequest request) {
59 55 Integer userId = getUserId(request);
60 56 param.setCreateUser(userId.toString());
61   - return iPreEugenicsService.add(param,getUserId(request));
  57 + return iPreEugenicsService.add(param, getUserId(request));
62 58 }
63 59  
64 60 /**
... ... @@ -86,7 +82,7 @@
86 82 @ResponseBody
87 83 @TokenRequired
88 84 public BaseListResponse listPage(@JsonAlias PreEugenicsBaseListRequest param,HttpServletRequest request) {
89   - return iPreEugenicsService.listPage(param,getUserId(request));
  85 + return iPreEugenicsService.listPage(param, getUserId(request));
90 86 }
91 87  
92 88 /**
... ... @@ -102,5 +98,17 @@
102 98 return iPreEugenicsService.detail(param);
103 99 }
104 100  
  101 +
  102 + /**
  103 + * 删除孕前优生
  104 + * @param id
  105 + * @return
  106 + */
  107 + @RequestMapping(method = RequestMethod.DELETE, value = "/delete/{id}")
  108 + @ResponseBody
  109 + @TokenRequired
  110 + public BaseResponse delete(@PathVariable String id) {
  111 + return iPreEugenicsService.delete(id);
  112 + }
105 113 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ 33b3980
... ... @@ -621,6 +621,8 @@
621 621 result.setZnstzk(model.getZnstzk());
622 622 result.setJtbm(model.getJtbm());
623 623  
  624 +
  625 + result.setPhoto(model.getPhoto());
624 626 return result;
625 627 }
626 628  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java View file @ 33b3980
... ... @@ -153,10 +153,15 @@
153 153 /***********荣成新增女性建档字段**********/
154 154  
155 155  
  156 + //身份证照片
  157 + private String photo;
  158 +
  159 +
156 160 @Override
157 161 public ResidentsArchiveModel convertToDataModel() {
158 162 ResidentsArchiveModel model = new ResidentsArchiveModel();
159 163 model.setId(id);
  164 + model.setPhoto(photo);
160 165 model.setUsername(username);
161 166 model.setSex(sex);
162 167 model.setBirthday((birthday != null && birthday != "") ? DateUtil.parseYMD(birthday) : null);
... ... @@ -251,6 +256,14 @@
251 256  
252 257  
253 258 return model;
  259 + }
  260 +
  261 + public String getPhoto() {
  262 + return photo;
  263 + }
  264 +
  265 + public void setPhoto(String photo) {
  266 + this.photo = photo;
254 267 }
255 268  
256 269 public String getCheckup() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java View file @ 33b3980
... ... @@ -143,6 +143,17 @@
143 143 private String znstzk;//子女身体状况（0：健康；1：疾病）
144 144 private String jtbm;//注明具体病名
145 145  
  146 + //身份证照片
  147 + private String photo;
  148 +
  149 + public String getPhoto() {
  150 + return photo;
  151 + }
  152 +
  153 + public void setPhoto(String photo) {
  154 + this.photo = photo;
  155 + }
  156 +
146 157 public String getIsOrNotrdl() {
147 158 return isOrNotrdl;
148 159 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IFormReportService.java View file @ 33b3980
... ... @@ -47,5 +47,7 @@
47 47 * @return
48 48 */
49 49 BaseResponse getPatientInfoByIdCard(CommonParamRequest param,Integer userId);
  50 +
  51 +
50 52 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java View file @ 33b3980
1 1 package com.lyms.platform.operate.web.service;
2 2  
  3 +import com.lyms.platform.common.result.BaseResponse;
3 4 import com.lyms.platform.operate.web.request.PreEugenicsBaseListRequest;
4 5 import com.lyms.platform.operate.web.request.PreEugenicsBaseRequest;
5 6  
6 7 public interface IPreEugenicsService extends IFormReportService<PreEugenicsBaseRequest, PreEugenicsBaseListRequest> {
7   -
  8 + /**
  9 + * 删除
  10 + * @param id
  11 + * @return
  12 + */
  13 + BaseResponse delete(String id);
8 14 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java View file @ 33b3980
... ... @@ -416,5 +416,14 @@
416 416 baseResponse.setObject(result);
417 417 return baseResponse;
418 418 }
  419 +
  420 + @Override
  421 + public BaseResponse delete(String id) {
  422 + if (StringUtils.isEmpty(id)) {
  423 + return new BaseResponse();
  424 + }
  425 + mongoTemplate.remove(Query.query(Criteria.where("id").is(id)), PreEugenicsBaseModel.class);
  426 + return new BaseResponse();
  427 + }
419 428 }