shiyang / regional-platform

Download as
Browse Code ยป

Commit 9b0c5caadd18e88f458da2968eb66376f5ba8bbd

Authored by jiangjiazhi
2 parents e89f8f1c00 fd36e8f5b5
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 9b0c5ca
... ... @@ -829,9 +829,9 @@
829 829 Patients patients = patientsService.findOnePatientByCardNo(puerperaQuery);
830 830 map.put("patients",patients);
831 831  
832   - if (patients != null && StringUtils.isNotEmpty(patients.getPhone())) {
833   - babyQuery.setPhoneId(patients.getPhone());
834   - }
  832 +// if (patients != null && StringUtils.isNotEmpty(patients.getPhone())) {
  833 +// babyQuery.setPhoneId(patients.getPhone());
  834 +// }
835 835  
836 836 models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
837 837  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 9b0c5ca
... ... @@ -615,6 +615,8 @@
615 615 result.setServiceType(p.getServiceType() == null ? "" : String.valueOf(p.getServiceType()));
616 616  
617 617 result.setExpType(p.getExpType());
  618 +
  619 + result.setPid(p.getPid());
618 620 }
619 621 BaseObjectResponse objectResponse = new BaseObjectResponse();
620 622 objectResponse.setData(result);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java View file @ 9b0c5ca
... ... @@ -128,6 +128,16 @@
128 128  
129 129 private Integer expType;
130 130  
  131 + private String pid;
  132 +
  133 + public String getPid() {
  134 + return pid;
  135 + }
  136 +
  137 + public void setPid(String pid) {
  138 + this.pid = pid;
  139 + }
  140 +
131 141 public Integer getExpType() {
132 142 return expType;
133 143 }