jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 93a20c8f73daa32bb9b9c732f2d9ce031cc3d025

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

update

Showing 3 changed files with 43 additions and 28 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 93a20c8
... ... @@ -3665,20 +3665,21 @@
3665 3665 public void run() {
3666 3666 if (CollectionUtils.isNotEmpty(tempList)) {
3667 3667 for (MaternalDeliverModel maternalDeliverModel : tempList) {
3668   - Patients patients = patientsService.findOnePatientById(maternalDeliverModel.getParentId());
3669   - if (patients != null && StringUtils.isNotEmpty(maternalDeliverModel.getFmHospital())
3670   - && StringUtils.isNotEmpty(patients.getFmHospital())) {
3671   - if (!maternalDeliverModel.getFmHospital().equals(patients.getFmHospital()))
3672   - {
3673   - patients.setFmHospital(maternalDeliverModel.getFmHospital());
3674   - patientsService.updatePatient(patients);
3675   - }
3676   - }
  3668 +// Patients patients = patientsService.findOnePatientById(maternalDeliverModel.getParentId());
  3669 +// if (patients != null && StringUtils.isNotEmpty(maternalDeliverModel.getFmHospital())
  3670 +// && StringUtils.isNotEmpty(patients.getFmHospital())) {
  3671 +// if (!maternalDeliverModel.getFmHospital().equals(patients.getFmHospital()))
  3672 +// {
  3673 +// patients.setFmHospital(maternalDeliverModel.getFmHospital());
  3674 +// patientsService.updatePatient(patients);
  3675 +// }
  3676 +// }
3677 3677  
3678 3678 PatientsQuery patientsQuery1 = new PatientsQuery();
3679 3679 patientsQuery1.setHospitalId(maternalDeliverModel.getFmHospital());
3680 3680 patientsQuery1.setYn(YnEnums.YES.getId());
3681 3681 patientsQuery1.setSort("created");
  3682 + patientsQuery1.setLastMensesStart(DateUtil.addDay(new Date(), -280));
3682 3683 patientsQuery1.setPid(maternalDeliverModel.getPid());
3683 3684 List<Patients> list = patientsService.queryPatient(patientsQuery1);
3684 3685 if (CollectionUtils.isNotEmpty(list))
3685 3686  
3686 3687  
3687 3688  
... ... @@ -3715,23 +3716,26 @@
3715 3716 List<Patients> list = patientsService.queryPatient(patientsQuery1);
3716 3717 if (CollectionUtils.isNotEmpty(list))
3717 3718 {
3718   - PersonModel persons = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(cardNo)), PersonModel.class);
3719   - if (persons != null)
  3719 + for (Patients pat : list)
3720 3720 {
3721   - persons.setType(1);
3722   - personService.updatePerson(persons, persons.getId());
3723   - Patients pat = list.get(0);
3724   - if ("0001-01-01".equals(DateUtil.getyyyy_MM_dd(pat.getLastMenses())))
  3721 + PersonModel persons = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(cardNo)), PersonModel.class);
  3722 + if (persons != null)
3725 3723 {
3726   - Date lastMensesDate = DateUtil.parseYMD(lastMenses);
3727   - pat.setLastMenses(lastMensesDate);
3728   - pat.setDueDate(DateUtil.addDay(lastMensesDate, 280));
3729   - pat.setIsAutoFm(0);
3730   - pat.setType(1);
3731   - patientsService.updatePatient(pat);
3732   - this.mongoTemplate.updateFirst(new Query(Criteria.where("id").is(pat.getId())), Update.update("fmDate", null), Patients.class);
  3724 + persons.setType(1);
  3725 + personService.updatePerson(persons, persons.getId());
  3726 + if ("0001-01-01".equals(DateUtil.getyyyy_MM_dd(pat.getLastMenses())))
  3727 + {
  3728 + Date lastMensesDate = DateUtil.parseYMD(lastMenses);
  3729 + pat.setLastMenses(lastMensesDate);
  3730 + pat.setDueDate(DateUtil.addDay(lastMensesDate, 280));
  3731 + pat.setIsAutoFm(0);
  3732 + pat.setType(1);
  3733 + patientsService.updatePatient(pat);
  3734 + this.mongoTemplate.updateFirst(new Query(Criteria.where("id").is(pat.getId())), Update.update("fmDate", null), Patients.class);
  3735 + }
3733 3736 }
3734 3737 }
  3738 +
3735 3739 }
3736 3740  
3737 3741 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java View file @ 93a20c8
... ... @@ -453,6 +453,13 @@
453 453 map.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate()));
454 454  
455 455 MaternalDeliverModel maternalDeliverModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(patients.getId())), MaternalDeliverModel.class);
  456 + if (maternalDeliverModel == null)
  457 + {
  458 + continue;
  459 + }
  460 +
  461 +
  462 +
456 463 map.put("tireNumber", maternalDeliverModel.getTireNumber());
457 464 String rFactor = commonService.resloveFactor(patients.getRiskFactorId());
458 465 if (patients.getoRiskFactor() != null && !"null".equals(patients.getoRiskFactor())) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 93a20c8
... ... @@ -236,6 +236,7 @@
236 236 patientsQuery.setId(parentId);
237 237 patientsQuery.setLastMensesStart(DateUtil.addDay(new Date(),-280));
238 238 patientsQuery.setSort(" created ");
  239 + //验证当前分娩机构是否有档案 如果没有档案通过pid查询到当前孕妇的其他医院建档信息 增加隐藏档案
239 240 List<Patients> patients = patientsService.queryPatient(patientsQuery);
240 241 if (CollectionUtils.isEmpty(patients))
241 242 {
242 243  
243 244  
244 245  
... ... @@ -244,19 +245,22 @@
244 245 patientsQuery.setId(null);
245 246 patientsQuery.setPid(deliverAddRequest.getPid());
246 247 patientsQuery.setSort(" created ");
  248 + patientsQuery.setLastMensesStart(DateUtil.addDay(new Date(), -280));
247 249 List<Patients> patientsss = patientsService.queryPatient(patientsQuery);
248 250 if (CollectionUtils.isNotEmpty(patientsss))
249 251 {
250 252 Patients pat = patientsss.get(0);
251 253 String source = pat.getSource() == null ? pat.getId() : pat.getSource();
252   - pat.setId(null);
  254 + String uuid = com.lyms.platform.common.utils.StringUtils.uuid();
  255 + pat.setId(uuid);
253 256 pat.setEnable("2");
254   - pat.setHospitalId(maternalDeliverModel.getFmHospital());
  257 + pat.setHospitalId(hospitalId);
255 258 pat.setSource(source);
256   -
257   - pat = patientsService.addPatient(pat);
258   - maternalDeliverModel.setParentId(pat.getId());
259   - deliverAddRequest.setParentId(pat.getId());
  259 + pat.setFmHospital(hospitalId);
  260 + pat.setShortCode("1");
  261 + patientsService.addPatient(pat);
  262 + maternalDeliverModel.setParentId(uuid);
  263 + deliverAddRequest.setParentId(uuid);
260 264 }
261 265 }
262 266 else