Commit 146d09d30b9ab28e87949f6a07b93e04ac0740ca

Authored by shiyang
1 parent 2a91cf526e

update

Showing 2 changed files with 40 additions and 57 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java View file @ 146d09d
... ... @@ -1094,7 +1094,7 @@
1094 1094 }
1095 1095  
1096 1096 /**
1097   - * 小程序app 儿童预建档
  1097 + * 小程序app 儿童预建档(2022.9.6改为直接建档)
1098 1098 * @param request
1099 1099 * @param httpServletRequest
1100 1100 * @return
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 146d09d
... ... @@ -6501,63 +6501,46 @@
6501 6501 }
6502 6502  
6503 6503 public BaseResponse babyBuildArticle(BabyAppBuildAddRequest request) {
6504   - //查询是否存在
6505   - BabyModelQuery babyModelQuery=new BabyModelQuery();
6506   - babyModelQuery.setHospitalId(request.getHospitalId());
6507   - Map<String,Object> map=new HashMap<>();
6508   - map.put("mcertNo", request.getMommyCardNo());
6509   - map.put("mphone", request.getPhone());
6510   - babyModelQuery.setCardArticle(map);
6511   - List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
6512   -
6513   - if (CollectionUtils.isEmpty(babyModels)) {
6514   - BabyModel model=new BabyModel();
6515   - model.setYn(YnEnums.NO.getId());
6516   - model.setDataStatus(2);
6517   - model.setBuildType(1);
6518   - model.setHospitalId(request.getHospitalId());
6519   - model.setsINCard(request.getsINCard());
6520   - model.setVcCardNo(request.getVcCardNo());
6521   - //母亲
6522   - model.setMname(request.getMommyName());
6523   - model.setMcertNo(request.getMommyCardNo());
6524   - model.setMphone(request.getPhone());
6525   - model.setLiveType(request.getLiveType());
6526   - //父亲
6527   - model.setFname(request.getFname());
6528   - model.setFphone(request.getFphone());
6529   - //儿童
6530   - model.setName(request.getBabyName());
6531   - model.setCardNo(request.getBabyCard());
6532   - model.setBirth(DateUtil.parseYMD(request.getBirth()));
6533   - model.setSex(Integer.valueOf(request.getSex()));
6534   - model.setBabyHeight(request.getHeight());
6535   - model.setBabyWeight(request.getWeight());
6536   - model.setBabyAccountNature(request.getBabyAccountNature());
6537   - //儿童居住地
6538   - model.setProvinceId(request.getProvinceId());
6539   - model.setCityId(request.getCityId());
6540   - model.setAreaId(request.getAreaId());
6541   - model.setStreetId(request.getStreetId());
6542   - model.setAddress(request.getAddress());
6543   - //儿童户籍
6544   - model.setBabyProvinceId(request.getBabyProvinceId());
6545   - model.setBabyCityId(request.getBabyCityId());
6546   - model.setBabyAreaId(request.getBabyAreaId());
6547   - model.setBabyStreetId(request.getBabyStreetId());
6548   - model.setBabyAddress(request.getBabyAddress());
6549   - model.setBuildDate(new Date());
6550   - model.setCreated(new Date());
6551   - //查询儿科医生id,随便默认一个儿科医生,查询科室名字中带有“儿”的医生
6552   - String doctorId = usersService.getUsersByDept(model.getHospitalId());
6553   - model.setBuildDoctor(doctorId);
6554   - model = babyBookbuildingService.addBabyBookbuilding(model);
6555   - }else {
6556   - return new BaseObjectResponse().setErrormsg("身份证号已经存在档案").setErrorcode(ErrorCodeConstants.DATA_EXIST);
  6504 + BaseObjectResponse baseObjectResponse=new BaseObjectResponse();
  6505 + BabyBookbuildingAddRequest babyBookbuildingAddRequest=new BabyBookbuildingAddRequest();
  6506 + babyBookbuildingAddRequest.setsINCard(request.getsINCard());
  6507 + babyBookbuildingAddRequest.setVcCardNo(request.getVcCardNo());
  6508 + //母亲
  6509 + babyBookbuildingAddRequest.setMommyName(request.getMommyName());
  6510 + babyBookbuildingAddRequest.setMommyCertificateNum(request.getMommyCardNo());
  6511 + babyBookbuildingAddRequest.setMommyPhone(request.getPhone());
  6512 + babyBookbuildingAddRequest.setLiveType(request.getLiveType());
  6513 + //父亲
  6514 + babyBookbuildingAddRequest.setFatherName(request.getFname());
  6515 + babyBookbuildingAddRequest.setFatherPhone(request.getFphone());
  6516 + //儿童
  6517 + babyBookbuildingAddRequest.setBabyName(request.getBabyName());
  6518 + babyBookbuildingAddRequest.setBabyCardNo(request.getBabyCard());
  6519 + babyBookbuildingAddRequest.setBabyBirthday(request.getBirth());
  6520 + babyBookbuildingAddRequest.setSex(Integer.valueOf(request.getSex()));
  6521 + babyBookbuildingAddRequest.setBabyHeight(request.getHeight());
  6522 + babyBookbuildingAddRequest.setBabyWeight(request.getWeight());
  6523 + //儿童居住地
  6524 + babyBookbuildingAddRequest.setHomeProvinceId(request.getProvinceId());
  6525 + babyBookbuildingAddRequest.setHomeCityId(request.getCityId());
  6526 + babyBookbuildingAddRequest.setHomeAreaId(request.getAreaId());
  6527 + babyBookbuildingAddRequest.setHomeStreetId(request.getStreetId());
  6528 + babyBookbuildingAddRequest.setHomeAddress(request.getAddress());
  6529 + //儿童户籍
  6530 + babyBookbuildingAddRequest.setBabyProvinceId(request.getBabyProvinceId());
  6531 + babyBookbuildingAddRequest.setBabyCityId(request.getBabyCityId());
  6532 + babyBookbuildingAddRequest.setBabyAreaId(request.getBabyAreaId());
  6533 + babyBookbuildingAddRequest.setBabyStreetId(request.getBabyStreetId());
  6534 + babyBookbuildingAddRequest.setBabyAddress(request.getBabyAddress());
  6535 + //查询儿科医生id,随便默认一个儿科医生,查询科室名字中带有“儿”的医生
  6536 + String doctorId = usersService.getUsersByDept(request.getHospitalId());
  6537 + if(NumberUtils.isNumber(doctorId)){
  6538 + Integer doctorId2=Integer.valueOf(doctorId);
  6539 + babyBookbuildingAddRequest.setBuildDoctor(doctorId);
  6540 + return baseObjectResponse = addBabyBookbuilding(babyBookbuildingAddRequest,doctorId2);
  6541 + }else{
  6542 + return new BaseObjectResponse().setErrormsg("没有儿科医生。").setErrorcode(ErrorCodeConstants.USER_NOT_EXISTS);
6557 6543 }
6558   -
6559   -
6560   - return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
6561 6544 }
6562 6545  
6563 6546 public BaseResponse babyBuildVcardNew(String vcCardNoArticle,Integer userId) {