diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 972e95f..a8ce258 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -1438,6 +1438,7 @@ public class PatientFacade { patientManagerQueryModel.setAddressRegister(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); patientManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); patientManagerQueryModel.setId(patients.getId()); + patientManagerQueryModel.setLowerHairOgrId(StringUtils.isNotEmpty(patients.getLowerHairOgrId()) ? organizationService.getOrganizationName(patients.getLowerHairOgrId()) : ""); if (patients.getSendCareMan() != null) { if ("0".equals(patients.getSendCareMan())) { patientManagerQueryModel.setSendCareMan("未发放"); @@ -1447,6 +1448,7 @@ public class PatientFacade { patientManagerQueryModel.setSendCareMan("补发"); } } + patientManagerQueryModelList.add(patientManagerQueryModel); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java index 845c05e..81da8ae 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java @@ -49,6 +49,11 @@ public class PatientManagerQueryModel { private String sendCareMan; /** + * 母子保健手册下发机构id + */ + private String lowerHairOgrId; + + /** * @auther HuJiaqi * @createTime 2016年12月20日 14时42分 * @discription 居住地 @@ -82,6 +87,15 @@ public class PatientManagerQueryModel { private String id; + + public String getLowerHairOgrId() { + return lowerHairOgrId; + } + + public void setLowerHairOgrId(String lowerHairOgrId) { + this.lowerHairOgrId = lowerHairOgrId; + } + public String getSendCareMan() { return sendCareMan; }