jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7aa3d945bf09b1d80c5ab2ee10261c66ef9126d0

Authored by jiangjiazhi
2 parents feb06fab8e 8d33f55822
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java View file @ 7aa3d94
... ... @@ -327,7 +327,13 @@
327 327 restMap.put("vcCardNo", baby.getVcCardNo()); /** 就诊卡号 */
328 328 // restMap.put("cardNo", baby.getCardNo()); /** 证件号 */
329 329 restMap.put("cardNo", person.getCardNo()); /** 证件号 */
330   - restMap.put("pcerteTypeId", baby.getFcertTypeId()); /** 证件类型id */
  330 + Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), Patients.class);
  331 + if(patients != null) {
  332 + restMap.put("pcerteTypeId", patients.getPcerteTypeId()); /** 证件类型id */
  333 + } else {
  334 + restMap.put("pcerteTypeId", "57e1dd12f0f02e7ca519d6c7"); /** 证件类型id */
  335 +
  336 + }
331 337 } else {
332 338 Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), Patients.class);
333 339 if(patients != null) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java View file @ 7aa3d94
... ... @@ -423,14 +423,15 @@
423 423 parentIds.add(pa.getId());
424 424 }
425 425 folicAcidQuery.setParentIds(parentIds);
426   - }else{//没有数据
427   - BaseListResponse baseListResponse = new BaseListResponse();
428   - baseListResponse.setErrormsg("成功");
429   - baseListResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
430   - baseListResponse.setData(list);
431   - baseListResponse.setPageInfo(folicAcidQuery.getPageInfo());
432   - return baseListResponse;
433 426 }
  427 +// else{//没有数据
  428 +// BaseListResponse baseListResponse = new BaseListResponse();
  429 +// baseListResponse.setErrormsg("成功");
  430 +// baseListResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  431 +// baseListResponse.setData(list);
  432 +// baseListResponse.setPageInfo(folicAcidQuery.getPageInfo());
  433 +// return baseListResponse;
  434 +// }
434 435  
435 436 List<FolicAcid> folicAcidList = folicAcidService.queryFolicAcid(folicAcidQuery);
436 437 if (CollectionUtils.isNotEmpty(folicAcidList)){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 7aa3d94
... ... @@ -1208,7 +1208,7 @@
1208 1208  
1209 1209 cnames.put("jianChaJieGuo", "检查结果");
1210 1210 cnames.put("jianChaDetails", "检查异常详情");
1211   - cnames.put("jiBingZhenDuan", "jiBingZhenDuan");
  1211 + cnames.put("jiBingZhenDuan", "疾病诊断");
1212 1212  
1213 1213 cnames.put("yiXueYiJian", "医学意见");
1214 1214 cnames.put("yiJianQiTaDetails", "医学意见其他详情");