jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b37207dd1e71e4f4bf6829722f67f924e614ffca

Authored by jiangjiazhi
2 parents 2de44a8690 f8c47b3e17
Exists in master and in 7 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyService.java View file @ b37207d
1 1 package com.lyms.platform.biz.service;
2 2  
3   -import java.util.List;
4   -
5   -import org.apache.commons.lang.StringUtils;
6   -import org.springframework.beans.factory.annotation.Autowired;
7   -import org.springframework.data.domain.Sort.Direction;
8   -import org.springframework.stereotype.Service;
9   -
10 3 import com.lyms.platform.biz.dal.IBabyDao;
11 4 import com.lyms.platform.common.dao.operator.MongoCondition;
12 5 import com.lyms.platform.common.dao.operator.MongoQuery;
13 6 import com.lyms.platform.common.dao.operator.Page;
14 7 import com.lyms.platform.pojo.BabyModel;
15 8 import com.lyms.platform.query.BabyModelQuery;
  9 +import org.apache.commons.lang.StringUtils;
  10 +import org.springframework.beans.factory.annotation.Autowired;
  11 +import org.springframework.data.domain.Sort.Direction;
  12 +import org.springframework.stereotype.Service;
16 13  
  14 +import java.util.List;
  15 +
17 16 @Service
18 17 public class BabyService {
19 18  
20 19  
... ... @@ -42,8 +41,12 @@
42 41 babyQuery.mysqlBuild(iBabyDao.queryBabyCount(babyQuery.convertToQuery()));
43 42 query.start(babyQuery.getOffset()).end(babyQuery.getLimit());
44 43 }
  44 + if(StringUtils.isNotEmpty(babyQuery.getOrder())){
  45 + return iBabyDao.queryBabyWithQuery(query.addOrder(Direction.DESC, babyQuery.getOrder()));
  46 + }else {
45 47  
46   - return iBabyDao.queryBabyWithQuery(query.addOrder(Direction.DESC, "id"));
  48 + return iBabyDao.queryBabyWithQuery(query.addOrder(Direction.DESC, "id"));
  49 + }
47 50 }
48 51  
49 52 public int queryBabyCount(BabyModelQuery babyQuery){
platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java View file @ b37207d
... ... @@ -75,7 +75,7 @@
75 75 //女
76 76 public static final String WOMAN_ID = "c23779f1-cb6e-44d0-9fc8-0a990bf6184c";
77 77 //男
78   - public static final String MAN_ID = "ac334aa6-b0f2-4b25-a231-cf968c14ef8b";
  78 + public static final String MAN_ID = "5d0b782f-b61b-441b-b8c5-4bf55eece273";
79 79  
80 80  
81 81 }
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ b37207d
... ... @@ -47,6 +47,16 @@
47 47  
48 48 private String pregnancyOut;
49 49  
  50 + private String order;
  51 +
  52 + public String getOrder() {
  53 + return order;
  54 + }
  55 +
  56 + public void setOrder(String order) {
  57 + this.order = order;
  58 + }
  59 +
50 60 public Date getBuildDateStart() {
51 61 return buildDateStart;
52 62 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ b37207d
... ... @@ -1473,6 +1473,7 @@
1473 1473 }
1474 1474 babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(newBabyManagerRequest.getOperatorId()));
1475 1475 babyModelQuery.setBuildType(2);
  1476 + babyModelQuery.setOrder("birth");
1476 1477 List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
1477 1478 if (CollectionUtils.isEmpty(babyModelList)) {
1478 1479 newBabyManagerResult.setPageInfo(babyModelQuery.getPageInfo());
... ... @@ -1489,8 +1490,8 @@
1489 1490 matDeliverQuery.setParentIdList(parentIdList);
1490 1491 List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
1491 1492 List<NewBabyManagerQueryModel> newBabyManagerQueryModelList = new ArrayList<>();
1492   - for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModelList) {
1493   - for (BabyModel babyModel : babyModelList) {
  1493 + for (BabyModel babyModel : babyModelList) {
  1494 + for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModelList) {
1494 1495 if (maternalDeliverModel.getParentId().equals(babyModel.getParentId())) {
1495 1496 NewBabyManagerQueryModel newBabyManagerQueryModel = new NewBabyManagerQueryModel();
1496 1497 BeanUtils.copy(babyModel, newBabyManagerQueryModel);