jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d4e4332de6793273b4d8d031b8d712e72d827076

Authored by wangbo
1 parent e689a98070
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

产筛修改

Showing 4 changed files with 35 additions and 43 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java View file @ d4e4332
... ... @@ -116,8 +116,11 @@
116 116 public BaseResponse list(HttpServletRequest request,
117 117 @RequestParam(value = "page") Integer page,
118 118 @RequestParam(value = "limit") Integer limit,
119   - DischargeSummaryRequest dischargeSummaryRequest) {
120   - return dischargeAbstractFacade.list(page, limit, getUserId(request), dischargeSummaryRequest);
  119 + @RequestParam(value = "LeaveHospitalDate") String leaveHospitalDate,
  120 + @RequestParam(value = "queryNo") String queryNo,
  121 + @RequestParam(value = "postpartumDays") Integer postpartumDays,
  122 + @RequestParam(value = "FmDate") String fmDate) {
  123 + return dischargeAbstractFacade.list(page, limit, getUserId(request), leaveHospitalDate, postpartumDays, fmDate, queryNo);
121 124 }
122 125 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ d4e4332
... ... @@ -319,6 +319,20 @@
319 319 antExQuery.setId(antExAddRequest.getId());
320 320 List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
321 321 operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), list.get(0), model, OptActionEnums.UPDATE.getId(), "修改复诊");
  322 + /**
  323 + * 承德区域 产筛状态修改
  324 + * */
  325 + if (null != antExAddRequest.getScreeningState() && StringUtils.isNotEmpty(antExAddRequest.getParentId())) {
  326 + SieveQuery sieveQuery = new SieveQuery();
  327 + sieveQuery.setYn(YnEnums.YES.getId());
  328 + sieveQuery.setParentId(antExAddRequest.getParentId());
  329 + List<SieveModel> sieveModels = sieveDao.queryList(sieveQuery.convertToQuery());
  330 + for (SieveModel sieveModel : sieveModels) {
  331 + sieveModel.setStatus(antExAddRequest.getScreeningState());
  332 + sieveDao.updateChanQianSieve(sieveModel);
  333 + }
  334 + }
  335 +
322 336 } else {
323 337 model.setOperator(userId);
324 338 model.setYn(YnEnums.YES.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java View file @ d4e4332
... ... @@ -396,21 +396,27 @@
396 396 return new BaseResponse().setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setErrorcode(ErrorCodeConstants.SUCCESS);
397 397 }
398 398  
399   - public BaseResponse list(Integer page, Integer limit, Integer userId, DischargeSummaryRequest dischargeSummaryRequest) {
  399 + public BaseResponse list(Integer page, Integer limit, Integer userId, String leaveHospitalDate, Integer postpartumDays, String fmDate, String queryNo) {
400 400 List<String> hospital = groupsFacade.findGroupHospital(userId, false);
401 401 Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
402 402 Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
403 403 boolean flag = false;
404   - if (StringUtils.isNotEmpty(dischargeSummaryRequest.getStartLeaveHospital()) && StringUtils.isNotEmpty(dischargeSummaryRequest.getEndLeaveHospiital())) {
405   -
  404 + if (StringUtils.isNotEmpty(queryNo)) {
  405 + pCriteria.orOperator(Criteria.where("cardNo").is(queryNo),
  406 + Criteria.where("username").is(queryNo), Criteria.where("phone").is(queryNo)
  407 + , Criteria.where("vcCardNo").is(queryNo));
  408 + flag = true;
406 409 }
  410 + if (StringUtils.isNotEmpty(fmDate) && StringUtils.isNotEmpty(fmDate)) {
407 411  
  412 +
  413 + }
408 414 if (flag) {
409   - List<DischargeAbstractMotherModel> discharge = mongoTemplate.find(Query.query(pCriteria), DischargeAbstractMotherModel.class);
  415 + List<Patients> patients = mongoTemplate.find(Query.query(pCriteria), Patients.class);
410 416 List<String> ids = new ArrayList<>();
411   - if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(discharge)) {
412   - for (DischargeAbstractMotherModel dischargeAbstract : discharge) {
413   - ids.add(dischargeAbstract.getId());
  417 + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(patients)) {
  418 + for (Patients patients1 : patients) {
  419 + ids.add(patients1.getId());
414 420 }
415 421 }
416 422 criteria.and("_id").in(ids);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeSummaryRequest.java View file @ d4e4332
... ... @@ -2,33 +2,16 @@
2 2  
3 3 public class DischargeSummaryRequest {
4 4  
5   - private String startLeaveHospital;
6   - private String endLeaveHospiital;
  5 + private String LeaveHospitalDate;
7 6  
  7 +
8 8 private String queryNo;//查询号
9 9  
10 10 private Integer postpartumDays;
11 11  
12   - private String startFmDate;
  12 + private String FmDate;
13 13  
14   - private String endFmDate;
15 14  
16   - public String getStartLeaveHospital() {
17   - return startLeaveHospital;
18   - }
19   -
20   - public void setStartLeaveHospital(String startLeaveHospital) {
21   - this.startLeaveHospital = startLeaveHospital;
22   - }
23   -
24   - public String getEndLeaveHospiital() {
25   - return endLeaveHospiital;
26   - }
27   -
28   - public void setEndLeaveHospiital(String endLeaveHospiital) {
29   - this.endLeaveHospiital = endLeaveHospiital;
30   - }
31   -
32 15 public String getQueryNo() {
33 16 return queryNo;
34 17 }
35 18  
... ... @@ -45,20 +28,6 @@
45 28 this.postpartumDays = postpartumDays;
46 29 }
47 30  
48   - public String getStartFmDate() {
49   - return startFmDate;
50   - }
51 31  
52   - public void setStartFmDate(String startFmDate) {
53   - this.startFmDate = startFmDate;
54   - }
55   -
56   - public String getEndFmDate() {
57   - return endFmDate;
58   - }
59   -
60   - public void setEndFmDate(String endFmDate) {
61   - this.endFmDate = endFmDate;
62   - }
63 32 }