fangcheng / regional-platform

Download as
Browse Code »

Commit 4be8248e788faad629b2e3422779d6891b8d01a0

Authored by liquanyu
1 parent 80d62430ed
Exists in master and in 1 other branch nobuildprocess

高危

Showing 2 changed files with 18 additions and 19 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java View file @ 4be8248
... ... @@ -117,25 +117,9 @@
117 117 {
118 118 continue;
119 119 }
120   -
121   - PatientsQuery query = new PatientsQuery();
122   - query.setYn(YnEnums.YES.getId());
123   - query.setBuildTypeList(patientsQuery.getBuildTypeList());
124   - query.setHospitalId(patientsQuery.getHospitalId());
125   - query.setDueStatus(patientsQuery.getDueStatus());
126   - //高危等级
127   - query.setrLevel(patientsQuery.getrLevel());
128   - //产检医生
129   - query.setLastCheckEmployeeId(patientsQuery.getLastCheckEmployeeId());
130   - query.setDueDateStart(patientsQuery.getDueDateStart());
131   - query.setDueDateEnd(patientsQuery.getDueDateEnd());
132   -
133   - query.setBookbuildingDateStart(patientsQuery.getBookbuildingDateStart());
134   - query.setBookbuildingDateEnd(patientsQuery.getBookbuildingDateEnd());
135   -
136 120 Callable c = new HiskCountTask( basicConfigService,
137 121 patientsService, levelConfig,
138   - query,
  122 + patientsQuery,
139 123 allPatientCount);
140 124 Future f = pool.submit(c);
141 125 futures.add(f);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java View file @ 4be8248
... ... @@ -74,9 +74,24 @@
74 74 List<RiskReportResult> datas = new ArrayList<>();
75 75  
76 76 for (BasicConfig config : configs) {
77   - patientsQuery.setrFactor(config.getId());
  77 + PatientsQuery query = new PatientsQuery();
  78 + query.setYn(YnEnums.YES.getId());
  79 + query.setBuildTypeList(patientsQuery.getBuildTypeList());
  80 + query.setHospitalId(patientsQuery.getHospitalId());
  81 + query.setDueStatus(patientsQuery.getDueStatus());
  82 + //高危等级
  83 + query.setrLevel(patientsQuery.getrLevel());
  84 + //产检医生
  85 + query.setLastCheckEmployeeId(patientsQuery.getLastCheckEmployeeId());
  86 + query.setDueDateStart(patientsQuery.getDueDateStart());
  87 + query.setDueDateEnd(patientsQuery.getDueDateEnd());
  88 +
  89 + query.setBookbuildingDateStart(patientsQuery.getBookbuildingDateStart());
  90 + query.setBookbuildingDateEnd(patientsQuery.getBookbuildingDateEnd());
  91 +
  92 + query.setrFactor(config.getId());
78 93 //单个高危因素孕产妇条数
79   - int riskPatientCount = patientsService.queryPatientCount(patientsQuery);
  94 + int riskPatientCount = patientsService.queryPatientCount(query);
80 95 if (riskPatientCount > 0)
81 96 {
82 97 RiskReportResult risk = new RiskReportResult();