liquanyu / regional-platform

Download as
Browse Code ยป

Commit addc36c1c87e87da2782a15bbab6c06d9ce3a29d

Authored by yangfei
2 parents ca8ef823ce 55d7c5f527
Exists in master and in 1 other branch dev

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java View file @ addc36c
... ... @@ -89,8 +89,8 @@
89 89 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
90 90 ArchiveDataQuery query = new ArchiveDataQuery();
91 91 query.setIdCard(idCard);
92   - query.setCardNum(cardNum);
93   - query.setPhone(phone);
  92 +// query.setCardNum(cardNum);
  93 +// query.setPhone(phone);
94 94 List<ArchiveData> list = archiveDataServicer.query(query.convertToQuery());
95 95  
96 96 if (CollectionUtils.isEmpty(list) && StringUtils.isNotEmpty(cardNum))
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ addc36c
... ... @@ -1800,6 +1800,7 @@
1800 1800 result.setPatientId(model.getParentId());
1801 1801 result.setBuildTime(DateUtil.getyyyy_MM_dd(model.getBuildDate()));
1802 1802 result.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospitalId)).getName());
  1803 + result.setCertType(model.getMcertTypeId());
1803 1804  
1804 1805 result.setVcCardNo(model.getVcCardNo());
1805 1806 result.setCardNo(model.getMcertNo());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java View file @ addc36c
... ... @@ -61,6 +61,16 @@
61 61  
62 62 private String vcCardNo;
63 63  
  64 + private String certType;
  65 +
  66 + public String getCertType() {
  67 + return certType;
  68 + }
  69 +
  70 + public void setCertType(String certType) {
  71 + this.certType = certType;
  72 + }
  73 +
64 74 public String getCardNo() {
65 75 return cardNo;
66 76 }