jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a61d6d4928e2220947d3f2ee079ab53c700e1ea6

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

追访

Showing 2 changed files with 27 additions and 4 deletions

platform-dal/src/main/java/com/lyms/platform/query/PostVisitHospitalModelQuery.java View file @ a61d6d4
... ... @@ -29,6 +29,7 @@
29 29 * 产后修养医院id
30 30 */
31 31 private String postHosptial;
  32 + private String noPostHosptial;
32 33 /**
33 34 * 地址id集合
34 35 */
... ... @@ -51,6 +52,14 @@
51 52 */
52 53 private String createUser;
53 54  
  55 + public String getNoPostHosptial() {
  56 + return noPostHosptial;
  57 + }
  58 +
  59 + public void setNoPostHosptial(String noPostHosptial) {
  60 + this.noPostHosptial = noPostHosptial;
  61 + }
  62 +
54 63 public String getId() {
55 64 return id;
56 65 }
... ... @@ -126,6 +135,9 @@
126 135 }
127 136 if(null!=postHosptial){
128 137 mongoCondition= mongoCondition.and("postHosptial",postHosptial, MongoOper.IS);
  138 + }
  139 + if(null!=noPostHosptial){
  140 + mongoCondition= mongoCondition.and("postHosptial",noPostHosptial, MongoOper.NE);
129 141 }
130 142 if(CollectionUtils.isNotEmpty(areaTiters)){
131 143 mongoCondition= mongoCondition.and("areaTiters",areaTiters, MongoOper.IN);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ModularFunctionConfigFacde.java View file @ a61d6d4
... ... @@ -212,7 +212,7 @@
212 212 postVisitHospitalService.updatePostVisitHospitalModel(oldPostModel);
213 213 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
214 214  
215   - }catch (Exception e){
  215 + } catch (Exception e) {
216 216 e.printStackTrace();
217 217 return new BaseResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION);
218 218 }
219 219  
... ... @@ -223,10 +223,21 @@
223 223 postQuery.setHosptialId(hospitalId);
224 224  
225 225 List<PostVisitHospitalModel> postVisitHospitalModels = postVisitHospitalService.queryPostVisitHospitalModel(postQuery);
226   - if (CollectionUtils.isNotEmpty(postVisitHospitalModels)) {
227   - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(postVisitHospitalModels);
  226 +
  227 + postQuery.setNoPostHosptial(postQuery.getPostHosptial());
  228 + postQuery.setPostHosptial(null);
  229 + List<PostVisitHospitalModel> postVisitHospitalModel = postVisitHospitalService.queryPostVisitHospitalModel(postQuery);
  230 + List<String> excData = new ArrayList<>();
  231 + if (CollectionUtils.isNotEmpty(postVisitHospitalModel)) {
  232 + for (PostVisitHospitalModel phm : postVisitHospitalModel) {
  233 + excData.addAll(phm.getAreaTiters());
  234 + }
228 235 }
229   - return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有数据");
  236 +
  237 + Map dataMap = new HashMap();
  238 + dataMap.put("data", postVisitHospitalModels);
  239 + dataMap.put("excData", excData);
  240 + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(dataMap);
230 241 }
231 242 }