shiyang / regional-platform

Download as
Browse Code »

Commit b0b1cf423f431bad277cbca4fe74bbbc6f03b6eb

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

修改转诊

Showing 1 changed file with 19 additions and 11 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ b0b1cf4
... ... @@ -176,7 +176,7 @@
176 176 sieveApplyOrderQuery.setParentId(sieveModel.getParentId());
177 177 sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
178 178 List list1 = sieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery());
179   - if (CollectionUtils.isEmpty(list1)&&StringUtils.isEmpty(sieveModel.getCsRemarkTypeId())) {
  179 + if (CollectionUtils.isEmpty(list1) && StringUtils.isEmpty(sieveModel.getCsRemarkTypeId())) {
180 180 sieveModel.setYn(YnEnums.NO.getId());
181 181 sieveDao.updateChanQianSieve(sieveModel);
182 182 }
... ... @@ -264,7 +264,13 @@
264 264 sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
265 265 sieveApplyOrderQuery.setHospitalId(patients.getHospitalId());
266 266 List<SieveApplyOrderModel> list1 = sieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery());
267   - if (CollectionUtils.isEmpty(list1)) {
  267 +
  268 + SieveQuery sieveQuery1 = new SieveQuery();
  269 + sieveQuery1.setYn(YnEnums.YES.getId());
  270 + sieveQuery1.setParentId(patients.getId());
  271 + List<SieveModel> list12 = sieveDao.queryList(sieveQuery1.convertToQuery());
  272 +
  273 + if (CollectionUtils.isEmpty(list1) && CollectionUtils.isNotEmpty(list12) && StringUtils.isEmpty(list12.get(0).getCsRemarkTypeId())) {
268 274 //修改孕妇末次月经不满足条件删除产筛数据
269 275 SieveQuery sieveQuery = new SieveQuery();
270 276 sieveQuery.setYn(YnEnums.YES.getId());
271 277  
... ... @@ -275,16 +281,18 @@
275 281 sieveQuery.setYn(YnEnums.YES.getId());
276 282 sieveQuery.setParentId(patients.getId());
277 283 List<SieveModel> list = sieveDao.queryList(sieveQuery.convertToQuery());
278   - //修改孕妇基本信息
279   - for (SieveModel sieveModel : list) {
280   - sieveModel.setPhone(patients.getPhone());
281   - sieveModel.setName(patients.getUsername());
282   - sieveModel.setLastMenses(patients.getLastMenses());
283   - sieveModel.setCardNo(patients.getCardNo());
284   - if (null != sieveModel.getDueWeek()) {
285   - sieveModel.setDueWeek(days);
  284 + if (CollectionUtils.isNotEmpty(list)) {
  285 + //修改孕妇基本信息
  286 + for (SieveModel sieveModel : list) {
  287 + sieveModel.setPhone(patients.getPhone());
  288 + sieveModel.setName(patients.getUsername());
  289 + sieveModel.setLastMenses(patients.getLastMenses());
  290 + sieveModel.setCardNo(patients.getCardNo());
  291 + if (null != sieveModel.getDueWeek()) {
  292 + sieveModel.setDueWeek(days);
  293 + }
  294 + sieveDao.updateChanQianSieve(sieveModel);
286 295 }
287   - sieveDao.updateChanQianSieve(sieveModel);
288 296 }
289 297 }
290 298 }