jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b5546ca24299410abe1b8ff6ee21bc2d274a71d0

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

儿童高危因素

Showing 3 changed files with 40 additions and 4 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportItemModel.java View file @ b5546ca
... ... @@ -13,6 +13,8 @@
13 13 // 项目名称
14 14 private String name;
15 15 // 项目结果
  16 + private String result2;
  17 + // 项目结果
16 18 private String result;
17 19 // 高低标志
18 20 private String resultFlag;
... ... @@ -136,6 +138,14 @@
136 138  
137 139 public void setPrintOrder(String printOrder) {
138 140 this.printOrder = printOrder;
  141 + }
  142 +
  143 + public String getResult2() {
  144 + return result2;
  145 + }
  146 +
  147 + public void setResult2(String result2) {
  148 + this.result2 = result2;
139 149 }
140 150  
141 151 @Override
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ b5546ca
... ... @@ -1310,6 +1310,16 @@
1310 1310 BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id);
1311 1311 List<PatientSerResult> patientSerResults = (List<PatientSerResult>) baseResponse.getObject();
1312 1312 result.setPatientSerResults(patientSerResults);
  1313 +
  1314 + if (!isBuild && StringUtils.isNotEmpty(model.getParentId()))
  1315 + {
  1316 + Patients patients = patientsService.findOnePatientById(model.getParentId());
  1317 + if (patients != null)
  1318 + {
  1319 + List<Map<String,Object>> riskList = mongoUtil.findColor(patients.getRiskFactorId());
  1320 + result.setmHighRiskReason(riskList);
  1321 + }
  1322 + }
1313 1323 }
1314 1324  
1315 1325 /** 优惠券编号 */
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ b5546ca
... ... @@ -1353,6 +1353,15 @@
1353 1353 patientsQuery.setLimit(patientManagerRequest.getLimit());
1354 1354 patientsQuery.setPage(patientManagerRequest.getPage());
1355 1355 }
  1356 +
  1357 + if (null != patientManagerRequest.getStartAge() && null != patientManagerRequest.getEndAge()) {
  1358 + Date start = DateUtil.getBeforeAge(patientManagerRequest.getStartAge());
  1359 + Date end = DateUtil.getBeforeAge(patientManagerRequest.getEndAge());
  1360 + patientsQuery.setStartAge(start);
  1361 + patientsQuery.setEndAge(end);
  1362 + }
  1363 +
  1364 +
1356 1365 //排查本院隐藏建档
1357 1366 patientsQuery.setExtEnable(false);
1358 1367 patientsQuery.setBuildTypeNot(1);
... ... @@ -1488,6 +1497,14 @@
1488 1497 patientsQuery.setLimit(patientManagerRequest.getLimit());
1489 1498 patientsQuery.setPage(patientManagerRequest.getPage());
1490 1499 }
  1500 +
  1501 + if (null != patientManagerRequest.getStartAge() && null != patientManagerRequest.getEndAge()) {
  1502 + Date start = DateUtil.getBeforeAge(patientManagerRequest.getStartAge());
  1503 + Date end = DateUtil.getBeforeAge(patientManagerRequest.getEndAge());
  1504 + patientsQuery.setStartAge(start);
  1505 + patientsQuery.setEndAge(end);
  1506 + }
  1507 +
1491 1508 //排查本院隐藏建档
1492 1509 patientsQuery.setExtEnable(false);
1493 1510 patientsQuery.setBuildTypeNot(1);
... ... @@ -1544,10 +1561,9 @@
1544 1561 AntExChuQuery antExChuQuery = new AntExChuQuery();//获取初诊记录
1545 1562 antExChuQuery.setParentId(patients.getId());
1546 1563 List<AntExChuModel> antExChulist = antExService.queryAntExChu(antExChuQuery);
1547   - if(antExChulist.size()!=0){
1548   - AntExChuModel data = antExService.findOne(antExChulist.get(0).getId());
1549   - Integer prodTime= data.getProdTime()+ 1;
1550   - healthHandbookExcelModel.setChildTime(data == null ? "" : (data.getProdTime() == null ? "" : prodTime.toString()));
  1564 + if(CollectionUtils.isNotEmpty(antExChulist)){
  1565 + AntExChuModel data = antExChulist.get(0);
  1566 + healthHandbookExcelModel.setChildTime(data == null ? "" : (data.getProdTime() == null ? "" : data.getProdTime().toString()));
1551 1567 }else {
1552 1568 healthHandbookExcelModel.setChildTime("");
1553 1569 }