diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 1602265..3bb83a1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -12,7 +12,9 @@ import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.operate.web.result.MatDeliverListResult; import com.lyms.platform.operate.web.result.MaternalDeliverResult; import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; @@ -47,6 +49,8 @@ public class MatDeliverFacade { private AutoMatchFacade autoMatchFacade; @Autowired private PersonService personService; + @Autowired + private UsersService usersService; private static Map ONE_ENUMS = new HashMap<>(); @@ -506,6 +510,14 @@ public class MatDeliverFacade { MaternalDeliverResult maternalDeliverResult = new MaternalDeliverResult(); maternalDeliverResult.convertToResult(deliverModel); + String doctorId = deliverModel.getDeliverDoctor(); + Users users= usersService.getUsers(Integer.valueOf(doctorId)); + Map map =new HashMap<>(); + if(null!=users){ + map.put("id",users.getId()+""); + map.put("name",users.getName()); + } + maternalDeliverResult.setDeliverDoctor(map); //获取新生儿信息 List babyIdList = deliverModel.getBaby(); List babyList = new ArrayList(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java index 8669849..41d1b6f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java @@ -75,7 +75,7 @@ public class MaternalDeliverResult { //分娩医院 private String fmHospital; //接生医生 - private String deliverDoctor; + private Map deliverDoctor; public MaternalDeliverResult convertToResult(MaternalDeliverModel destModel) { setId(destModel.getId()); @@ -96,20 +96,20 @@ public class MaternalDeliverResult { setNeedleNum(destModel.getNeedleNum()); setMaternalInfo(destModel.getMaternalInfo()); setDeathCause(destModel.getDeathCause()); - setChBp(JsonUtil.str2Obj(destModel.getChBp(),Map.class)); - setCh2Bp(JsonUtil.str2Obj(destModel.getCh2Bp(),Map.class)); + setChBp(JsonUtil.str2Obj(destModel.getChBp(), Map.class)); + setCh2Bp(JsonUtil.str2Obj(destModel.getCh2Bp(), Map.class)); setBreath(destModel.getBreath()); setPulse(destModel.getPulse()); setoHloseBloodL(destModel.getoHloseBloodL()); settHloseBloodL(destModel.gettHloseBloodL()); setrHloseBloodL(destModel.getrHloseBloodL()); setsHloseBloodL(destModel.getsHloseBloodL()); - setLoseBloodCause(JsonUtil.jkstr2Obj(destModel.getLoseBloodCause(),Map.class)); - setOcs(JsonUtil.str2Obj(destModel.getOcs(),Map.class)); + setLoseBloodCause(JsonUtil.jkstr2Obj(destModel.getLoseBloodCause(), Map.class)); + setOcs(JsonUtil.str2Obj(destModel.getOcs(), Map.class)); setExtPlacentas(destModel.getExtPlacentas()); setFmHospital(destModel.getFmHospital()); - setDeliverDoctor(destModel.getDeliverDoctor()); + return this; } @@ -324,16 +324,14 @@ public class MaternalDeliverResult { this.deathCause = deathCause; } - public String getDeliverDoctor() { + public Map getDeliverDoctor() { return deliverDoctor; } - public void setDeliverDoctor(String deliverDoctor) { + public void setDeliverDoctor(Map deliverDoctor) { this.deliverDoctor = deliverDoctor; } - - public String getDueDate() { return dueDate; }