shiyang / regional-platform

Download as
Browse Code »

Commit 0fb68c51944a6792256324c9fd2dd7aeeab05b2e

Authored by jiangjiazhi
1 parent d17e1c0a26
Exists in master and in 1 other branch nobuildprocess

修改产检删除1

Showing 3 changed files with 8 additions and 5 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java View file @ 0fb68c5
... ... @@ -102,9 +102,11 @@
102 102 if (StringUtils.isEmpty(parentId)) {
103 103 return;
104 104 }
105   -
106   - //先删除掉该人的
107 105 AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery();
  106 + antExRecordQuery1.setfId(parentId);
  107 + antExRecordDao.findAndMove(antExRecordQuery1.convertToQuery());
  108 + /* //先删除掉该人的
  109 + AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery();
108 110 antExRecordQuery1.setParentId(parentId);
109 111 antExRecordDao.findAndMove(antExRecordQuery1.convertToQuery());
110 112  
... ... @@ -145,7 +147,7 @@
145 147 }
146 148 }
147 149 }
148   - }
  150 + }*/
149 151 }
150 152  
151 153  
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java View file @ 0fb68c5
... ... @@ -111,6 +111,7 @@
111 111 if (CollectionUtils.isNotEmpty(list)) {
112 112 antExRecordService.batchUpdate(antExRecordModel,antExRecordQuery);
113 113 } else {
  114 + antExRecordQuery.setfId(null);
114 115 antExRecordQuery.setParentId(antExRecordModel.getParentId());
115 116 antExRecordQuery.setcId(antExRecordModel.getCheckDoctor());
116 117 Integer count = antExRecordService.count(antExRecordQuery);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 0fb68c5
... ... @@ -1432,7 +1432,7 @@
1432 1432 setLashCTimes(hospital, antenatalExaminationModel.getParentId(), 2);
1433 1433  
1434 1434 updateLastRisk(antenatalExaminationModel.getParentId());
1435   - recordService.handExRecord(antenatalExaminationModel.getParentId());
  1435 + recordService.handExRecord(antenatalExaminationModel.getId());
1436 1436 } else {
1437 1437 return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("当前产检记录不是本院最新的产检记录,不能删除");
1438 1438 }
... ... @@ -1480,7 +1480,7 @@
1480 1480 AntExChuModel antExChuModel1 = antenatalExaminationService.findOne(antExQueryRequest.getId());
1481 1481 setLashCTimes(hospital, antExChuModel1.getParentId(), 1);
1482 1482 updateLastRisk(antExChuModel1.getParentId());
1483   - recordService.handExRecord(antExChuModel1.getParentId());
  1483 + recordService.handExRecord(antExChuModel1.getId());
1484 1484 } else {
1485 1485 return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("当前产检记录不是本院最新的产检记录,不能删除");
1486 1486 }