jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 910065eab9dc03275ddbf0b87fd21cbbf1c196e6

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

追访

Showing 2 changed files with 3 additions and 2 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ 910065e
... ... @@ -638,7 +638,7 @@
638 638 List<MongoCondition> mongoCondits = new ArrayList<>();
639 639  
640 640 if (-1 != yn) {
641   - MongoCondition mongoCondition1 = condition.and("yn", yn, MongoOper.IS);
  641 + condition = condition.and("yn", yn, MongoOper.IS);
642 642 }
643 643  
644 644 if (dataStatus) {//分娩自动建档
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 910065e
... ... @@ -1797,8 +1797,9 @@
1797 1797 // 妊娠结局，儿童性别，儿童体重，儿童身长，Apgar1分钟，Apgar5分钟，Apgar10分钟，窒息分钟数，新生儿疾病，畸形
1798 1798 if (childbirthManagerRequest.getInitQuery().contains("livingNumber") || childbirthManagerRequest.getInitQuery().contains("pregnancyOut") || childbirthManagerRequest.getInitQuery().contains("sex") || childbirthManagerRequest.getInitQuery().contains("babyWeight") || childbirthManagerRequest.getInitQuery().contains("babyHeight") || childbirthManagerRequest.getInitQuery().contains("apgarScorePf1") || childbirthManagerRequest.getInitQuery().contains("apgarScorePf5") || childbirthManagerRequest.getInitQuery().contains("apgarScorePf10") || childbirthManagerRequest.getInitQuery().contains("asphyxiaM") || childbirthManagerRequest.getInitQuery().contains("babyHealthy") || childbirthManagerRequest.getInitQuery().contains("malformation")) {
1799 1799 BabyModelQuery babyModelQuery = new BabyModelQuery();
1800   - babyModelQuery.setYn(YnEnums.YES.getId());
  1800 + // babyModelQuery.setYn(YnEnums.YES.getId());
1801 1801 babyModelQuery.setParentId(patients.getId());
  1802 + babyModelQuery.setDataStatus(false);
1802 1803 babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId());
1803 1804 System.out.println("查询调价n:"+babyModelQuery.convertToQuery().convertToMongoQuery());
1804 1805 List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);