jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 08eebbacd0a4a585619cf917f6d10a4f877d9817

Authored by jiangjiazhi
1 parent c3ed464afd
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

产妇增加字段

Showing 2 changed files with 33 additions and 8 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ 08eebba
... ... @@ -44,6 +44,8 @@
44 44 return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, "id"));
45 45 }
46 46  
  47 +
  48 +
47 49 public int queryPatientCount(PatientsQuery patientsQuery) {
48 50 return iPatientDao.queryPatientCount(patientsQuery.convertToQuery());
49 51 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 08eebba
... ... @@ -7,6 +7,7 @@
7 7 import com.lyms.platform.common.enums.YnEnums;
8 8 import com.lyms.platform.common.result.BaseObjectResponse;
9 9 import com.lyms.platform.common.result.BaseResponse;
  10 +import com.lyms.platform.common.utils.DateUtil;
10 11 import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
11 12 import com.lyms.platform.operate.web.request.MatDeliverQueryRequest;
12 13 import com.lyms.platform.operate.web.result.MatDeliverListResult;
... ... @@ -22,6 +23,7 @@
22 23 import org.springframework.stereotype.Component;
23 24  
24 25 import java.util.ArrayList;
  26 +import java.util.Date;
25 27 import java.util.List;
26 28  
27 29 /**
... ... @@ -49,7 +51,7 @@
49 51 */
50 52 public BaseResponse addOrUpdateMatDeliver(MatDeliverAddRequest deliverAddRequest) {
51 53 //增加
52   - if (StringUtils.isEmpty(deliverAddRequest.getId())&&StringUtils.isNotEmpty(deliverAddRequest.getParentId())) {
  54 + if (StringUtils.isEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) {
53 55 MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel();
54 56 //获取到小孩信息
55 57 List<MatDeliverAddRequest.Baby> list = deliverAddRequest.getBabies();
56 58  
... ... @@ -58,10 +60,16 @@
58 60 PatientsQuery patientsQuery = new PatientsQuery();
59 61 patientsQuery.setId(parentId);
60 62 List<Patients> patients = patientsService.queryPatient(patientsQuery);
  63 +
61 64 if (CollectionUtils.isNotEmpty(list)) {
62 65 String userName = "";
63 66 if (CollectionUtils.isNotEmpty(patients)) {
64 67 userName = patients.get(0).getUsername();
  68 + if (null != deliverAddRequest.getDueDate()) {
  69 + Date fmDate = DateUtil.parseYMD(deliverAddRequest.getDueDate());
  70 + patients.get(0).setFmDate(fmDate);
  71 + patientsService.updatePatient(patients.get(0));
  72 + }
65 73 }
66 74  
67 75 for (MatDeliverAddRequest.Baby baby : list) {
68 76  
69 77  
70 78  
71 79  
72 80  
73 81  
... ... @@ -71,28 +79,43 @@
71 79 babyIds.add(babyService.addOneBaby(babyModel).getId());
72 80 }
73 81 }
  82 +
74 83 maternalDeliverModel.setBaby(babyIds);
75 84 matDeliverService.addMatDeliver(maternalDeliverModel);
76   - //修改
77   - }else if(StringUtils.isNotEmpty(deliverAddRequest.getId())&&StringUtils.isNotEmpty(deliverAddRequest.getParentId())){
  85 + //修改
  86 + } else if (StringUtils.isNotEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) {
78 87 MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel();
79 88  
80   - matDeliverService.updateOne(maternalDeliverModel,maternalDeliverModel.getId());
  89 + matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId());
81 90 //获取到小孩信息
82 91 List<MatDeliverAddRequest.Baby> list = deliverAddRequest.getBabies();
83 92 //修改小孩信息
84   - if(CollectionUtils.isNotEmpty(list)){
  93 + if (CollectionUtils.isNotEmpty(list)) {
85 94 for (MatDeliverAddRequest.Baby baby : list) {
86 95 BabyModel babyModel = baby.convertToDataModel();
87   - if(StringUtils.isNotEmpty(babyModel.getId())){
88   - babyService.updateOneBaby(babyModel,babyModel.getId());
  96 + if (StringUtils.isNotEmpty(babyModel.getId())) {
  97 + babyService.updateOneBaby(babyModel, babyModel.getId());
89 98 }
90 99 }
91 100 }
92   - }else{
  101 + if (null != deliverAddRequest.getDueDate()) {
  102 + Date fmDate = DateUtil.parseYMD(deliverAddRequest.getDueDate());
  103 + PatientsQuery patientsQuery = new PatientsQuery();
  104 + patientsQuery.setId(deliverAddRequest.getParentId());
  105 + List<Patients> patients = patientsService.queryPatient(patientsQuery);
  106 + if (CollectionUtils.isNotEmpty(patients)) {
  107 + patients.get(0).setFmDate(fmDate);
  108 + patientsService.updatePatient(patients.get(0));
  109 + }
  110 + }
  111 + } else {
93 112 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("parentId 为空,找不到产妇");
94 113 }
95 114 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  115 + }
  116 +
  117 + public void updateFmDate() {
  118 +
96 119 }
97 120  
98 121 /**