jiangjiazhi / regional-platform

Download as
Browse Code »

Commit e66566405b794d9f3d8b9516f96100964dc2fea3

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

高危因数统计

Showing 4 changed files with 15 additions and 2 deletions

platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java View file @ e665664
... ... @@ -163,6 +163,8 @@
163 163 babyCheckBase.setForeignId(babyCheckModel.getId());
164 164 babyCheckBase.setNextDate(babyCheckModel.getNextDate());
165 165 babyCheckBase.setModified(babyCheckModel.getModified());
  166 + //根据规则完善儿保套餐（处理老数据，没有儿保月龄套餐）
  167 + babyCheckModel.distOldTcType(babyModel);
166 168 babyCheckBase.setTcType(babyCheckModel.getTcType());
167 169 return babyCheckBase;
168 170 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ e665664
... ... @@ -1609,7 +1609,7 @@
1609 1609 // 没传入医院id
1610 1610 // 先判断是否传入了传条件
1611 1611 // 未传入查询条件
1612   - if (StringUtils.isEmpty(childbirthManagerRequest.getHospitalProvinceId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalProvinceId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalAreaId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalId())) {
  1612 + if (StringUtils.isEmpty(childbirthManagerRequest.getHospitalProvinceId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalCityId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalAreaId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalId())) {
1613 1613 hospitalList.add(autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId()));
1614 1614 DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
1615 1615 dataPermissionsModelQuery.setUserId(childbirthManagerRequest.getOperatorId());
... ... @@ -1698,6 +1698,7 @@
1698 1698 // 这里就设置分页内容
1699 1699 childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
1700 1700 } else {//否则按常规查询
  1701 + // System.out.println("分娩查询条件："+matDeliverQuery.convertToQuery().convertToMongoQuery());
1701 1702 maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
1702 1703 }
1703 1704 // System.out.println("分娩表查询："+matDeliverQuery.convertToQuery().convertToMongoQuery());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java View file @ e665664
... ... @@ -158,7 +158,15 @@
158 158 query.setLastCheckEmployeeId(patientsQuery.getLastCheckEmployeeId());
159 159 query.setDueDateStart(patientsQuery.getDueDateStart());
160 160 query.setDueDateEnd(patientsQuery.getDueDateEnd());
161   -
  161 + //最后一次检查时间
  162 + if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getLastCTime())) {
  163 + String nextDateStr = riskPatientsQueryRequest.getLastCTime();
  164 + String[] dates = nextDateStr.split(" - ");
  165 + query.setLastCTimeStart(DateUtil.parseYMD(dates[0]));
  166 + if (dates.length == 2) {
  167 + query.setLastCTimeEnd(DateUtil.parseYMD(dates[1]));
  168 + }
  169 + }
162 170 query.setBookbuildingDateStart(patientsQuery.getBookbuildingDateStart());
163 171 query.setBookbuildingDateEnd(patientsQuery.getBookbuildingDateEnd());
164 172 query.setNotoRiskFactor("");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java View file @ e665664
... ... @@ -71,6 +71,8 @@
71 71 for (BasicConfig config : configs) {
72 72 PatientsQuery query = new PatientsQuery();
73 73 query.setYn(YnEnums.YES.getId());
  74 + query.setLastCTimeStart(patientsQuery.getLastCTimeStart());
  75 + query.setLastCTimeEnd(patientsQuery.getLastCTimeEnd());
74 76 query.setBuildTypeList(patientsQuery.getBuildTypeList());
75 77 query.setHospitalId(patientsQuery.getHospitalId());
76 78 query.setDueStatus(patientsQuery.getDueStatus());