diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 2e82e30..ce262d6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -12,7 +12,9 @@ import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; 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; @@ -51,6 +53,8 @@ public class AntenatalExaminationFacade { private AutoMatchFacade autoMatchFacade; @Autowired private StopPregnancyService stopPregnancyService; + @Autowired + private UsersService usersService; /** @@ -734,6 +738,15 @@ public class AntenatalExaminationFacade { if (null != data) { data = patients.getLastMenses(); } + + String doctorId = examinationModel.getCheckDoctor(); + Users users= usersService.getUsers(Integer.valueOf(doctorId)); + Map map1 =new HashMap<>(); + if(null!=users){ + map1.put("id",users.getId()+""); + map1.put("name",users.getName()); + } + antenatalExaminationResult.setCheckDoctor(map1); antenatalExaminationResult.setIsSieve(cap(data, examinationModel.getParentId())); antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1); object = antenatalExaminationResult; @@ -764,6 +777,14 @@ public class AntenatalExaminationFacade { } } catch (Exception e) { } + String doctorId = antExChuModel.getProdDoctor(); + Users users= usersService.getUsers(Integer.valueOf(doctorId)); + Map map1 =new HashMap<>(); + if(null!=users){ + map1.put("id",users.getId()+""); + map1.put("name",users.getName()); + } + antexChuResult.setProdDoctor(map1); ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setParentId(antExChuModel.getParentId()); antexChuResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java index 736d2f2..4b01815 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java @@ -65,7 +65,7 @@ public class AntenatalExaminationResult implements IBasicResultConvert