diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index ac8d3bf..7132946 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -1090,11 +1090,19 @@ public class SieveFacade { patientBaseResult.convert(pat); patientBaseResult.setRiskFactor(highScoreResult.getHighRisk()); patientBaseResult.setRiskScore(highScoreResult.getScoreStr()); - sieveApplyOrderQuery1.setHospitalId(pat.getHospitalId()); - map.put("patientInfo", patientBaseResult); map.put("cardNo", pat.getCardNo()); + + map.put("hjAddress", CommonsHelper.getResidence(pat.getProvinceId(), pat.getCityId(), + pat.getAreaId(), pat.getStreetId(), pat.getAddress(), + basicConfigService)); + map.put("xjAddress", CommonsHelper.getResidence(pat.getProvinceRegisterId(), + pat.getCityRegisterId(), + pat.getAreaRegisterId(), + pat.getStreetRegisterId(), + pat.getAddressRegister(), + basicConfigService)); } if (type == 4) {