jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit a475b79c742b741e7f8bd7f3b843dd01c3caf541

Authored by liquanyu
1 parent 27406c910f
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 2 changed files with 4 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java View file @ a475b79
... ... @@ -258,12 +258,12 @@
258 258 public BaseResponse saveOrUpdateAmnioRecord(AmnioRecordRequest amnioRecordRequest, Integer userId) {
259 259  
260 260 String hospitalId = autoMatchFacade.getHospitalId(userId);
  261 + AmniocentesisRecordModel model = amnioRecordRequest.convertToDataModel();
261 262  
262 263 AmniocentesisInfoQuery amniocentesisInfoQuery = new AmniocentesisInfoQuery();
263   -
  264 + amniocentesisInfoQuery.setId(model.getAmnioId());
264 265 AmniocentesisInfoModel amniocentesisInfo = amniocentesisInfoService.queryOneAmniocentesis(amniocentesisInfoQuery);
265 266  
266   - AmniocentesisRecordModel model = amnioRecordRequest.convertToDataModel();
267 267 model.setModified(new Date());
268 268 if (StringUtils.isNotEmpty(model.getId()))
269 269 {
... ... @@ -278,7 +278,7 @@
278 278 amniocentesisRecordService.add(model);
279 279 }
280 280  
281   - amniocentesisInfoQuery.setId(model.getAmnioId());
  281 +
282 282 amniocentesisInfo.setOperation(model.getOperation() == null ? "" : model.getOperation());
283 283 amniocentesisInfo.setRecordId(model.getId());
284 284  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ a475b79
... ... @@ -245,7 +245,7 @@
245 245  
246 246  
247 247 data.setHprofessionType(getBasicConfig(amniocentesisInfo.getHprofTypeId()));
248   - data.setHage(String.valueOf(DateUtil.getAge(amniocentesisInfo.getHbirthday())));
  248 + data.setHage(amniocentesisInfo.getHbirthday() == null ? "" : String.valueOf(DateUtil.getAge(amniocentesisInfo.getHbirthday())));
249 249  
250 250 data.setAddress(CommonsHelper.getResidence(amniocentesisInfo.getProvinceId(), amniocentesisInfo.getCityId(),
251 251 amniocentesisInfo.getAreaId(), amniocentesisInfo.getStreetId(), amniocentesisInfo.getAddress(),