shiyang / regional-platform

Download as
Browse Code »

Commit c0c9d040d52161c9d30f32f06a59921066821e67

Authored by hujiaqi
2 parents 46978bf166 f8a7b236a4
Exists in master

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java View file @ c0c9d04
... ... @@ -90,10 +90,14 @@
90 90 @RequestMapping(value = "/queryPregnantBuildRecord", method = RequestMethod.GET)
91 91 @ResponseBody
92 92 @TokenRequired
93   - public BaseListResponse queryPregnantBuildRecord(@RequestParam(required = false) String id,@RequestParam(required = false) String vcCardNo,@RequestParam(required = false) String cardNo,HttpServletRequest httpServletRequest){
  93 + public BaseListResponse queryPregnantBuildRecord(@RequestParam(required = false) String id,
  94 + @RequestParam(required = false) String pid,
  95 + @RequestParam(required = false) String vcCardNo,
  96 + @RequestParam(required = false) String cardNo,HttpServletRequest httpServletRequest){
94 97 BookbuildingQueryRequest bookbuildingQueryRequest = new BookbuildingQueryRequest();
95 98 bookbuildingQueryRequest.setVcCardNo(vcCardNo);
96 99 bookbuildingQueryRequest.setCardNo(cardNo);
  100 + bookbuildingQueryRequest.setPid(pid);
97 101 // id，HuJiaqi添加，为了建档管理里面的查看单条使用
98 102 bookbuildingQueryRequest.setId(id);
99 103 LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ c0c9d04
... ... @@ -507,7 +507,7 @@
507 507 model.setModified(new Date());
508 508 model.setBuildType(1);
509 509 model.setHospitalId(request.getHospitalId());
510   - String hospitalName = organizationService.getOrganization(Integer.valueOf(request.getHospitalId())).getName();
  510 + // String hospitalName = organizationService.getOrganization(Integer.valueOf(request.getHospitalId())).getName();
511 511 model = babyBookbuildingService.addBabyBookbuilding(model);
512 512  
513 513 if (model == null || model.getId() == null) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java View file @ c0c9d04
... ... @@ -10,6 +10,7 @@
10 10 import com.lyms.platform.common.result.BaseObjectResponse;
11 11 import com.lyms.platform.common.result.BaseResponse;
12 12 import com.lyms.platform.common.utils.DateUtil;
  13 +import com.lyms.platform.common.utils.DefenceUtils;
13 14 import com.lyms.platform.common.utils.ExcelUtil;
14 15 import com.lyms.platform.common.utils.SystemConfig;
15 16 import com.lyms.platform.operate.web.request.FolicAcidAddRequest;
... ... @@ -332,7 +333,7 @@
332 333 map.put("id",data.getId());
333 334 ResidentsArchiveModel model = residentsArchiveService.getResident(data.getParentId());
334 335 map.put("username",model.getUsername());
335   - map.put("certificateNum",model.getCertificateNum());
  336 + map.put("certificateNum", DefenceUtils.getId(model.getCertificateNum()));
336 337 map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone()));
337 338 map.put("drawTime", DateUtil.getyyyy_MM_dd(data.getDrawTime()));
338 339 map.put("drawCount", data.getDrawCount());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ c0c9d04
... ... @@ -481,12 +481,21 @@
481 481 }
482 482  
483 483 /* 配偶信息 */
484   - if (addRequest.getDeliverStatus()!=null && addRequest.getDeliverStatus()==1){
485   - checkup.setSpouseName(addRequest.getSpouseName());
486   - checkup.setSpouseCertificateTypeId(addRequest.getSpouseCertificateTypeId());
487   - checkup.setSpouseCertificateNum(addRequest.getSpouseCertificateNum());
488   - checkup.setIsBloodshed(addRequest.getIsBloodshed());
489   - checkup.setBloodshed(addRequest.getBloodshed());
  484 + if (addRequest.getDeliverStatus()!=null){
  485 + if (addRequest.getDeliverStatus()==1){
  486 + checkup.setSpouseName(addRequest.getSpouseName());
  487 + checkup.setSpouseCertificateTypeId(addRequest.getSpouseCertificateTypeId());
  488 + checkup.setSpouseCertificateNum(addRequest.getSpouseCertificateNum());
  489 + checkup.setIsBloodshed(addRequest.getIsBloodshed());
  490 + checkup.setBloodshed(addRequest.getBloodshed());
  491 + }else if (addRequest.getDeliverStatus()==2){
  492 + checkup.setSpouseName("");
  493 + checkup.setSpouseCertificateTypeId("");
  494 + checkup.setSpouseCertificateNum("");
  495 + checkup.setIsBloodshed(0);
  496 + checkup.setBloodshed("");
  497 + }
  498 + checkup.setDeliverStatus(addRequest.getDeliverStatus());
490 499 }
491 500  
492 501 /* 婚育史 */