jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f7debdb9425f8c621de351b3d1f70e496a34b5c8

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

增加字段

Showing 1 changed file with 23 additions and 18 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ f7debdb
... ... @@ -28,6 +28,7 @@
28 28 import com.lyms.platform.query.ResidentsArchiveQuery;
29 29 import org.apache.commons.collections.CollectionUtils;
30 30 import org.apache.commons.lang.StringUtils;
  31 +import org.apache.commons.lang.math.*;
31 32 import org.springframework.beans.factory.annotation.Autowired;
32 33 import org.springframework.stereotype.Component;
33 34  
34 35  
35 36  
36 37  
37 38  
... ... @@ -486,29 +487,33 @@
486 487 result.setStreetRegisterId(model.getStreetRegisterId());
487 488 result.setAddressRegister(model.getAddressRegister());
488 489  
489   - result.setPastHistory(model.getPastHistory()==null ? null :JsonUtil.jkstr2Obj(model.getPastHistory(), Map.class));
  490 + result.setPastHistory(model.getPastHistory() == null ? null : JsonUtil.jkstr2Obj(model.getPastHistory(), Map.class));
490 491 result.setFamilyHistory(model.getFamilyHistory() == null ? null : JsonUtil.jkstr2Obj(model.getFamilyHistory(), Map.class));
491   - result.setPersonalHistory(model.getPersonalHistory() == null ? null :JsonUtil.jkstr2Obj(model.getPersonalHistory(), Map.class));
492   - result.setYwgmHistory(model.getYwgmHistory() == null ? null :JsonUtil.jkstr2Obj(model.getYwgmHistory(), Map.class));
493   - result.setPresentHistory(model.getPresentHistory() == null ? null : JsonUtil.jkstr2Obj(model.getPresentHistory(),Map.class));
  492 + result.setPersonalHistory(model.getPersonalHistory() == null ? null : JsonUtil.jkstr2Obj(model.getPersonalHistory(), Map.class));
  493 + result.setYwgmHistory(model.getYwgmHistory() == null ? null : JsonUtil.jkstr2Obj(model.getYwgmHistory(), Map.class));
  494 + result.setPresentHistory(model.getPresentHistory() == null ? null : JsonUtil.jkstr2Obj(model.getPresentHistory(), Map.class));
494 495  
495 496 result.setVcCardNo(model.getVcCardNo());
496   - if (StringUtils.isNotEmpty( model.getBuildDoctor())){
497   - Users u = usersService.getUsers(Integer.valueOf(model.getBuildDoctor()));
498   - if(u!=null){
499   - Map<String,String> doctInfo = new HashMap<>();
500   - doctInfo.put("id",String.valueOf(u.getId()));
501   - doctInfo.put("name",u.getName());
  497 +
  498 + Map<String,String> doctInfo = new HashMap<>();
  499 + doctInfo.put("id", String.valueOf(model.getBuildDoctor()));
  500 + doctInfo.put("name", String.valueOf(model.getBuildDoctor()));
  501 + result.setBuildDoctor(doctInfo);
  502 +
  503 + if (StringUtils.isNotEmpty(model.getBuildDoctor())){
  504 + if(org.apache.commons.lang.math.NumberUtils.isNumber(model.getBuildDoctor())){
  505 + Users u = usersService.getUsers(Integer.valueOf(model.getBuildDoctor()));
  506 + if(u!=null){
  507 + doctInfo.put("id",String.valueOf(u.getId()));
  508 + doctInfo.put("name",u.getName());
  509 + result.setBuildDoctor(doctInfo);
  510 + }
  511 + }
  512 + else{
  513 + doctInfo.put("id","-1");
  514 + doctInfo.put("name",model.getBuildDoctor());
502 515 result.setBuildDoctor(doctInfo);
503   - }else{
504   - Map<String,String> doctInfo = new HashMap<>();
505   - doctInfo.put("id",String.valueOf(u.getId()));
506   - result.setBuildDoctor(doctInfo);
507 516 }
508   - }else{
509   - Map<String,String> doctInfo = new HashMap<>();
510   - doctInfo.put("id",String.valueOf(model.getBuildDoctor()));
511   - result.setBuildDoctor(doctInfo);
512 517 }
513 518  
514 519