jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 618dee8a76e40439b74b42c18c02d7b34995341f

Authored by liquanyu
1 parent 021b40c21b
Exists in master and in 3 other branches dev, fengning2023-06-06, luanping

两癌导出修改

Showing 4 changed files with 224 additions and 349 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 618dee8
... ... @@ -232,9 +232,9 @@
232 232 */
233 233 public BaseObjectResponse addPregnantBookbuilding(
234 234 YunBookbuildingAddRequest yunRequest, Integer uId, boolean isSync) {
235   - if (yunRequest.getBooksuifangDoctors()!=null){
236   - yunRequest.setBooksuifangDoctor(JSON.toJSONString(yunRequest.getBooksuifangDoctors()));
237   - }
  235 +// if (yunRequest.getBooksuifangDoctor()!=null){
  236 +// yunRequest.setBooksuifangDoctor(JSON.toJSONString(yunRequest.getBooksuifangDoctor()));
  237 +// }
238 238 if (StringUtils.isNotEmpty(yunRequest.getOrgName()))
239 239 {
240 240 OrganizationQuery organizationQuery = new OrganizationQuery();
... ... @@ -353,7 +353,8 @@
353 353  
354 354 patient.setNextCheckTime(DateUtil.parseYMD(yunRequest.getNextCheckTime()));
355 355 patient.setcDueWeek(yunRequest.getcDueWeek());//前端计算出来的孕周
356   - patient.setBooksuifangDoctor(yunRequest.getBooksuifangDoctor());
  356 + DoctorDTO doctorDTO = yunRequest.getBooksuifangDoctor();
  357 + patient.setBooksuifangDoctor(doctorDTO != null ? String.valueOf(doctorDTO.getId()) : null);
357 358 //承德市妇幼通过就诊卡号查询到病人id保存下来
358 359 if ("2100001291".equals(patient.getHospitalId()) && StringUtils.isNotEmpty(yunRequest.getVcCardNo())) {
359 360 patient.setBlNum(cdfyHisService.getIdByVcCardNo(yunRequest.getVcCardNo()));
... ... @@ -1219,8 +1220,8 @@
1219 1220 patient.setYyzyfmHospitalId(yunRequest.getYyzyfmHospitalId());
1220 1221 patient.setNextCheckTime(DateUtil.parseYMD(yunRequest.getNextCheckTime()));
1221 1222 patient.setcDueWeek(yunRequest.getcDueWeek());//前端计算出来的孕周
1222   -
1223   - patient.setBooksuifangDoctor(yunRequest.getBooksuifangDoctor());
  1223 + DoctorDTO doctorDTO = yunRequest.getBooksuifangDoctor();
  1224 + patient.setBooksuifangDoctor(doctorDTO != null ? String.valueOf(doctorDTO.getId()) : null);
1224 1225 patient.setModified(new Date());
1225 1226 patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), DateUtil.parseYMD(yunRequest.getBookbuildingDate())));
1226 1227 // patient.setHospitalId(autoMatchFacade.getHospitalId(userId));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java View file @ 618dee8
... ... @@ -86,116 +86,10 @@
86 86 * @return
87 87 */
88 88 public BaseResponse list(CancerScreeningRequest queryRequest, Integer id) {
89   -
90 89 //根据用户id获取医院ID
91 90 String hospitalId = autoMatchFacade.getHospitalId(id);
92   - Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId));
93   - //查询条件
94   - CancerScreeningQuery query = new CancerScreeningQuery();
95   -
96   - if (StringUtils.isNotEmpty(queryRequest.getHospitalId()))
97   - {
98   - query.setHospitalId(queryRequest.getHospitalId());
99   - }
100   - query.setYqDaysStart(queryRequest.getYqDaysStart());
101   - query.setYqDaysEnd(queryRequest.getYqDaysEnd());
102   - query.setIsFollow(queryRequest.getIsFollow());
103   - query.setLimit(queryRequest.getLimit());
104   - query.setPage(queryRequest.getPage());
105   - query.setNeed("need");
106   - query.setYn(YnEnums.YES.getId());
107   - query.setQueryNo(queryRequest.getQueryNo());
108   - if (queryRequest.getStatus() != null)
109   - {
110   - query.setStatus(queryRequest.getStatus());
111   - }
112   - if (queryRequest.getPosition() == 1)
113   - {
114   - query.setHospitalId(hospitalId);
115   - }
116   - else if (queryRequest.getPosition() == 2)
117   - {
118   - query.setOrgAreaId(organization.getAreaId());
119   - }
120   - else if (queryRequest.getPosition() == 3)
121   - {
122   - query.setOrgCityId(organization.getCityId());
123   - if(StringUtils.isNotEmpty(queryRequest.getOrgCityId()))
124   - {
125   - query.setOrgAreaId(queryRequest.getOrgAreaId());
126   - }
127   - }
128   - else if (queryRequest.getPosition() == 4)
129   - {
130   - query.setOrgProvinceId(organization.getProvinceId());
131   - if(StringUtils.isNotEmpty(queryRequest.getOrgCityId()))
132   - {
133   - query.setOrgCityId(queryRequest.getOrgCityId());
134   - }
135   - if(StringUtils.isNotEmpty(queryRequest.getOrgCityId()))
136   - {
137   - query.setOrgAreaId(queryRequest.getOrgAreaId());
138   - }
139   - }
140   - else
141   - {
142   - if(StringUtils.isNotEmpty(queryRequest.getOrgProvinceId()))
143   - {
144   - query.setOrgProvinceId(queryRequest.getOrgProvinceId());
145   - }
146   - if(StringUtils.isNotEmpty(queryRequest.getOrgCityId()))
147   - {
148   - query.setOrgCityId(queryRequest.getOrgCityId());
149   - }
150   - if(StringUtils.isNotEmpty(queryRequest.getOrgCityId()))
151   - {
152   - query.setOrgAreaId(queryRequest.getOrgAreaId());
153   - }
154   - }
155   - if (StringUtils.isNotEmpty(queryRequest.getExamineDate())) {
156   - String[] arrs = queryRequest.getExamineDate().split(" - ");
157   - Date start = DateUtil.parseYMD(arrs[0]);
158   - Date end = DateUtil.parseYMD(arrs[1]);
159   - end = DateUtil.getDayLastSecond(end);
160   - query.setStartExamineDate(start);
161   - query.setEndExamineDate(end);
162   - }
163   - if (StringUtils.isNotEmpty(queryRequest.getCheckDate())) {
164   - String[] arrs = queryRequest.getCheckDate().split(" - ");
165   - query.setCreatedStart(DateUtil.parseYMD(arrs[0]));
166   - query.setCreatedEnd(new Date(DateUtil.parseYMD(arrs[1]).getTime() + 24 * 60 * 60 * 1000 - 1));
167   - }
168   -
169   - query.setLeftRight(queryRequest.getLeftRight());
170   - query.setRxcsLevel(queryRequest.getRxcsLevel());
171   - query.setRxxLevel(queryRequest.getRxxLevel());
172   - query.setYcRxajc(queryRequest.getYcRxajc());//是否有过乳腺检查 sz ,cs ,xx
173   - query.setRxPgz(queryRequest.getRxPgz());//乳腺彩超分级左 "0" "1" ....
174   - query.setRxlPgy(queryRequest.getRxlPgy());//乳腺彩超分级右
175   -
176   - query.setProvinceId(queryRequest.getProvinceId());
177   - query.setCityId(queryRequest.getCityId());
178   - query.setAreaId(queryRequest.getAreaId());
179   - query.setStreetId(queryRequest.getStreetId());
180   - query.setRxlYyz(queryRequest.getRxlYyz());
181   - query.setRxlYyy(queryRequest.getRxlYyy());
182   - query.setRxlYdz(queryRequest.getRxlYdz());
183   - query.setRxlYdy(queryRequest.getRxlYdy());
184   - query.setRxlJcjg(queryRequest.getRxlJcjg());
185   - query.setRxlJy(queryRequest.getRxlJy());
186   - query.setRxJy(queryRequest.getRxJy());
187   - query.setSfZhzd(queryRequest.getSfZhzd());
188   - //隆化-乳腺癌检查异常
189   - query.setBreastAbnormity(queryRequest.getBreastAbnormity());
190   - //超声所见
191   - query.setNewRxCssj(queryRequest.getNewRxCssj());
192   - //隆化乳腺X钼靶检查
193   - query.setRxXJc(queryRequest.getRxXJc());
194   - //最后诊断 内容字段 yn(0未见异常,1异常);yc(异常项1-9)
195   - query.setZhJd(queryRequest.getZhJd());
196   - query.setZhzd(queryRequest.getZhzd());
  91 + CancerScreeningQuery query = getCancerScreeningQuery(queryRequest, hospitalId);
197 92 List list = new ArrayList();
198   - //System.out.println(query.convertToQuery().convertToMongoQuery());
199 93 List <CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query);
200 94 if (CollectionUtils.isNotEmpty(modelList)) {
201 95 for (CancerScreeningModel model : modelList) {
... ... @@ -314,7 +208,7 @@
314 208 public void exportLasc(CancerScreeningRequest queryRequest, Integer id, HttpServletResponse response){
315 209 List <Map <String, Object>> datas = getLascList(queryRequest, id);
316 210 Map <String, String> cnames = new LinkedHashMap <>();
317   - cnames.put("xz", "乡镇");
  211 + // cnames.put("xz", "乡镇");
318 212 cnames.put("created", "检查日期");
319 213 cnames.put("name", "姓名");
320 214 cnames.put("age", "年龄");
321 215  
322 216  
323 217  
324 218  
325 219  
326 220  
327 221  
328 222  
... ... @@ -326,76 +220,136 @@
326 220  
327 221 public List <Map <String, Object>> getLascList(CancerScreeningRequest queryRequest, Integer id) {
328 222 List <Map <String, Object>> lascList = new LinkedList <>();
329   -
330   - //获取当前用户获取对应的 乡镇列表
331 223 String hospitalId = autoMatchFacade.getHospitalId(id);
332   - Organization organization = organizationService.getOrganization(Integer.valueOf(hospitalId));
333   - List <BasicConfig> items = basicConfigService.queryByParentId(organization.getAreaId());
334   - if (CollectionUtils.isNotEmpty(items)) {
335   - for (BasicConfig item : items) {
  224 + CancerScreeningQuery query = getCancerScreeningQuery(queryRequest, hospitalId);
  225 + List <CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query);
  226 + if (CollectionUtils.isNotEmpty(modelList)) {
  227 + for (CancerScreeningModel model : modelList) {
  228 + Map <String, Object> map = new HashMap <>();
  229 + map.put("created", DateUtil.getyyyy_MM_dd(model.getCreated()));//检查日期
  230 + map.put("name", model.getUsername());//姓名
  231 + map.put("age", DateUtil.getAge(model.getBirthday()));//年龄
  232 + map.put("cardNum", model.getCertificateNum());//证件号
  233 + map.put("phone", model.getPhone());//联系方式
  234 + map.put("liveAddress", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(),
  235 + model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService));//住址
  236 + lascList.add(map);
  237 + }
  238 + }
  239 + return lascList;
  240 + }
336 241  
337   - //获取该乡镇所有的女性建档数据
338   - List <String> residentsIds = getResidentsIds(hospitalId, item);
339   - if (CollectionUtils.isNotEmpty(residentsIds)) {
340   - //查询条件
341   - CancerScreeningQuery query = new CancerScreeningQuery();
342   - query.setResidentIds(residentsIds);
343   - query.setLimit(queryRequest.getLimit());
344   - query.setPage(queryRequest.getPage());
345   - query.setNeed("need");
346   - query.setYn(YnEnums.YES.getId());
347   - query.setQueryNo(queryRequest.getQueryNo());
348   - if (hospitalId != null) {
349   - query.setHospitalId(hospitalId);
350   - }
351   - if (StringUtils.isNotEmpty(queryRequest.getCheckDate())) {
352   - String[] arrs = queryRequest.getCheckDate().split(" - ");
353   - query.setCreatedStart(DateUtil.parseYMD(arrs[0]));
354   - query.setCreatedEnd(new Date(DateUtil.parseYMD(arrs[1]).getTime() + 24 * 60 * 60 * 1000 - 1));
355   - }
  242 + private CancerScreeningQuery getCancerScreeningQuery(CancerScreeningRequest queryRequest, String hospitalId) {
356 243  
357   - query.setYcRxajc(queryRequest.getYcRxajc());//是否有过乳腺检查 sz ,cs ,xx
358   - query.setRxPgz(queryRequest.getRxPgz());//乳腺彩超分级左 "0" "1" ....
359   - query.setRxlPgy(queryRequest.getRxlPgy());//乳腺彩超分级右
  244 + Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId));
  245 + //查询条件
  246 + CancerScreeningQuery query = new CancerScreeningQuery();
360 247  
361   - query.setProvinceId(queryRequest.getProvinceId());
362   - query.setCityId(queryRequest.getCityId());
363   - query.setAreaId(queryRequest.getAreaId());
364   - query.setStreetId(queryRequest.getStreetId());
365   - query.setRxlYyz(queryRequest.getRxlYyz());
366   - query.setRxlYyy(queryRequest.getRxlYyy());
367   - query.setRxlYdz(queryRequest.getRxlYdz());
368   - query.setRxlYdy(queryRequest.getRxlYdy());
369   - query.setRxlJcjg(queryRequest.getRxlJcjg());
370   - query.setRxlJy(queryRequest.getRxlJy());
371   - query.setRxJy(queryRequest.getRxJy());
372   - query.setSfZhzd(queryRequest.getSfZhzd());
373   -
374   - System.out.println(query.convertToQuery().convertToMongoQuery());
375   - List <CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query);
376   - if (CollectionUtils.isNotEmpty(modelList)) {
377   - for (CancerScreeningModel model : modelList) {
378   - Map <String, Object> map = new HashMap <>();
379   -// map.put("id", model.getId());
380   - map.put("xz", item.getName());//乡镇
381   -// map.put("sfJcsj", DateUtil.getyyyy_MM_dd(model.getSfJcsj()));//检查日期
382   - map.put("created", DateUtil.getyyyy_MM_dd(model.getCreated()));//检查日期
383   - map.put("name", model.getUsername());//姓名
384   - map.put("age", DateUtil.getAge(model.getBirthday()));//年龄
385   - map.put("cardNum", model.getCertificateNum());//证件号
386   - map.put("phone", model.getPhone());//联系方式
387   - map.put("liveAddress", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(),
388   - model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService));//住址
389   - lascList.add(map);
390   - }
391   - }
392   -
  248 + if (StringUtils.isNotEmpty(queryRequest.getHospitalId()))
  249 + {
  250 + query.setHospitalId(queryRequest.getHospitalId());
  251 + }
  252 + query.setYqDaysStart(queryRequest.getYqDaysStart());
  253 + query.setYqDaysEnd(queryRequest.getYqDaysEnd());
  254 + query.setIsFollow(queryRequest.getIsFollow());
  255 + query.setLimit(queryRequest.getLimit());
  256 + query.setPage(queryRequest.getPage());
  257 + query.setNeed("need");
  258 + query.setYn(YnEnums.YES.getId());
  259 + query.setQueryNo(queryRequest.getQueryNo());
  260 + if (queryRequest.getStatus() != null)
  261 + {
  262 + query.setStatus(queryRequest.getStatus());
  263 + }
  264 + if (queryRequest.getPosition() != null){
  265 + if (queryRequest.getPosition() == 1)
  266 + {
  267 + query.setHospitalId(hospitalId);
  268 + }
  269 + else if (queryRequest.getPosition() == 2)
  270 + {
  271 + query.setOrgAreaId(organization.getAreaId());
  272 + }
  273 + else if (queryRequest.getPosition() == 3)
  274 + {
  275 + query.setOrgCityId(organization.getCityId());
  276 + if(StringUtils.isNotEmpty(queryRequest.getOrgCityId()))
  277 + {
  278 + query.setOrgAreaId(queryRequest.getOrgAreaId());
393 279 }
394 280 }
  281 + else if (queryRequest.getPosition() == 4)
  282 + {
  283 + query.setOrgProvinceId(organization.getProvinceId());
  284 + if(StringUtils.isNotEmpty(queryRequest.getOrgCityId()))
  285 + {
  286 + query.setOrgCityId(queryRequest.getOrgCityId());
  287 + }
  288 + if(StringUtils.isNotEmpty(queryRequest.getOrgCityId()))
  289 + {
  290 + query.setOrgAreaId(queryRequest.getOrgAreaId());
  291 + }
  292 + }
  293 + else
  294 + {
  295 + if(StringUtils.isNotEmpty(queryRequest.getOrgProvinceId()))
  296 + {
  297 + query.setOrgProvinceId(queryRequest.getOrgProvinceId());
  298 + }
  299 + if(StringUtils.isNotEmpty(queryRequest.getOrgCityId()))
  300 + {
  301 + query.setOrgCityId(queryRequest.getOrgCityId());
  302 + }
  303 + if(StringUtils.isNotEmpty(queryRequest.getOrgCityId()))
  304 + {
  305 + query.setOrgAreaId(queryRequest.getOrgAreaId());
  306 + }
  307 + }
  308 + }
395 309  
  310 + if (StringUtils.isNotEmpty(queryRequest.getExamineDate())) {
  311 + String[] arrs = queryRequest.getExamineDate().split(" - ");
  312 + Date start = DateUtil.parseYMD(arrs[0]);
  313 + Date end = DateUtil.parseYMD(arrs[1]);
  314 + end = DateUtil.getDayLastSecond(end);
  315 + query.setStartExamineDate(start);
  316 + query.setEndExamineDate(end);
396 317 }
  318 + if (StringUtils.isNotEmpty(queryRequest.getCheckDate())) {
  319 + String[] arrs = queryRequest.getCheckDate().split(" - ");
  320 + query.setCreatedStart(DateUtil.parseYMD(arrs[0]));
  321 + query.setCreatedEnd(DateUtil.getDayLastSecond(DateUtil.parseYMD(arrs[1])));
  322 + }
397 323  
398   - return lascList;
  324 + query.setLeftRight(queryRequest.getLeftRight());
  325 + query.setRxcsLevel(queryRequest.getRxcsLevel());
  326 + query.setRxxLevel(queryRequest.getRxxLevel());
  327 + query.setYcRxajc(queryRequest.getYcRxajc());//是否有过乳腺检查 sz ,cs ,xx
  328 + query.setRxPgz(queryRequest.getRxPgz());//乳腺彩超分级左 "0" "1" ....
  329 + query.setRxlPgy(queryRequest.getRxlPgy());//乳腺彩超分级右
  330 +
  331 + query.setProvinceId(queryRequest.getProvinceId());
  332 + query.setCityId(queryRequest.getCityId());
  333 + query.setAreaId(queryRequest.getAreaId());
  334 + query.setStreetId(queryRequest.getStreetId());
  335 + query.setRxlYyz(queryRequest.getRxlYyz());
  336 + query.setRxlYyy(queryRequest.getRxlYyy());
  337 + query.setRxlYdz(queryRequest.getRxlYdz());
  338 + query.setRxlYdy(queryRequest.getRxlYdy());
  339 + query.setRxlJcjg(queryRequest.getRxlJcjg());
  340 + query.setRxlJy(queryRequest.getRxlJy());
  341 + query.setRxJy(queryRequest.getRxJy());
  342 + query.setSfZhzd(queryRequest.getSfZhzd());
  343 + //隆化-乳腺癌检查异常
  344 + query.setBreastAbnormity(queryRequest.getBreastAbnormity());
  345 + //超声所见
  346 + query.setNewRxCssj(queryRequest.getNewRxCssj());
  347 + //隆化乳腺X钼靶检查
  348 + query.setRxXJc(queryRequest.getRxXJc());
  349 + //最后诊断 内容字段 yn(0未见异常,1异常);yc(异常项1-9)
  350 + query.setZhJd(queryRequest.getZhJd());
  351 + query.setZhzd(queryRequest.getZhzd());
  352 + return query;
399 353 }
400 354  
401 355  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java View file @ 618dee8
... ... @@ -52,10 +52,10 @@
52 52 private FilePathModel filePath;
53 53  
54 54 //随访医生
55   - private String booksuifangDoctor;
  55 + //private String booksuifangDoctor;
56 56  
57 57 //随访医生
58   - private DoctorDTO booksuifangDoctors;
  58 + private DoctorDTO booksuifangDoctor;
59 59  
60 60 //孕妇证件核验方式 1 自动核验 2人工核验
61 61 private String patientVerifType;
62 62  
63 63  
... ... @@ -107,20 +107,12 @@
107 107 this.level = level;
108 108 }
109 109  
110   - public String getBooksuifangDoctor() {
  110 + public DoctorDTO getBooksuifangDoctor() {
111 111 return booksuifangDoctor;
112 112 }
113 113  
114   - public void setBooksuifangDoctor(String booksuifangDoctor) {
  114 + public void setBooksuifangDoctor(DoctorDTO booksuifangDoctor) {
115 115 this.booksuifangDoctor = booksuifangDoctor;
116   - }
117   -
118   - public DoctorDTO getBooksuifangDoctors() {
119   - return booksuifangDoctors;
120   - }
121   -
122   - public void setBooksuifangDoctors(DoctorDTO booksuifangDoctors) {
123   - this.booksuifangDoctors = booksuifangDoctors;
124 116 }
125 117  
126 118 public String getAddressId() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java View file @ 618dee8
... ... @@ -145,71 +145,96 @@
145 145 */
146 146 @Override
147 147 public BaseListResponse listPage(CervicalCancerListRequest param,Integer userId) {
148   -
149 148 String hospitalId = autoMatchFacade.getHospitalId(userId);
150   - Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId));
  149 + Query query = extracted(param, hospitalId);
  150 + long count = mongoTemplate.count(query, CervicalCancerModel.class);
  151 + param.mysqlBuild((int) count);
  152 + query.skip(param.getOffset()).limit(param.getLimit());
  153 + List<CervicalCancerModel> cervicalCancerModels = mongoTemplate.find(query, CervicalCancerModel.class);
  154 + List<CervicalCancerModelResult> results = new LinkedList<>();
  155 + for (CervicalCancerModel model : cervicalCancerModels) {
  156 + CervicalCancerModelResult result = new CervicalCancerModelResult();
  157 + getOtherStr(result, model);
  158 + results.add(result);
  159 + }
  160 +
  161 +
  162 + BaseListResponse baseListResponse = new BaseListResponse();
  163 + baseListResponse.setData(results);
  164 + baseListResponse.setPageInfo(param.getPageInfo());
  165 + return baseListResponse;
  166 + }
  167 +
  168 + private Query extracted(CervicalCancerListRequest param, String hospitalId) {
151 169 Query query = new Query();
  170 +
  171 + Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId));
  172 +
152 173 boolean isCurrent = false;
153 174 if (param.getStatus() != null)
154 175 {
155 176 Criteria c = Criteria.where("position").is(param.getStatus());
156 177 query.addCriteria(c);
157 178 }
158   - if (param.getPosition() == 1)
  179 + if(param.getPosition() != null)
159 180 {
160   - isCurrent = true;
161   - Criteria c = Criteria.where("hospitalId").is(hospitalId);
162   - query.addCriteria(c);
163   - }
164   - else if (param.getPosition() == 2)
165   - {
166   - Criteria c = Criteria.where("orgAreaId").is(organization.getAreaId());
167   - query.addCriteria(c);
168   - }
169   - else if (param.getPosition() == 3)
170   - {
171   - Criteria c = Criteria.where("orgCityId").is(organization.getCityId());
172   - query.addCriteria(c);
173   - if(StringUtils.isNotEmpty(param.getOrgAreaId()))
  181 + if (param.getPosition() == 1)
174 182 {
175   - Criteria c1 = Criteria.where("orgAreaId").is(param.getOrgAreaId());
176   - query.addCriteria(c1);
  183 + isCurrent = true;
  184 + Criteria c = Criteria.where("hospitalId").is(hospitalId);
  185 + query.addCriteria(c);
177 186 }
178   - }
179   - else if (param.getPosition() == 4)
180   - {
181   - Criteria c = Criteria.where("orgProvinceId").is(organization.getProvinceId());
182   - query.addCriteria(c);
183   - if(StringUtils.isNotEmpty(param.getOrgCityId()))
  187 + else if (param.getPosition() == 2)
184 188 {
185   - Criteria c1 = Criteria.where("orgCityId").is(param.getOrgCityId());
186   - query.addCriteria(c1);
  189 + Criteria c = Criteria.where("orgAreaId").is(organization.getAreaId());
  190 + query.addCriteria(c);
187 191 }
188   - if(StringUtils.isNotEmpty(param.getOrgAreaId()))
  192 + else if (param.getPosition() == 3)
189 193 {
190   - Criteria c1 = Criteria.where("orgAreaId").is(param.getOrgAreaId());
191   - query.addCriteria(c1);
  194 + Criteria c = Criteria.where("orgCityId").is(organization.getCityId());
  195 + query.addCriteria(c);
  196 + if(StringUtils.isNotEmpty(param.getOrgAreaId()))
  197 + {
  198 + Criteria c1 = Criteria.where("orgAreaId").is(param.getOrgAreaId());
  199 + query.addCriteria(c1);
  200 + }
192 201 }
193   - }
194   - else
195   - {
196   - if(StringUtils.isNotEmpty(param.getOrgProvinceId()))
  202 + else if (param.getPosition() == 4)
197 203 {
198   - Criteria c1 = Criteria.where("orgProvinceId").is(param.getOrgProvinceId());
199   - query.addCriteria(c1);
  204 + Criteria c = Criteria.where("orgProvinceId").is(organization.getProvinceId());
  205 + query.addCriteria(c);
  206 + if(StringUtils.isNotEmpty(param.getOrgCityId()))
  207 + {
  208 + Criteria c1 = Criteria.where("orgCityId").is(param.getOrgCityId());
  209 + query.addCriteria(c1);
  210 + }
  211 + if(StringUtils.isNotEmpty(param.getOrgAreaId()))
  212 + {
  213 + Criteria c1 = Criteria.where("orgAreaId").is(param.getOrgAreaId());
  214 + query.addCriteria(c1);
  215 + }
200 216 }
201   - if(StringUtils.isNotEmpty(param.getOrgCityId()))
  217 + else
202 218 {
203   - Criteria c1 = Criteria.where("orgCityId").is(param.getOrgCityId());
204   - query.addCriteria(c1);
  219 + if(StringUtils.isNotEmpty(param.getOrgProvinceId()))
  220 + {
  221 + Criteria c1 = Criteria.where("orgProvinceId").is(param.getOrgProvinceId());
  222 + query.addCriteria(c1);
  223 + }
  224 + if(StringUtils.isNotEmpty(param.getOrgCityId()))
  225 + {
  226 + Criteria c1 = Criteria.where("orgCityId").is(param.getOrgCityId());
  227 + query.addCriteria(c1);
  228 + }
  229 + if(StringUtils.isNotEmpty(param.getOrgAreaId()))
  230 + {
  231 + Criteria c1 = Criteria.where("orgAreaId").is(param.getOrgAreaId());
  232 + query.addCriteria(c1);
  233 + }
205 234 }
206   - if(StringUtils.isNotEmpty(param.getOrgAreaId()))
207   - {
208   - Criteria c1 = Criteria.where("orgAreaId").is(param.getOrgAreaId());
209   - query.addCriteria(c1);
210   - }
211 235 }
212 236  
  237 +
213 238 if (StringUtils.isNotEmpty(param.getHospitalId()) && !isCurrent)
214 239 {
215 240 Criteria c = Criteria.where("hospitalId").is(param.getHospitalId());
216 241  
... ... @@ -277,10 +302,10 @@
277 302 query.addCriteria(Criteria.where("tbs").is(param.getTbs()));
278 303 }
279 304 if (StringUtils.isNotEmpty(param.getZhzdSelect())) {
280   - query.addCriteria(Criteria.where("zhzdSelect."+param.getZhzdSelect()).is(true));
  305 + query.addCriteria(Criteria.where("zhzdSelect."+ param.getZhzdSelect()).is(true));
281 306 }
282 307 if (StringUtils.isNotEmpty(param.getZzblxSelect())) {
283   - query.addCriteria(Criteria.where("zzblxSelect."+param.getZzblxSelect()).is(true));
  308 + query.addCriteria(Criteria.where("zzblxSelect."+ param.getZzblxSelect()).is(true));
284 309 }
285 310  
286 311 if (StringUtils.isNotEmpty(param.getHpv())) {
... ... @@ -329,22 +354,7 @@
329 354 }
330 355  
331 356 query.with(new Sort(Sort.Direction.DESC, "created"));
332   - long count = mongoTemplate.count(query, CervicalCancerModel.class);
333   - param.mysqlBuild((int) count);
334   - query.skip(param.getOffset()).limit(param.getLimit());
335   - List<CervicalCancerModel> cervicalCancerModels = mongoTemplate.find(query, CervicalCancerModel.class);
336   - List<CervicalCancerModelResult> results = new LinkedList<>();
337   - for (CervicalCancerModel model : cervicalCancerModels) {
338   - CervicalCancerModelResult result = new CervicalCancerModelResult();
339   - getOtherStr(result, model);
340   - results.add(result);
341   - }
342   -
343   -
344   - BaseListResponse baseListResponse = new BaseListResponse();
345   - baseListResponse.setData(results);
346   - baseListResponse.setPageInfo(param.getPageInfo());
347   - return baseListResponse;
  357 + return query;
348 358 }
349 359  
350 360 /**
... ... @@ -391,7 +401,7 @@
391 401 public void exportGja(CervicalCancerListRequest param,Integer userId, HttpServletResponse response) {
392 402 List <Map <String, Object>> datas = getGjaList(param, userId);
393 403 Map <String, String> cnames = new LinkedHashMap <>();
394   - cnames.put("xz", "乡镇");
  404 + //cnames.put("xz", "乡镇");
395 405 cnames.put("checkPackage", "检查套餐");
396 406 cnames.put("created", "检查日期");
397 407 cnames.put("name", "姓名");
398 408  
... ... @@ -406,105 +416,23 @@
406 416 List <Map <String, Object>> gjaList = new LinkedList <>();
407 417 //获取当前用户获取对应的 乡镇列表
408 418 String hospitalId = autoMatchFacade.getHospitalId(userId);
409   - Organization organization = organizationService.getOrganization(Integer.valueOf(hospitalId));
410   - List <BasicConfig> items = basicConfigService.queryByParentId(organization.getAreaId());
411   - if (org.apache.commons.collections.CollectionUtils.isNotEmpty(items)) {
412   - for (BasicConfig item : items) {
413   - //获取该乡镇所有的女性建档数据
414   - List <String> residentsIds = getResidentsIds(hospitalId, item);
415   -
416   - if (org.apache.commons.collections.CollectionUtils.isNotEmpty(residentsIds)) {
417   - Query query = new Query();
418   - query.addCriteria(Criteria.where("parentId").in(residentsIds));
419   -
420   - String keyword = param.getKeyword();
421   - if (StringUtils.isNotEmpty(keyword)) {
422   - Criteria c = new Criteria().orOperator(Criteria.where("name").is(keyword), Criteria.where("phone").is(keyword));
423   - query.addCriteria(c);
424   - }
425   - //承德市妇幼定制 检查套餐
426   - Integer checkPackage = param.getCheckPackage();
427   - if (null!=checkPackage) {
428   - query.addCriteria(Criteria.where("checkPackage").is(checkPackage));
429   - }
430   - String hasAcceptTreatment = param.getHasAcceptTreatment();
431   - if (StringUtils.isNotEmpty(hasAcceptTreatment)) {
432   - query.addCriteria(Criteria.where("hasAcceptTreatment").is(hasAcceptTreatment));
433   - }
434   - String idCardNo = param.getIdCardNo();
435   - if (StringUtils.isNotEmpty(idCardNo)) {
436   - query.addCriteria(Criteria.where("idCardNo").is(idCardNo));
437   - }
438   -
439   - String fklcjczd = param.getFklcjczd();//妇科检查临床诊断异常项
440   - if (StringUtils.isNotEmpty(fklcjczd)) {
441   - query.addCriteria(Criteria.where("formData.fklcjczd")
442   - .elemMatch(Criteria.where("$eq").is(Integer.parseInt(fklcjczd))));
443   - }
444   - String tBSflbz = param.gettBSflbz();//TBS分类报告结果
445   - if (StringUtils.isNotEmpty(tBSflbz)) {
446   - query.addCriteria(Criteria.where("formData.TBSflbz").is(Integer.parseInt(tBSflbz)));
447   - }
448   - String lstZD = param.getLstZD();//最后诊断异常项
449   - if (StringUtils.isNotEmpty(lstZD)) {
450   - query.addCriteria(Criteria.where("formData.lstZD")
451   - .elemMatch(Criteria.where("$eq").is(Integer.parseInt(lstZD))));
452   - }
453   - if (org.apache.commons.lang.StringUtils.isNotEmpty(param.getCheckDate())) {
454   - String[] arrs = param.getCheckDate().split(" - ");
455   - query.addCriteria(Criteria.where("created").gte(DateUtil.parseYMD(arrs[0]))
456   - .lte(new Date(DateUtil.parseYMD(arrs[1]).getTime() + 24 * 60 * 60 * 1000 - 1)));
457   - }
458   -
459   - if (org.apache.commons.lang.StringUtils.isNotEmpty(param.getCheckDate())) {
460   - String[] arrs = param.getCheckDate().split(" - ");
461   - query.addCriteria(Criteria.where("created").gte(DateUtil.parseYMD(arrs[0]))
462   - .lte(new Date(DateUtil.parseYMD(arrs[1]).getTime() + 24 * 60 * 60 * 1000 - 1)));
463   - }
464   - query.addCriteria(Criteria.where("hospitalId").is(hospitalId));
465   - String provinceId = param.getProvinceId();
466   - if (StringUtils.isNotEmpty(provinceId)) {
467   - query.addCriteria(Criteria.where("provinceId").is(provinceId));
468   - String cityId = param.getCityId();
469   - if (StringUtils.isNotEmpty(cityId)) {
470   - query.addCriteria(Criteria.where("cityId").is(cityId));
471   - String areaId = param.getAreaId();
472   - if (StringUtils.isNotEmpty(areaId)) {
473   - query.addCriteria(Criteria.where("areaId").is(areaId));
474   - String streetId = param.getStreetId();
475   - if (StringUtils.isNotEmpty(streetId)) {
476   - query.addCriteria(Criteria.where("streetId").is(streetId));
477   - }
478   - }
479   - }
480   - }
481   - query.with(new Sort(Sort.Direction.DESC, "created"));
482   - long count = mongoTemplate.count(query, CervicalCancerModel.class);
483   - param.mysqlBuild((int) count);
484   - query.skip(param.getOffset()).limit(param.getLimit());
485   - List<CervicalCancerModel> cervicalCancerModels = mongoTemplate.find(query, CervicalCancerModel.class);
486   -
487   - for (CervicalCancerModel model : cervicalCancerModels) {
488   - Map <String, Object> map = new HashMap <>();
489   - map.put("xz", item.getName());//乡镇
490   - map.put("checkPackage", null!=model.getCheckPackage()?model.getCheckPackage()==1?"宫颈癌筛查":"宫颈+B超检查":"");//检查套餐
491   - map.put("created", DateUtil.getyyyy_MM_dd(model.getCreated()));//检查日期
492   - map.put("name", model.getName());//姓名
493   - map.put("age", model.getAge());//年龄
494   - map.put("cardNum", model.getIdCardNo());//证件号
495   - map.put("phone", model.getPhone());//联系方式
496   - map.put("liveAddress", CommonsHelper.getResidence(
497   - model.getProvinceId(),model.getCityId(),
498   - model.getAreaId(),model.getStreetId(),
499   - null,basicConfigService));//住址
500   -
501   - gjaList.add(map);
502   - }
503   - }
504   -
  419 + Query query = extracted(param, hospitalId);
  420 + List<CervicalCancerModel> cervicalCancerModels = mongoTemplate.find(query, CervicalCancerModel.class);
  421 + for (CervicalCancerModel model : cervicalCancerModels) {
  422 + Map <String, Object> map = new HashMap <>();
  423 + //map.put("xz", item.getName());//乡镇
  424 + map.put("checkPackage", null!=model.getCheckPackage()?model.getCheckPackage()==1?"宫颈癌筛查":"宫颈+B超检查":"");//检查套餐
  425 + map.put("created", DateUtil.getyyyy_MM_dd(model.getCreated()));//检查日期
  426 + map.put("name", model.getName());//姓名
  427 + map.put("age", model.getAge());//年龄
  428 + map.put("cardNum", model.getIdCardNo());//证件号
  429 + map.put("phone", model.getPhone());//联系方式
  430 + map.put("liveAddress", CommonsHelper.getResidence(
  431 + model.getProvinceId(),model.getCityId(),
  432 + model.getAreaId(),model.getStreetId(),
  433 + null,basicConfigService));//住址
  434 + gjaList.add(map);
505 435 }
506   -
507   - }
508 436 return gjaList;
509 437 }
510 438