jiangjiazhi / regional-platform

Download as
Browse Code »

Commit cc412de20c96802bfc4557e0a7160e4f6d789c44

Authored by yangfei
2 parents 3a6ba2d0cf 0a9d234138
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java View file @ cc412de
... ... @@ -285,23 +285,33 @@
285 285 * <p/>
286 286 * 完成婚检流程并没有建档
287 287 */
288   - class HYTrackDownDataLoader implements TrackDownDataLoader<ResidentsArchiveModel> {
  288 + class HYTrackDownDataLoader implements TrackDownDataLoader<PremaritalCheckup> {
289 289  
290 290 @Override
291 291 public void execute() {
292 292 int page = 0;
293   - List<ResidentsArchiveModel> data = null;
  293 + List<PremaritalCheckup> data = null;
294 294 do {
295   - ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
  295 + /* ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
296 296 archiveQuery.setYn(YnEnums.YES.getId());
297 297 archiveQuery.setSort("created asc");
298 298 archiveQuery.setNeed("1");
299 299 archiveQuery.setPage(page);
300   - archiveQuery.setLimit(limit);
  300 + archiveQuery.setLimit(limit);*/
  301 +
  302 + PremaritalCheckupQuery premaritalCheckupQuery = new PremaritalCheckupQuery();
  303 + premaritalCheckupQuery.setYn(YnEnums.YES.getId());
  304 + premaritalCheckupQuery.setSexType(1);
  305 + premaritalCheckupQuery.setSort("created asc");
  306 + premaritalCheckupQuery.setNeed("1");
  307 + premaritalCheckupQuery.setPage(page);
  308 + premaritalCheckupQuery.setLimit(limit);
  309 + data= premaritalCheckupService.queryPremaritalCheckup(premaritalCheckupQuery);
  310 +
301 311 //查询妇女建档
302   - data = residentsArchiveService.queryResident(archiveQuery);
  312 +// data = residentsArchiveService.queryResident(archiveQuery);
303 313 if (CollectionUtils.isNotEmpty(data)) {
304   - for (ResidentsArchiveModel model : data) {
  314 + for (PremaritalCheckup model : data) {
305 315 handOneByOne(model);
306 316 }
307 317 }
... ... @@ -310,7 +320,7 @@
310 320 }
311 321  
312 322 @Override
313   - public void handOneByOne(ResidentsArchiveModel model) {
  323 + public void handOneByOne(PremaritalCheckup model) {
314 324 PatientsQuery patientsQuery1 = new PatientsQuery();
315 325 patientsQuery1.setCardNo(model.getCertificateNum());
316 326 patientsQuery1.setPcerteTypeId(model.getCertificateTypeId());
317 327  
318 328  
319 329  
... ... @@ -318,24 +328,31 @@
318 328 Integer count = patientsService.queryPatientCount(patientsQuery1);
319 329 if (null != count && count == 0) {
320 330 logger.info("HYTrackDownDataLoader addTrackDown by id :" + model.getId());
321   - downRecordService.addTrackDown(build(model));
  331 + TrackDownRecord down= build(model);
  332 + if(null!=down){
  333 + downRecordService.addTrackDown(down);
  334 + }
322 335 }
323 336 }
324 337  
325 338 @Override
326   - public TrackDownRecord build(ResidentsArchiveModel model) {
  339 + public TrackDownRecord build(PremaritalCheckup model) {
  340 + if(StringUtils.isEmpty(model.getParentId())){
  341 + return null;
  342 + }
327 343 TrackDownRecord record = new TrackDownRecord();
328 344 record.setParentId(model.getId());
329   - record.setAddressRegister(model.getAddressRegister());
330   - record.setAreaRegisterId(model.getAreaRegisterId());
331   - record.setBirth(model.getBirthday());
332   - record.setCityRegisterId(model.getCityRegisterId());
333   - record.setUsername(model.getUsername());
334   - record.setStreetRegisterId(model.getStreetRegisterId());
335   - record.setPhone(model.getPhone());
  345 +
  346 + ResidentsArchiveModel resid = residentsArchiveService.getResident(model.getParentId());
  347 + record.setAddressRegister(resid.getAddressRegister());
  348 + record.setAreaRegisterId(resid.getAreaRegisterId());
  349 + record.setBirth(resid.getBirthday());
  350 + record.setCityRegisterId(resid.getCityRegisterId());
  351 + record.setUsername(resid.getUsername());
  352 + record.setStreetRegisterId(resid.getStreetRegisterId());
  353 + record.setPhone(resid.getPhone());
336 354 record.setHospitalId(model.getHospitalId());
337 355 record.setStatus(1);
338   -// record.setDone(0);
339 356 record.setCardNo(model.getCertificateNum());
340 357 record.setTrackType(TrackDownDateEnums.B.getId());
341 358 return record;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ cc412de
... ... @@ -17,6 +17,7 @@
17 17 import com.lyms.platform.operate.web.utils.ResponseUtil;
18 18 import com.lyms.platform.permission.dao.master.CouponMapper;
19 19 import com.lyms.platform.pojo.*;
  20 +import com.lyms.platform.query.TrackDownRecordQuery;
20 21 import org.springframework.beans.factory.annotation.Autowired;
21 22 import org.springframework.data.domain.Sort;
22 23 import org.springframework.data.mongodb.core.MongoTemplate;
... ... @@ -222,8 +223,19 @@
222 223 if (TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer()) {
223 224 //
224 225 TrackDownRecord trackDownRecord = new TrackDownRecord();
225   - trackDownRecord.setTrackType(TrackDownDateEnums.getEnum(trackDown.getTrackDownDateType()).getNextid());
226   - trackDownRecordService.updateTrackDown(trackDownRecord, id);
  226 + Integer nextId=TrackDownDateEnums.getEnum(trackDown.getTrackDownDateType()).getNextid();
  227 +
  228 + TrackDownRecordQuery trackDownRecordQuery = new TrackDownRecordQuery();
  229 + trackDownRecordQuery.setParentId(trackDown.getParentId());
  230 + trackDownRecordQuery.setTrackType(nextId);
  231 + //如果需要进入的列表没有这个人的记录
  232 + if(0==trackDownRecordService.queryTrackDownCount(trackDownRecordQuery)){
  233 + trackDownRecord.setTrackType(nextId);
  234 + trackDownRecordService.updateTrackDown(trackDownRecord, id);
  235 + }else {
  236 + trackDownRecord.setStatus(0);
  237 + trackDownRecordService.updateTrackDown(trackDownRecord,id);
  238 + }
227 239 } else if (TrackDownTransferEnums.C.getId() == trackDown.getTrackDownTransfer()) {
228 240 TrackDownRecord trackDownRecord = new TrackDownRecord();
229 241 trackDownRecord.setStatus(0);