From a475b79c742b741e7f8bd7f3b843dd01c3caf541 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 22 Nov 2019 17:04:28 +0800 Subject: [PATCH] update --- .../com/lyms/platform/operate/web/facade/AmniocentesisFacade.java | 6 +++--- .../main/java/com/lyms/platform/operate/web/facade/ViewFacade.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 b31b3d0..f77ffe6 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 @@ -258,12 +258,12 @@ public class AmniocentesisFacade { public BaseResponse saveOrUpdateAmnioRecord(AmnioRecordRequest amnioRecordRequest, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); + AmniocentesisRecordModel model = amnioRecordRequest.convertToDataModel(); AmniocentesisInfoQuery amniocentesisInfoQuery = new AmniocentesisInfoQuery(); - + amniocentesisInfoQuery.setId(model.getAmnioId()); AmniocentesisInfoModel amniocentesisInfo = amniocentesisInfoService.queryOneAmniocentesis(amniocentesisInfoQuery); - AmniocentesisRecordModel model = amnioRecordRequest.convertToDataModel(); model.setModified(new Date()); if (StringUtils.isNotEmpty(model.getId())) { @@ -278,7 +278,7 @@ public class AmniocentesisFacade { amniocentesisRecordService.add(model); } - amniocentesisInfoQuery.setId(model.getAmnioId()); + amniocentesisInfo.setOperation(model.getOperation() == null ? "" : model.getOperation()); amniocentesisInfo.setRecordId(model.getId()); 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 fa3ee1d..d3d3ff3 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 @@ -245,7 +245,7 @@ public class ViewFacade { data.setHprofessionType(getBasicConfig(amniocentesisInfo.getHprofTypeId())); - data.setHage(String.valueOf(DateUtil.getAge(amniocentesisInfo.getHbirthday()))); + data.setHage(amniocentesisInfo.getHbirthday() == null ? "" : String.valueOf(DateUtil.getAge(amniocentesisInfo.getHbirthday()))); data.setAddress(CommonsHelper.getResidence(amniocentesisInfo.getProvinceId(), amniocentesisInfo.getCityId(), amniocentesisInfo.getAreaId(), amniocentesisInfo.getStreetId(), amniocentesisInfo.getAddress(), -- 1.8.3.1