jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b6fcc4ac3fe12b7da473193ced1e030749b368b6

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

婚检

Showing 1 changed file with 50 additions and 25 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ b6fcc4a
... ... @@ -170,10 +170,21 @@
170 170 archiveMap.put("workUnit", archiveModel.getWorkUnit());
171 171 archiveMap.put("buildDay", DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay()));
172 172  
  173 + //户籍地址
  174 + String hjSheng = CommonsHelper.getName1(archiveModel.getProvinceId(), basicConfigService);
  175 + String hjShi = CommonsHelper.getName1(archiveModel.getCityId(), basicConfigService);
  176 + String hjXian = CommonsHelper.getName1(archiveModel.getAreaId(), basicConfigService);
  177 + String hjXiang = CommonsHelper.getName1(archiveModel.getStreetId(), basicConfigService);
  178 + //String hQuan = hjSheng+hjShi+hjXian+hjXiang;
  179 +
173 180 //增加返回基本信息字段（gxk）
174 181 archiveMap.put("nation",FunvCommonUtil.getBaseicConfigByid(archiveModel.getLevelTypeId(), basicConfigService));
175   - archiveMap.put("address",CommonsHelper.getResidence(archiveModel.getProvinceId(),archiveModel.getCityId(),
176   - archiveModel.getAreaId(),archiveModel.getStreetId(),archiveModel.getAddress(),basicConfigService));
  182 + archiveMap.put("address",CommonsHelper.getResidence(archiveModel.getProvinceId(), archiveModel.getCityId(),
  183 + archiveModel.getAreaId(), archiveModel.getStreetId(), archiveModel.getAddress(), basicConfigService));
  184 + archiveMap.put("hjSheng",hjSheng);
  185 + archiveMap.put("hjShi",hjShi);
  186 + archiveMap.put("hjXian",hjXian);
  187 + archiveMap.put("hjXiang",hjXiang);
177 188  
178 189 }
179 190  
180 191  
181 192  
182 193  
... ... @@ -475,28 +486,32 @@
475 486 for (PremaritalCheckup checkup : data) {
476 487 Map<String, Object> map = new HashMap<>();
477 488 ResidentsArchiveModel model = residentsArchiveService.getResident(checkup.getParentId());
478   - map.put("premaritalUpTime", DateUtil.getyyyy_MM_dd(checkup.getPremaritalUpTime()));
479   - map.put("username", model.getUsername());
480   - map.put("certificateNum", FunvCommonUtil.getId(model.getCertificateNum()));
481   - map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone()));
482   - if (checkup.getJianChaJieGuo() != null && checkup.getJianChaJieGuo() == PhysiologyStatusEnum.NORMAL.getId()) {
483   - map.put("jianChaJieGuo", PhysiologyStatusEnum.NORMAL.getTitle());
484   - } else {
485   - map.put("jianChaJieGuo", checkup.getJianChaDetails());
486   - }
487   - map.put("yiXueYiJian", checkup.getYiXueYiJian() == null ? "" : MedicalAdviceEnum.getEnum(checkup.getYiXueYiJian()).getTitle());
488   - map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(),
489   - model.getAddress(), basicConfigService));
  489 + if(null != model){
  490 + map.put("premaritalUpTime", DateUtil.getyyyy_MM_dd(checkup.getPremaritalUpTime()));
  491 + map.put("username", model.getUsername());
  492 + map.put("certificateNum", FunvCommonUtil.getId(model.getCertificateNum()));
  493 + map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone()));
  494 + if (checkup.getJianChaJieGuo() != null && checkup.getJianChaJieGuo() == PhysiologyStatusEnum.NORMAL.getId()) {
  495 + map.put("jianChaJieGuo", PhysiologyStatusEnum.NORMAL.getTitle());
  496 + } else {
  497 + map.put("jianChaJieGuo", checkup.getJianChaDetails());
  498 + }
  499 + map.put("yiXueYiJian", checkup.getYiXueYiJian() == null ? "" : MedicalAdviceEnum.getEnum(checkup.getYiXueYiJian()).getTitle());
  500 + map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(),
  501 + model.getAddress(), basicConfigService));
490 502  
491   - String hunJianDoctor = "";
492   - if (checkup.getHunJianDoctor()!=null){
493   - Users users = usersService.getUsers(Integer.parseInt(checkup.getHunJianDoctor()));
494   - if (users!=null && users.getYn()==YnEnums.YES.getId()){
495   - hunJianDoctor = users.getName();
  503 + String hunJianDoctor = "";
  504 + if (checkup.getHunJianDoctor()!=null){
  505 + Users users = usersService.getUsers(Integer.parseInt(checkup.getHunJianDoctor()));
  506 + if (users!=null && users.getYn()==YnEnums.YES.getId()){
  507 + hunJianDoctor = users.getName();
  508 + }
496 509 }
  510 + map.put("hunJianDoctor", hunJianDoctor);
  511 + map.put("id", checkup.getId());
  512 + }else{
  513 + continue;
497 514 }
498   - map.put("hunJianDoctor", hunJianDoctor);
499   - map.put("id", checkup.getId());
500 515 list.add(map);
501 516 }
502 517 }
503 518  
... ... @@ -2286,8 +2301,12 @@
2286 2301 gaowan = "未扪及"+"(左 "+zuo + "/右 "+you+")";
2287 2302 }
2288 2303 }
2289   - checkupResult.setGaoWan(gaowan);
2290 2304  
  2305 + if (result.getGaoWan() != null) {
  2306 + checkupResult.setGaoWan(result.getGaoWan().toString());
  2307 + }
  2308 +
  2309 +
2291 2310 //附睾
2292 2311 String fugao = "";
2293 2312 if (result.getFuGao() != null) {
... ... @@ -2318,7 +2337,10 @@
2318 2337 jingMai = "有"+"(左 "+zuo + "/右 "+you+")";
2319 2338 }
2320 2339 }
2321   - checkupResult.setJingMai(jingMai);
  2340 + if(result.getJingMai() != null){
  2341 + checkupResult.setJingMai(result.getJingMai().toString());
  2342 + }
  2343 +
2322 2344 checkupResult.setShengZhiQiTa(result.getShengZhiQiTa());
2323 2345  
2324 2346 //女性生殖器
... ... @@ -2428,7 +2450,10 @@
2428 2450 yxyj = result.getYiJianQiTaDetails();
2429 2451 }
2430 2452 }
2431   - checkupResult.setYiXueYiJian(yxyj);
  2453 + if (result.getYiXueYiJian() != null){
  2454 + checkupResult.setYiXueYiJian(result.getYiXueYiJian().toString());
  2455 + }
  2456 +
2432 2457 checkupResult.setZhiDaoYiJian(result.getZhiDaoYiJian());
2433 2458  
2434 2459 //新增