jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 805275d0fbb33480064cca2702eca391f7d69768

Authored by jiangjiazhi
1 parent 23559e1785
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

修改新电子病历

Showing 1 changed file with 29 additions and 21 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 805275d
... ... @@ -115,7 +115,7 @@
115 115 if (CollectionUtils.isNotEmpty(list2)) {
116 116 return new BaseResponse().setErrormsg("您已分娩").setErrorcode(ErrorCodeConstants.DATA_EXIST);
117 117 }
118   - Patients patients2= patientsService.findOnePatientById(deliverAddRequest.getParentId());
  118 + Patients patients2 = patientsService.findOnePatientById(deliverAddRequest.getParentId());
119 119 matDeliverQuery.setDueDate(deliverAddRequest.getDueDate());
120 120 matDeliverQuery.setParentId(null);
121 121 matDeliverQuery.setPid(patients2.getPid());
122 122  
123 123  
... ... @@ -196,15 +196,15 @@
196 196 MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel();
197 197 MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
198 198  
199   - Patients patients2= patientsService.findOnePatientById(deliverAddRequest.getParentId());
  199 + Patients patients2 = patientsService.findOnePatientById(deliverAddRequest.getParentId());
200 200 matDeliverQuery.setPid(patients2.getPid());
201 201 matDeliverQuery.setYn(YnEnums.YES.getId());
202 202 matDeliverQuery.setDueDate(deliverAddRequest.getDueDate());
203   - List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery);
  203 + List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery);
204 204  
205   - for(int i=0;i<list2.size();i++){
206   - MaternalDeliverModel model= list2.get(i);
207   - if(model.getId().equals(deliverAddRequest.getId())){
  205 + for (int i = 0; i < list2.size(); i++) {
  206 + MaternalDeliverModel model = list2.get(i);
  207 + if (model.getId().equals(deliverAddRequest.getId())) {
208 208 list2.remove(i);
209 209 }
210 210 }
... ... @@ -312,6 +312,8 @@
312 312 babyModel.setBuildDoctor("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29");
313 313 babyModel.setServiceStatus(patients.getServiceStatus());
314 314 babyModel.setServiceType(patients.getServiceType());
  315 + int day=DateUtil.getDays(patients.getLastMenses(),patients.getFmDate());
  316 + babyModel.setDueWeek(day/7);
315 317 }
316 318 // 产妇分娩建档
317 319 babyModel.setBuildType(2);
318 320  
319 321  
320 322  
... ... @@ -497,21 +499,21 @@
497 499 Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 1, false, null);
498 500 //本院产妇
499 501 Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 3, false, null);
500   - PersonModelQuery personModelQuery=new PersonModelQuery();
  502 + PersonModelQuery personModelQuery = new PersonModelQuery();
501 503 String pid = "";
502   - if(null!=patients1){
503   - pid=patients1.getPid();
504   - }else if (null!=patients){
505   - pid=patients.getPid();
506   - }else if(null!=patients3){
507   - pid= patients3.getPid();
  504 + if (null != patients1) {
  505 + pid = patients1.getPid();
  506 + } else if (null != patients) {
  507 + pid = patients.getPid();
  508 + } else if (null != patients3) {
  509 + pid = patients3.getPid();
508 510 }
509   - if(StringUtils.isNotEmpty(pid)){
  511 + if (StringUtils.isNotEmpty(pid)) {
510 512 personModelQuery.setId(pid);
511 513 List<PersonModel> personModels = personService.queryPersons(personModelQuery);
512   - if(CollectionUtils.isNotEmpty(personModels)){
513   - PersonModel personModel= personModels.get(0);
514   - if(personModel.getType()==1 &&null==patients){
  514 + if (CollectionUtils.isNotEmpty(personModels)) {
  515 + PersonModel personModel = personModels.get(0);
  516 + if (personModel.getType() == 1 && null == patients) {
515 517 return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA);
516 518 }
517 519 }
... ... @@ -539,7 +541,7 @@
539 541 MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
540 542 matDeliverQuery.setPid(patients.getPid());
541 543 matDeliverQuery.setCreatedStart(patients.getLastMenses());
542   -// matDeliverQuery.setYn(YnEnums.YES.getId());
  544 + matDeliverQuery.setYn(YnEnums.YES.getId());
543 545 // matDeliverQuery.setspatients.getFmDate();
544 546 List<MaternalDeliverModel> list = matDeliverService.query(matDeliverQuery);
545 547 MatDeliverListResult matDeliverListResult = new MatDeliverListResult();
546 548  
... ... @@ -572,9 +574,15 @@
572 574 });
573 575 list12.get(0).setEnableEdit("1");
574 576 matDeliverListResult.setData(list12);
575   - } else {
  577 + }
  578 +
  579 +
  580 + MatDeliverQuery matDeliverQuery1 = new MatDeliverQuery();
  581 + matDeliverQuery1.setPid(patients.getPid());
  582 + matDeliverQuery1.setCreatedStart(patients.getLastMenses());
  583 + list = matDeliverService.query(matDeliverQuery);
  584 + if (CollectionUtils.isEmpty(list)) {
576 585 StopPregQuery stopPregQuery = new StopPregQuery();
577   -// stopPregQuery.setYn(YnEnums.YES.getId());
578 586 stopPregQuery.setPatientId(patients.getId());
579 587 stopPregQuery.setStopDateStart(patients.getLastMenses());
580 588 List<StopPregModel> list2 = stopPregnancyService.queryStopPreg(stopPregQuery);