jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8bed20e070356d9c669578a757792f402ac43b0f

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

新生儿访视

Showing 2 changed files with 5 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 8bed20e
... ... @@ -762,7 +762,8 @@
762 762 if (!StringUtils.isEmpty(id)) {
763 763 BabyModelQuery babyQuery = new BabyModelQuery();
764 764 babyQuery.setId(id);
765   - babyQuery.setYn(YnEnums.YES.getId());
  765 + babyQuery.setDataStatus(false);
  766 + // babyQuery.setYn(YnEnums.YES.getId());
766 767 //查询儿童的基本信息
767 768 List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
768 769 if (models != null && models.size() > 0) {
... ... @@ -989,7 +990,8 @@
989 990 BabyModelQuery babyQuery = new BabyModelQuery();
990 991 babyQuery.setPhoneOrcardNo(StringUtils.isEmpty(cardNo) ? null : cardNo); //手机号码或者身份证号码
991 992 babyQuery.setVcCardNo(StringUtils.isEmpty(vcCardNo) ? null : vcCardNo);
992   - babyQuery.setYn(YnEnums.YES.getId());
  993 + // babyQuery.setYn(YnEnums.YES.getId());
  994 + babyQuery.setDataStatus(false);
993 995  
994 996 /** 处理优惠券查询 */
995 997 if (StringUtils.isNotEmpty(coupon)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java View file @ 8bed20e
... ... @@ -173,14 +173,13 @@
173 173 @Override
174 174 public BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit) {
175 175 String hospitalId = autoMatchFacade.getHospitalId(userId);
176   - Criteria criteria = Criteria.where("hospitalId").is(hospitalId);
  176 + Criteria criteria = Criteria.where("hospitalId").is(hospitalId).and("yn").ne("0");
177 177 if(startDate != null && endDate != null) {
178 178 criteria.and("checkTime").gte(startDate).lt(DateUtil.addDay(endDate, 1));
179 179 }
180 180 if(StringUtils.isNotBlank(doctor)) {
181 181 criteria.and("doctor").is(doctor);
182 182 }
183   - criteria.andOperator(new Criteria().orOperator(Criteria.where("yn").is(1),Criteria.where("dataStatus").is(1).andOperator(Criteria.where("yn").is(0))));
184 183 if(StringUtils.isNotBlank(key)) {
185 184 Criteria c = new Criteria();
186 185 // c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key)).and("yn").ne(0);