jiangjiazhi / regional-platform

Download as
Browse Code »

Commit bf112446097b582d9dc890770e3091f3adf7f363

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

1

Showing 2 changed files with 13 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ bf11244
... ... @@ -627,15 +627,15 @@
627 627 boolean isEnable=og.getbStatus()==1;
628 628  
629 629 //外院的孕妇
630   - Patients patients1 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 1, false, null,true);
  630 + Patients patients1 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 1, false, deliverQueryRequest.getPid(),true);
631 631 //外院的产妇
632 632 // Patients patients2 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 3);
633 633  
634 634 //http://jira.healthbaby.com.cn/browse/WEB-204 修改bug
635 635 //本院的孕妇
636   - Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId,false), 1, false, null,isEnable);
  636 + Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId,false), 1, false, deliverQueryRequest.getPid(),isEnable);
637 637 //本院产妇
638   - Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId,false), 3, false, null,isEnable);
  638 + Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId,false), 3, false, deliverQueryRequest.getPid(),isEnable);
639 639 PersonModelQuery personModelQuery = new PersonModelQuery();
640 640 String pid = "";
641 641 if (null != patients1) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverQueryRequest.java View file @ bf11244
... ... @@ -21,6 +21,16 @@
21 21 */
22 22 @FormParam
23 23 private String vcCardNo;
  24 + @FormParam
  25 + private String pid;
  26 +
  27 + public String getPid() {
  28 + return pid;
  29 + }
  30 +
  31 + public void setPid(String pid) {
  32 + this.pid = pid;
  33 + }
24 34  
25 35 public String getCardNo() {
26 36 return cardNo;