diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java index 1c06126..625dcf4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java @@ -447,13 +447,17 @@ public class AmniocentesisFacade { } public BaseResponse queryAmnioRecordView(String id, Integer userId) { - AmniocentesisRecordQuery amniocentesisInfoQuery = new AmniocentesisRecordQuery(); - amniocentesisInfoQuery.setId(id); - AmniocentesisRecordModel model = amniocentesisRecordService.queryOne(amniocentesisInfoQuery); + AmniocentesisRecordQuery amniocentesisRecordQuery = new AmniocentesisRecordQuery(); + amniocentesisRecordQuery.setId(id); + AmniocentesisRecordModel model = amniocentesisRecordService.queryOne(amniocentesisRecordQuery); AmnioRecordResult resultResult = null; if (model != null) { - resultResult = viewFacade.queryAmnioRecordView(model); + + AmniocentesisInfoQuery amniocentesisInfoQuery = new AmniocentesisInfoQuery(); + amniocentesisInfoQuery.setId(model.getAmnioId()); + AmniocentesisInfoModel amniocentesisInfo = amniocentesisInfoService.queryOneAmniocentesis(amniocentesisInfoQuery); + resultResult = viewFacade.queryAmnioRecordView(model,amniocentesisInfo); } return new BaseObjectResponse().setData(resultResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index f2fd897..218e69c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -216,7 +216,7 @@ public class ViewFacade { } - public AmnioRecordResult queryAmnioRecordView(AmniocentesisRecordModel destModel) { + public AmnioRecordResult queryAmnioRecordView(AmniocentesisRecordModel destModel,AmniocentesisInfoModel amniocentesisInfo) { AmnioRecordResult data = new AmnioRecordResult(); data.convertToResult(destModel); String hospital = ""; @@ -237,7 +237,21 @@ public class ViewFacade { } } data.setOperationUser(user); - return null; + data.setPhone(amniocentesisInfo.getPhone()); + data.setPname(amniocentesisInfo.getName()); + data.setPprofessionType(getBasicConfig(amniocentesisInfo.getProfTypeId())); + data.setPage(String.valueOf(DateUtil.getAge(amniocentesisInfo.getBirthday()))); + data.setHname(amniocentesisInfo.getHname()); + + + data.setHprofessionType(getBasicConfig(amniocentesisInfo.getHprofTypeId())); + data.setHage(String.valueOf(DateUtil.getAge(amniocentesisInfo.getHbirthday()))); + + data.setAddress(CommonsHelper.getResidence(amniocentesisInfo.getProvinceId(), amniocentesisInfo.getCityId(), + amniocentesisInfo.getAreaId(), amniocentesisInfo.getStreetId(), amniocentesisInfo.getAddress(), + basicConfigService)); + + return data; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmnioRecordResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmnioRecordResult.java index f780933..1a39689 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmnioRecordResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmnioRecordResult.java @@ -110,6 +110,21 @@ public class AmnioRecordResult implements IBasicResultConvert