jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 5e59f4043365ae19480b0daff04067b2cf6b6974

Authored by zhangchao
1 parent cd889373f1
Exists in dev

#fix:优化儿保小程序查询新生儿排序逻辑

Showing 4 changed files with 38 additions and 4 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyService.java View file @ 5e59f40
... ... @@ -49,6 +49,19 @@
49 49 }
50 50 }
51 51  
  52 + public List<BabyModel> queryBabyListQuery(BabyModelQuery babyQuery){
  53 + MongoQuery query = babyQuery.convertToQuery();
  54 + if (StringUtils.isNotEmpty(babyQuery.getNeed())) {
  55 + babyQuery.mysqlBuild(iBabyDao.queryBabyCount(babyQuery.convertToQuery()));
  56 + query.start(babyQuery.getOffset()).end(babyQuery.getLimit());
  57 + }
  58 + if(StringUtils.isNotEmpty(babyQuery.getOrder())){
  59 + return iBabyDao.queryBabyWithQuery(query.addOrder(Direction.DESC, babyQuery.getOrder()));
  60 + }else {
  61 + return iBabyDao.queryBabyWithQuery(query.addOrder(Direction.ASC, "id"));
  62 + }
  63 + }
  64 +
52 65 public int queryBabyCount(BabyModelQuery babyQuery){
53 66  
54 67 return iBabyDao.queryBabyCount(babyQuery.convertToQuery());
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java View file @ 5e59f40
... ... @@ -525,6 +525,16 @@
525 525 //病历号(住院号)
526 526 private String blNo;
527 527  
  528 + private String deptName;//患者所属科室名称
  529 +
  530 + public String getDeptName() {
  531 + return deptName;
  532 + }
  533 +
  534 + public void setDeptName(String deptName) {
  535 + this.deptName = deptName;
  536 + }
  537 +
528 538 public String getBlNo() {
529 539 return blNo;
530 540 }
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 5e59f40
... ... @@ -447,7 +447,16 @@
447 447 private boolean isArchive=false;
448 448 //病历号(住院号)
449 449 private String blNo;
  450 + private String deptName;//患者所属科室名称
450 451  
  452 + public String getDeptName() {
  453 + return deptName;
  454 + }
  455 +
  456 + public void setDeptName(String deptName) {
  457 + this.deptName = deptName;
  458 + }
  459 +
451 460 public String getBlNo() {
452 461 return blNo;
453 462 }
... ... @@ -797,7 +806,9 @@
797 806  
798 807 if (StringUtils.isNotEmpty(blNo)){
799 808 condition = condition.and("blNo", blNo, MongoOper.IS);
800   -
  809 + }
  810 + if (StringUtils.isNotEmpty(deptName)){
  811 + condition = condition.and("deptName", deptName, MongoOper.IS);
801 812 }
802 813 if (null != isComplete) {
803 814 condition = condition.and("isComplete", isComplete, MongoOper.IS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java View file @ 5e59f40
... ... @@ -2028,7 +2028,7 @@
2028 2028 babyQuery.setParentId(patients1.getId());
2029 2029 /* babyQuery.setBirthStart(patients1.getFmDate());
2030 2030 babyQuery.setBirthEnd(patients1.getFmDate());*/
2031   - List<BabyModel> modelList= babyService.queryBabyWithQuery(babyQuery);
  2031 + List<BabyModel> modelList= babyService.queryBabyListQuery(babyQuery);
2032 2032 if (CollectionUtils.isNotEmpty(modelList)){
2033 2033 String babyName="";
2034 2034 for (BabyModel babyModel:modelList){
... ... @@ -2073,7 +2073,7 @@
2073 2073 birthResult.setDueWeek(dueWeek);
2074 2074 birthResult.setParentId(patients.getId());
2075 2075 babyQuery.setParentId(patients.getId());
2076   - List<BabyModel> babyModels= babyService.queryBabyWithQuery(babyQuery);
  2076 + List<BabyModel> babyModels= babyService.queryBabyListQuery(babyQuery);
2077 2077 if (CollectionUtils.isNotEmpty(babyModels)){
2078 2078 List<BirthBabyResult> list=new ArrayList<>();
2079 2079 for (BabyModel babyModel:babyModels){
... ... @@ -2135,7 +2135,7 @@
2135 2135  
2136 2136 birthResult.setParentId(patients.getId());
2137 2137 babyQuery.setParentId(patients.getId());
2138   - List<BabyModel> babyModels= babyService.queryBabyWithQuery(babyQuery);
  2138 + List<BabyModel> babyModels= babyService.queryBabyListQuery(babyQuery);
2139 2139 if (CollectionUtils.isNotEmpty(babyModels)){
2140 2140 List<BirthBabyResult> babyResults=new ArrayList<>();
2141 2141 for (BabyModel babyModel:babyModels){