jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2516fe458bd88c5630123849ac65cadd120efdc0

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

修改新电子病历

Showing 3 changed files with 6 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 2516fe4
... ... @@ -477,7 +477,7 @@
477 477 List sortList = new ArrayList();
478 478 String hospital=autoMatchFacade.getHospitalId(userId);
479 479 List<SortIn> listDate = new ArrayList();
480   -
  480 +
481 481 if (CollectionUtils.isNotEmpty(list)) {
482 482 Patients patients2= findOnePatient(null,null,null,hospital,-1,false,exListQueryRequest.getPid());
483 483 antexListResult.convertToResult(null, patients2, null);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 2516fe4
... ... @@ -436,15 +436,15 @@
436 436 return new BaseResponse().setErrormsg("没有相关的产妇记录").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR);
437 437 }*/
438 438 //外院的孕妇
439   - Patients patients1 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 1, false);
  439 + Patients patients1 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 1, false,null);
440 440 //外院的产妇
441 441 // Patients patients2 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 3);
442 442  
443 443 //http://jira.healthbaby.com.cn/browse/WEB-204 修改bug
444 444 //本院的孕妇
445   - Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 1, false);
  445 + Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 1, false,null);
446 446 //本院产妇
447   - Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 3, false);
  447 + Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 3, false,null);
448 448 //本院产妇，并且本院没建档需要提醒补录记录
449 449 if (null != patients3 && null == patients) {
450 450 patients = patients3;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java View file @ 2516fe4
... ... @@ -133,7 +133,7 @@
133 133 public BaseResponse queryPostList(PostReviewQueryRequest postReviewQueryRequest,Integer userId) {
134 134  
135 135 //未分娩建档
136   - Patients patients = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, null, 1,false);
  136 + Patients patients = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, null, 1,false,null);
137 137 if(null!=patients){
138 138 return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("当前用户未分娩，不能进行复查");
139 139 }
... ... @@ -141,7 +141,7 @@
141 141  
142 142 String hospitalId = autoMatchFacade.getHospitalId(userId);
143 143 //取所有医院的建档数据 优先取本院 ，然后取外院
144   - Patients patientsList = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, hospitalId, 3,true);
  144 + Patients patientsList = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, hospitalId, 3,true,null);
145 145 PostReviewListResult postReviewListResult = new PostReviewListResult();
146 146  
147 147 if (null != patientsList) {