jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 418ae54abf95ea256cec41c69d2765f5f7892054

Authored by yangfei
2 parents e827793d12 058dbe421a
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 418ae54
... ... @@ -1799,6 +1799,9 @@
1799 1799 result.setBuildTime(DateUtil.getyyyy_MM_dd(model.getBuildDate()));
1800 1800 result.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospitalId)).getName());
1801 1801  
  1802 + result.setVcCardNo(model.getVcCardNo());
  1803 + result.setCardNo(model.getMcertNo());
  1804 +
1802 1805 String diagnose = "";
1803 1806 if (StringUtils.isNotEmpty(model.getPid())) {
1804 1807 List diagList = getBabyLastDiagnose(model.getPid());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java View file @ 418ae54
... ... @@ -52,6 +52,26 @@
52 52  
53 53 private String completeAddress;
54 54  
  55 + private String cardNo;
  56 +
  57 + private String vcCardNo;
  58 +
  59 + public String getCardNo() {
  60 + return cardNo;
  61 + }
  62 +
  63 + public void setCardNo(String cardNo) {
  64 + this.cardNo = cardNo;
  65 + }
  66 +
  67 + public String getVcCardNo() {
  68 + return vcCardNo;
  69 + }
  70 +
  71 + public void setVcCardNo(String vcCardNo) {
  72 + this.vcCardNo = vcCardNo;
  73 + }
  74 +
55 75 public String getCompleteAddress() {
56 76 return completeAddress;
57 77 }