jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 7f725b2ca0d444bca51ae7c19a99a1b088732ab2

Authored by rui.zhang
2 parents 95cf2be68a 695be66718
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 6 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBasicConfigDao.java View file @ 7f725b2
1 1 package com.lyms.platform.biz.dal;
2 2  
  3 +import java.util.Collection;
3 4 import java.util.List;
4 5  
5 6 import com.lyms.platform.common.dao.operator.MongoQuery;
... ... @@ -23,5 +24,7 @@
23 24  
24 25 public Page<BasicConfig> findPage(MongoQuery query);
25 26 public BasicConfig getOneBasicConfigById(String id);
  27 +
  28 + public void batchSave(Collection<BasicConfig> list);
26 29 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BasicConfigDaoImpl.java View file @ 7f725b2
1 1 package com.lyms.platform.biz.dal.impl;
2 2  
  3 +import java.util.Collection;
3 4 import java.util.List;
4 5  
5 6 import com.lyms.platform.pojo.BabyModel;
... ... @@ -26,6 +27,11 @@
26 27 public void deleteBasicConfig(String id) {
27 28 delete(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery());
28 29 }
  30 +
  31 + public void batchSave(Collection<BasicConfig> list) {
  32 + batchSave(list);
  33 + }
  34 +
29 35  
30 36 public BasicConfig getBasicConfig(String id) {
31 37 return findById(id);
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java View file @ 7f725b2
1 1 package com.lyms.platform.biz.service;
2 2  
  3 +import java.util.Collection;
3 4 import java.util.List;
4 5  
5 6 import com.lyms.platform.common.enums.YnEnums;
... ... @@ -38,6 +39,10 @@
38 39 }
39 40  
40 41 return basicConfigDao.queryBasicConfig(query.addOrder(Direction.ASC, "id"));
  42 + }
  43 +
  44 + public void batchSave(Collection<BasicConfig> list) {
  45 + basicConfigDao.batchSave(list);
41 46 }
42 47  
43 48 public List<BasicConfig> queryParentConfig() {
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/VisitService.java View file @ 7f725b2
... ... @@ -34,7 +34,7 @@
34 34 query.start(visitQuery.getOffset()).end(visitQuery.getLimit());
35 35 }
36 36  
37   - return iVisitDao.queryVisit(query.addOrder(Direction.ASC, "id"));
  37 + return iVisitDao.queryVisit(query.addOrder(Direction.ASC, "days"));
38 38 }
39 39  
40 40  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java View file @ 7f725b2
... ... @@ -775,6 +775,8 @@
775 775 babyModel.setMphone(mphone);
776 776 babyModel.setMjob(mjob);
777 777 babyModel.setWeek(week);
  778 + babyModel.setOrg(org);
  779 + babyModel.setsNumber(sNumber);
778 780 return babyModel;
779 781 }
780 782  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java View file @ 7f725b2
... ... @@ -495,7 +495,7 @@
495 495 }
496 496 patients.setCardNo(cardNo);
497 497 patients.setPhone(phone);
498   - patients.setDueDate(new Date());
  498 + patients.setDueDate(DateUtil.parseYMD(dueDate));
499 499 patients.setDeliverOrg(deliverOrg);
500 500 patients.setDueType(dueType);
501 501 patients.setAddress(address);
... ... @@ -527,7 +527,7 @@
527 527 visit.setNextvisit(nextVisit);
528 528 visit.setNumOfLive(numOfLive);
529 529 visit.setOther(other);
530   -
  530 + visit.setId(id);
531 531 visit.setWound(wound);
532 532 visit.setXinType(xinType);
533 533 visit.setParentId(parentId);