jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 1f1b16825fab7e11535033f9d39e916565c4b655

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

好

Showing 4 changed files with 111 additions and 12 deletions

platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java View file @ 1f1b168
... ... @@ -6,6 +6,8 @@
6 6 import com.lyms.platform.common.dao.operator.MongoOper;
7 7 import com.lyms.platform.common.dao.operator.MongoQuery;
8 8  
  9 +import java.util.Date;
  10 +
9 11 /**
10 12 *
11 13 * 产妇分娩记录查询
... ... @@ -18,6 +20,34 @@
18 20 private String vcCardNo;
19 21 private String cardNo;
20 22 private String pid;
  23 + private Date createdStart;
  24 + private Date endStart;
  25 + private String dueDate;
  26 +
  27 + public String getDueDate() {
  28 + return dueDate;
  29 + }
  30 +
  31 + public void setDueDate(String dueDate) {
  32 + this.dueDate = dueDate;
  33 + }
  34 +
  35 + public Date getCreatedStart() {
  36 + return createdStart;
  37 + }
  38 +
  39 + public void setCreatedStart(Date createdStart) {
  40 + this.createdStart = createdStart;
  41 + }
  42 +
  43 + public Date getEndStart() {
  44 + return endStart;
  45 + }
  46 +
  47 + public void setEndStart(Date endStart) {
  48 + this.endStart = endStart;
  49 + }
  50 +
21 51 /**
22 52 * 是否有效
23 53 */
... ... @@ -42,6 +72,9 @@
42 72 }
43 73 if(null!=vcCardNo){
44 74 condition=condition.and("vcCardNo",vcCardNo,MongoOper.IS);
  75 + }
  76 + if(null!=dueDate){
  77 + condition=condition.and("dueDate",dueDate,MongoOper.IS);
45 78 }
46 79 if(null!=cardNo) {
47 80 condition = condition.and("cardNo", cardNo, MongoOper.IS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 1f1b168
... ... @@ -606,7 +606,7 @@
606 606 if (null != postReviewModel.getHospitalId()) {
607 607 organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId()));
608 608 }
609   - listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(0).getFmDate()));
  609 + listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(patientses.size()-1).getFmDate()));
610 610 }
611 611 }
612 612 sortList.add(listData);
... ... @@ -650,7 +650,7 @@
650 650 if (null != postReviewModel.getHospitalId()) {
651 651 organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId()));
652 652 }
653   - listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(0).getFmDate()));
  653 + listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(patientses.size()-1).getFmDate()));
654 654 }
655 655 }
656 656 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 1f1b168
... ... @@ -115,6 +115,21 @@
115 115 if (CollectionUtils.isNotEmpty(list2)) {
116 116 return new BaseResponse().setErrormsg("您已分娩").setErrorcode(ErrorCodeConstants.DATA_EXIST);
117 117 }
  118 + Patients patients2= patientsService.findOnePatientById(deliverAddRequest.getParentId());
  119 + matDeliverQuery.setDueDate(deliverAddRequest.getDueDate());
  120 + matDeliverQuery.setParentId(null);
  121 + matDeliverQuery.setPid(patients2.getPid());
  122 + list2 = matDeliverService.query(matDeliverQuery);
  123 +
  124 + StopPregQuery stopPregQuery = new StopPregQuery();
  125 + stopPregQuery.setYn(YnEnums.YES.getId());
  126 + stopPregQuery.setStopDate(deliverAddRequest.getDueDate());
  127 + stopPregQuery.setPid(patients2.getPid());
  128 + List<StopPregModel> models = stopPregnancyService.queryStopPreg(stopPregQuery);
  129 +
  130 + if (CollectionUtils.isNotEmpty(list2) || CollectionUtils.isNotEmpty(models)) {
  131 + return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次分娩/终止妊娠");
  132 + }
118 133 MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel();
119 134 //获取到小孩信息
120 135 List<MatDeliverAddRequest.Baby> list = deliverAddRequest.getBabies();
121 136  
122 137  
... ... @@ -171,14 +186,32 @@
171 186 sieveQuery.setParentId(deliverAddRequest.getParentId());
172 187 sieveQuery.setYn(YnEnums.YES.getId());
173 188 sieveQuery.setHospitalId(hospitalId);*/
174   - sieveService.deleteSieve(deliverAddRequest.getParentId(),hospitalId,null);
  189 + sieveService.deleteSieve(deliverAddRequest.getParentId(), hospitalId, null);
175 190  
176 191 maternalDeliverModel.setYn(YnEnums.YES.getId());
177 192 matDeliverService.addMatDeliver(maternalDeliverModel);
178 193 //修改
179 194 } else if (StringUtils.isNotEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) {
180 195 MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel();
  196 + MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
181 197  
  198 + Patients patients2= patientsService.findOnePatientById(deliverAddRequest.getParentId());
  199 + matDeliverQuery.setPid(patients2.getPid());
  200 + matDeliverQuery.setYn(YnEnums.YES.getId());
  201 + matDeliverQuery.setDueDate(deliverAddRequest.getDueDate());
  202 + List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery);
  203 +
  204 + StopPregQuery stopPregQuery = new StopPregQuery();
  205 + stopPregQuery.setYn(YnEnums.YES.getId());
  206 + stopPregQuery.setStopDate(deliverAddRequest.getDueDate());
  207 + stopPregQuery.setPid(patients2.getPid());
  208 + List<StopPregModel> models = stopPregnancyService.queryStopPreg(stopPregQuery);
  209 +
  210 + if (CollectionUtils.isNotEmpty(list2) || CollectionUtils.isNotEmpty(models)) {
  211 + return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次分娩/终止妊娠");
  212 + }
  213 +
  214 +
182 215 //获取到小孩信息
183 216 List<MatDeliverAddRequest.Baby> list = deliverAddRequest.getBabies();
184 217 //修改小孩信息
... ... @@ -358,10 +391,10 @@
358 391 List babyName = buildBabyName(list);
359 392 int i = 0;
360 393  
361   - Map map = deliverAddRequest.getDeliveryMode();
362   - String fmfs=null;
363   - if(!map.isEmpty()){
364   - fmfs = map.get("fmfs").toString();
  394 + Map map = deliverAddRequest.getDeliveryMode();
  395 + String fmfs = null;
  396 + if (!map.isEmpty()) {
  397 + fmfs = map.get("fmfs").toString();
365 398 }
366 399 for (MatDeliverAddRequest.Baby baby : list) {
367 400 MaternalDeliverModel.Baby baby1 = baby.convertToDataModel();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java View file @ 1f1b168
... ... @@ -15,10 +15,7 @@
15 15 import com.lyms.platform.permission.model.UsersQuery;
16 16 import com.lyms.platform.permission.service.UsersService;
17 17 import com.lyms.platform.pojo.*;
18   -import com.lyms.platform.query.AntExChuQuery;
19   -import com.lyms.platform.query.PatientsQuery;
20   -import com.lyms.platform.query.PersonModelQuery;
21   -import com.lyms.platform.query.StopPregQuery;
  18 +import com.lyms.platform.query.*;
22 19 import org.apache.commons.collections.CollectionUtils;
23 20 import org.springframework.beans.factory.annotation.Autowired;
24 21 import org.springframework.stereotype.Component;
25 22  
... ... @@ -54,8 +51,9 @@
54 51 private SieveService sieveService;
55 52 @Autowired
56 53 private AutoMatchFacade autoMatchFacade;
  54 + @Autowired
  55 + private MatDeliverService matDeliverService;
57 56  
58   -
59 57 /**
60 58 * 更新终止妊娠
61 59 * @param request
... ... @@ -72,6 +70,24 @@
72 70 patientsQuery.setPid(request.getPid());
73 71 patientsQuery.setDueStatus(1);
74 72  
  73 +
  74 + MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
  75 +
  76 + matDeliverQuery.setPid(request.getPid());
  77 + matDeliverQuery.setYn(YnEnums.YES.getId());
  78 + matDeliverQuery.setDueDate(request.getStopDate());
  79 + List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery);
  80 +
  81 + StopPregQuery stopPregQuery = new StopPregQuery();
  82 + stopPregQuery.setYn(YnEnums.YES.getId());
  83 + stopPregQuery.setStopDate(request.getStopDate());
  84 + stopPregQuery.setPid(request.getPid());
  85 + List<StopPregModel> models = stopPregnancyService.queryStopPreg(stopPregQuery);
  86 +
  87 + if (CollectionUtils.isNotEmpty(list2) || CollectionUtils.isNotEmpty(models)) {
  88 + return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次分娩/终止妊娠");
  89 + }
  90 +
75 91 List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
76 92 if (CollectionUtils.isNotEmpty(patients)) {
77 93  
... ... @@ -117,6 +133,23 @@
117 133 List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
118 134 if (CollectionUtils.isNotEmpty(patients))
119 135 {
  136 +
  137 + MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
  138 +
  139 + matDeliverQuery.setPid(request.getPid());
  140 + matDeliverQuery.setYn(YnEnums.YES.getId());
  141 + matDeliverQuery.setDueDate(request.getStopDate());
  142 + List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery);
  143 +
  144 + StopPregQuery stopPregQuery = new StopPregQuery();
  145 + stopPregQuery.setYn(YnEnums.YES.getId());
  146 + stopPregQuery.setStopDate(request.getStopDate());
  147 + stopPregQuery.setPid(request.getPid());
  148 + List<StopPregModel> models = stopPregnancyService.queryStopPreg(stopPregQuery);
  149 +
  150 + if (CollectionUtils.isNotEmpty(list2) || CollectionUtils.isNotEmpty(models)) {
  151 + return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次分娩/终止妊娠");
  152 + }
120 153  
121 154 for (Patients patient : patients)
122 155 {