jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 0cf0d1d16b25d6daef4fce4612252357f1ba7aa6

Authored by Administrator
1 parent b5e5005d7b
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update12

Showing 3 changed files with 33 additions and 6 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ 0cf0d1d
... ... @@ -903,19 +903,19 @@
903 903 if (null != buildType) {
904 904 condition = condition.and("buildType", buildType, MongoOper.IS);
905 905 }
906   - if (null != provinceId) {
  906 + if (StringUtils.isNotEmpty(provinceId)) {
907 907 condition = condition.and("provinceId", provinceId, MongoOper.IS);
908 908 }
909   - if (null != cityId) {
  909 + if (StringUtils.isNotEmpty(cityId)) {
910 910 condition = condition.and("cityId", cityId, MongoOper.IS);
911 911 }
912   - if (null != areaId) {
  912 + if (StringUtils.isNotEmpty(areaId)) {
913 913 condition = condition.and("areaId", areaId, MongoOper.IS);
914 914 }
915   - if (null != streetId) {
  915 + if (StringUtils.isNotEmpty(streetId)) {
916 916 condition = condition.and("streetId", streetId, MongoOper.IS);
917 917 }
918   - if (null != address) {
  918 + if (StringUtils.isNotEmpty(address)) {
919 919 condition = condition.and("address", address, MongoOper.IS);
920 920 }
921 921 if (null != enable) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ 0cf0d1d
... ... @@ -2145,11 +2145,14 @@
2145 2145  
2146 2146 BabyModelQuery modelQuery = new BabyModelQuery();
2147 2147 modelQuery.setProvinceId(earScreenListRequest.getProvinceId());
  2148 + System.out.println(earScreenListRequest.getProvinceId());
2148 2149 modelQuery.setCityId(earScreenListRequest.getCityId());
2149 2150 modelQuery.setAreaId(earScreenListRequest.getAreaId());
2150 2151 modelQuery.setStreetId(earScreenListRequest.getStreetId());
2151 2152 modelQuery.setAreaId(earScreenListRequest.getAreaId());
2152 2153 List<BabyModel> babyModels = babyService.queryBabyWithQuery(modelQuery);
  2154 + System.out.println(modelQuery.convertToQuery().convertToMongoQuery());
  2155 +
2153 2156 List<String> list = new ArrayList<>();
2154 2157 if (CollectionUtils.isNotEmpty(babyModels)) {
2155 2158 for (BabyModel babyModel : babyModels) {
... ... @@ -2191,6 +2194,9 @@
2191 2194 screenResult.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), earScreen.getScreenDate()));
2192 2195 screenResult.setBirthday(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
2193 2196 screenResult.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(babyModel.getMphone()));
  2197 + screenResult.setHabitation(CommonsHelper.getResidence(babyModel.getProvinceId(), babyModel.getCityId(), babyModel.getAreaId(), babyModel.getStreetId(), babyModel.getAddress(), basicConfigService));
  2198 + screenResult.setOrg(organizationService.getOrganization(Integer.valueOf(babyModel.getHospitalId())).getName());
  2199 +
2194 2200 }
2195 2201 if (StringUtils.isNotEmpty(earScreen.getHighRiskCause()))//听力高危因素文字 HighRiskEnum
2196 2202 {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/EarScreenResult.java View file @ 0cf0d1d
... ... @@ -16,7 +16,7 @@
16 16 //月龄
17 17 private String monthAge;
18 18 //生日
19   - private String birthday;
  19 + private String birthday;
20 20 //高危因素
21 21 private String highRiskCause;
22 22 //筛查时间
... ... @@ -31,6 +31,27 @@
31 31 private String srcDoctor;
32 32 //联系方式
33 33 private String mommnyEncryptPhone;
  34 + //居住地
  35 + private String habitation;
  36 +
  37 + //建档机构
  38 + private String org;
  39 +
  40 + public String getOrg() {
  41 + return org;
  42 + }
  43 +
  44 + public void setOrg(String org) {
  45 + this.org = org;
  46 + }
  47 +
  48 + public String getHabitation() {
  49 + return habitation;
  50 + }
  51 +
  52 + public void setHabitation(String habitation) {
  53 + this.habitation = habitation;
  54 + }
34 55  
35 56 public String getBabyId() {
36 57 return babyId;