From 6c2b7862e5ae5b8b5dc808888e56b9dcf2b7aeac Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 22 Jan 2018 15:17:01 +0800 Subject: [PATCH] 1 --- .../platform/common/enums/TrackDownDateEnums.java | 42 ++++++-- .../com/lyms/platform/pojo/TrackDownRecord.java | 12 +-- .../operate/web/facade/TrackDownFacade.java | 2 +- .../operate/web/facade/TrackDownJobFacade.java | 8 +- .../web/service/impl/TrackDownServiceImpl.java | 114 +++++++++++++-------- 5 files changed, 110 insertions(+), 68 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownDateEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownDateEnums.java index 31a11aa..bdff111 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownDateEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownDateEnums.java @@ -4,17 +4,18 @@ package com.lyms.platform.common.enums; * 追访数据保存的类型 */ public enum TrackDownDateEnums { - A(1, "婚前检查"), - B(2, "怀孕建档"), - C(3, "产前检查"), - D(4, "产前筛查"), - E(5, "分娩住院"), - F(6, "产后访视"), - G(7, "产后复查"); - - TrackDownDateEnums(Integer id, String name) { + A(1, "婚前检查",2), + B(2, "怀孕建档",3), + C(3, "产前检查",5), + D(4, "产前筛查",5), + E(5, "分娩住院",6), + F(6, "产后访视",7), + G(7, "产后复查",-1); + + TrackDownDateEnums(Integer id, String name,Integer nextid) { this.id = id; this.name = name; + this.nextid=nextid; } @@ -30,9 +31,32 @@ public enum TrackDownDateEnums { } return null; } + + public static TrackDownDateEnums getEnum(Integer id) { + if(id == null) { + return null; + } + TrackDownDateEnums[] values = TrackDownDateEnums.values(); + for (TrackDownDateEnums value : values) { + if (value.getId() == id) { + return value; + } + } + return null; + } + private Integer id; + private Integer nextid; private String name; + public Integer getNextid() { + return nextid; + } + + public void setNextid(Integer nextid) { + this.nextid = nextid; + } + public Integer getId() { return id; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java index 832454d..4152119 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java @@ -43,11 +43,10 @@ public class TrackDownRecord extends BaseModel{ private Date modified; private String hospitalId; private Date created; - //这条数据的状态 + //这条数据的状态 1 显示 0不显示 private Integer status; + //数据所在的列表 private Integer trackType; - //是否还在这个列表显示 - private Integer done; public Integer getTrackType() { return trackType; @@ -193,11 +192,4 @@ public class TrackDownRecord extends BaseModel{ this.status = status; } - public Integer getDone() { - return done; - } - - public void setDone(Integer done) { - this.done = done; - } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index c894939..552226a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -140,7 +140,7 @@ public class TrackDownFacade { @Override public Map build(TrackDownRecord downRecord, MongoTemplate mongoTemplate) { Map temp = new HashMap<>(); - temp.put("id", downRecord.getId()); + temp.put("id", downRecord.getParentId()); temp.put("pid", downRecord.getPid()); temp.put("residentsArchiveId", downRecord.getParentId()); temp.put("username", downRecord.getUsername()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java index e71288c..9684bbc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java @@ -188,7 +188,7 @@ public class TrackDownJobFacade { downRecord.setAreaRegisterId(model.getAreaRegisterId()); downRecord.setStatus(1); downRecord.setTrackType(TrackDownDateEnums.E.getId()); - downRecord.setDone(0); +// downRecord.setDone(0); return downRecord; } } @@ -252,7 +252,7 @@ public class TrackDownJobFacade { downRecord.setPhone(model.getPhone()); downRecord.setStreetRegisterId(model.getStreetRegisterId()); downRecord.setAreaRegisterId(model.getAreaRegisterId()); - downRecord.setDone(0); +// downRecord.setDone(0); downRecord.setStatus(1); downRecord.setTrackType(TrackDownDateEnums.C.getId()); return downRecord; @@ -335,7 +335,7 @@ public class TrackDownJobFacade { record.setPhone(model.getPhone()); record.setHospitalId(model.getHospitalId()); record.setStatus(1); - record.setDone(0); +// record.setDone(0); record.setCardNo(model.getCertificateNum()); record.setTrackType(TrackDownDateEnums.B.getId()); return record; @@ -413,7 +413,7 @@ public class TrackDownJobFacade { record.setPhone(model.getPhone()); record.setHospitalId(model.getHospitalId()); record.setStatus(1); - record.setDone(0); +// record.setDone(0); record.setCardNo(model.getCertificateNum()); record.setTrackType(TrackDownDateEnums.A.getId()); return record; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index d315741..683844c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.service.impl; +import com.lyms.platform.biz.service.TrackDownRecordService; import com.lyms.platform.biz.service.TrackDownService; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseObjectResponse; @@ -51,23 +52,23 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS Criteria residentCriteria = new Criteria(); patientCriteria.and("yn").is(1).and("hospitalId").is(hospitalId); residentCriteria.and("yn").is(1).and("hospitalId").is(hospitalId); - if(buildStart != null && buildEnd != null) { + if (buildStart != null && buildEnd != null) { residentCriteria.and("buildDay").gte(buildStart).lt(DateUtil.addDay(buildEnd, 1)); } - if(checkStart != null && checkEnd != null) { + if (checkStart != null && checkEnd != null) { patientCriteria.and("bookbuildingDate").gte(checkStart).lt(DateUtil.addDay(checkEnd, 1)); } - if(fmStart != null && fmEnd != null) { + if (fmStart != null && fmEnd != null) { patientCriteria.and("fmDate").gte(fmStart).lt(DateUtil.addDay(fmEnd, 1)); } - if(StringUtils.isNotEmpty(key)) { + if (StringUtils.isNotEmpty(key)) { patientCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("cardNo").is(key)); residentCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("certificateNum").is(key)); } PageResult mongoPage = findMongoPage(Patients.class, Query.query(patientCriteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); List patients = (List) mongoPage.getGrid(); boolean doPage = false; - if(patients.size() >= limit) { + if (patients.size() >= limit) { patients = (List) mongoPage.getGrid(); } else { patients = mongoTemplate.find(Query.query(patientCriteria), Patients.class); @@ -92,7 +93,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("yjcount", yjCount); // 孕检次数 = 初诊 + 复诊 // 产前筛查 有产晒记录>勾勾 没有: 有产前筛查追访并且流转至下一流程 勾勾 反之xx - temp.put("cqsc", mongoTemplate.count(Query.query(Criteria.where("parentId").is(patient.getId()).and("yn").is(1)), AntExChuModel.class) > 0L ? 1 : isExitTrackDown(patient.getId(), TrackDownDateEnums.D)); + temp.put("cqsc", mongoTemplate.count(Query.query(Criteria.where("parentId").is(patient.getId()).and("yn").is(1)), AntExChuModel.class) > 0L ? 1 : isExitTrackDown(patient.getId(), TrackDownDateEnums.D)); // type=3 且（isAutoFm不为1，或者不存在）且dueStatus为0 没有: 有分娩住院追访并且流转至下一流程 勾勾 反之xx temp.put("fm", patient.getType() != null && patient.getType() == 3 && (patient.getIsAutoFm() == null || patient.getIsAutoFm() != 1) && patient.getDueStatus() != null && patient.getDueStatus() == 0 ? 1 : isExitTrackDown(patient.getId(), TrackDownDateEnums.E)); // 分娩 1=勾勾 2=叉叉 @@ -116,7 +117,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS List> archiveModelList = new ArrayList<>(); for (ResidentsArchiveModel archiveModel : residentsArchiveModels) { for (Map map : restList) { - if(StringUtils.isNotEmpty((String) map.get("cardNo")) && map.get("cardNo").toString().equals(archiveModel.getCertificateNum())) { + if (StringUtils.isNotEmpty((String) map.get("cardNo")) && map.get("cardNo").toString().equals(archiveModel.getCertificateNum())) { map.put("resident", 1); // 妇女建档 map.put("residentDate", DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay())); continue; @@ -145,9 +146,9 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS } // 处理分页 - if(restList.size() < limit) { + if (restList.size() < limit) { int count = limit - restList.size(); - if(archiveModelList.size() <= count) { + if (archiveModelList.size() <= count) { restList.addAll(archiveModelList); } else { restList.addAll(archiveModelList.subList(0, count)); @@ -192,22 +193,47 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS trackDown.setParentId(parentId); }*/ //婚前检查 怀孕建档 的时候没有pid - if(TrackDownDateEnums.A.getId()==trackDown.getTrackDownDateType()||TrackDownDateEnums.B.getId()==trackDown.getTrackDownDateType()){ - - }else { + if (TrackDownDateEnums.A.getId() != trackDown.getTrackDownDateType() || TrackDownDateEnums.B.getId() != trackDown.getTrackDownDateType()) { String parentId = mongoUtil.doHidePatient(trackDown.getParentId(), hospitalId); trackDown.setPid(mongoUtil.getPid(parentId)); trackDown.setParentId(parentId); } + String recordId=trackDown.getId(); + trackDown.setId(null); trackDown.setYn(YnEnums.YES.getId()); trackDown.setCreated(new Date()); trackDown.setHospitalId(hospitalId); trackDown.setOperaterId(userId); trackDown.setModified(new Date()); trackDownService.add(trackDown); + + updateRecordStatus(trackDown, recordId); return RespBuilder.buildSuccess(trackDown.getId()); } + /** + * 处理增加追访的时候流程扭转 + * + * @param trackDown + * @param id + */ + private void updateRecordStatus(TrackDown trackDown, String id) { + //如果是扭转到下一个流程的话就需要修改record表 + if (TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer()) { + // + TrackDownRecord trackDownRecord = new TrackDownRecord(); + trackDownRecord.setTrackType(TrackDownDateEnums.getEnum(trackDown.getTrackDownDateType()).getNextid()); + trackDownRecordService.updateTrackDown(trackDownRecord, id); + } else if (TrackDownTransferEnums.C.getId() == trackDown.getTrackDownTransfer()) { + TrackDownRecord trackDownRecord = new TrackDownRecord(); + trackDownRecord.setStatus(0); + trackDownRecordService.updateTrackDown(trackDownRecord,id); + } + } + + @Autowired + private TrackDownRecordService trackDownRecordService; + @Override public BaseObjectResponse list(String provinceId, String cityId, String areaId, String streetId, String key, Integer trackType, Integer page, Integer limit, Integer userId) { PageResult pageResult = null; @@ -216,21 +242,21 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS List> restList = new ArrayList<>(); boolean flag = false; // 判断需不需要对patients进行查询 Set parentIds = new HashSet<>(); - if(StringUtils.isNotEmpty(provinceId) || StringUtils.isNotEmpty(cityId) || StringUtils.isNotEmpty(areaId) || StringUtils.isNotEmpty(streetId) || StringUtils.isNotEmpty(key)) { + if (StringUtils.isNotEmpty(provinceId) || StringUtils.isNotEmpty(cityId) || StringUtils.isNotEmpty(areaId) || StringUtils.isNotEmpty(streetId) || StringUtils.isNotEmpty(key)) { flag = true; - if(StringUtils.isNotEmpty(provinceId)) { + if (StringUtils.isNotEmpty(provinceId)) { patientCriteria.and("provinceRegisterId").is(provinceId); } - if(StringUtils.isNotEmpty(cityId)) { + if (StringUtils.isNotEmpty(cityId)) { patientCriteria.and("cityRegisterId").is(cityId); } - if(StringUtils.isNotEmpty(areaId)) { + if (StringUtils.isNotEmpty(areaId)) { patientCriteria.and("areaRegisterId").is(areaId); } - if(StringUtils.isNotEmpty(streetId)) { + if (StringUtils.isNotEmpty(streetId)) { patientCriteria.and("streetRegisterId").is(streetId); } - if(StringUtils.isNotEmpty(key)) { + if (StringUtils.isNotEmpty(key)) { patientCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("cardNo").is(key)); } List patients = mongoTemplate.find(Query.query(patientCriteria.and("yn").is(1).and("hospitalId").is(hospitalId)), Patients.class); @@ -239,18 +265,18 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS } } - if(trackType == TrackDownDateEnums.A.getId()) { + if (trackType == TrackDownDateEnums.A.getId()) { Criteria c = new Criteria(); - if(StringUtils.isNotEmpty(provinceId)) { + if (StringUtils.isNotEmpty(provinceId)) { c.and("provinceId").is(provinceId); } - if(StringUtils.isNotEmpty(cityId)) { + if (StringUtils.isNotEmpty(cityId)) { c.and("cityId").is(cityId); } - if(StringUtils.isNotEmpty(areaId)) { + if (StringUtils.isNotEmpty(areaId)) { c.and("areaId").is(areaId); } - if(StringUtils.isNotEmpty(streetId)) { + if (StringUtils.isNotEmpty(streetId)) { c.and("streetId").is(streetId); } List trackDowns = mongoTemplate.find(Query.query(Criteria.where("yn").is(1).and("trackDownTransfer").in(Arrays.asList(2, 3)) @@ -297,7 +323,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("yycjDate", ""); /** 预约产检日期 */ temp.put("cjzfDate", ""); /** 产检追访时间 */ TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("yn").is(1).and("parentId").is(patient.getId())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); - if(trackDown != null) { + if (trackDown != null) { temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); // 婚检追访结果 temp.put("result", getResultByType(trackType, patient.getId(), new Sort(Sort.Direction.DESC, "created"))); // 婚检追访结果 temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); // 追访时间 @@ -307,7 +333,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("trackDownTime", "--"); // 追访时间 temp.put("yyTime", "--"); // 预约时间 } - if(trackType == TrackDownDateEnums.G.getId()) {// 产后复查 + if (trackType == TrackDownDateEnums.G.getId()) {// 产后复查 /** 复查次数 */ temp.put("fcNum", mongoTemplate.count(Query.query(Criteria.where("parentId").is(patient.getId()).and("trackDownDateType").is(TrackDownDateEnums.G.getId()).and("yn").is(1)), TrackDown.class)); temp.put("fmDate", DateUtil.getyyyy_MM_dd(patient.getFmDate())); @@ -320,12 +346,12 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS /** 生产方式 */ temp.put("scType", FmTypeEnums.getFmNameById2(patient.getFmType())); - } else if(trackType == TrackDownDateEnums.C.getId()) { + } else if (trackType == TrackDownDateEnums.C.getId()) { } restList.add(temp); } Criteria trackDowncCriteria = new Criteria(); - if(flag) { + if (flag) { trackDowncCriteria.and("parentId").in(parentIds); } // trackDowncCriteria.and("yn").is(1).and("trackDownTransfer").in(Arrays.asList(2, 3)).and("hospitalId").is(hospitalId); @@ -337,17 +363,17 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS private String getResultByType(Integer type, String parentId, Sort sort) { Query query = Query.query(Criteria.where("yn").is(1).and("parentId").is(parentId).and("trackDownDateType").is(type)); - if(sort != null) { + if (sort != null) { query.with(sort); } TrackDown t = mongoTemplate.findOne(query, TrackDown.class); - return (t == null || StringUtils.isEmpty(t.getResult()) ? "--" : t.getResult()); + return (t == null || StringUtils.isEmpty(t.getResult()) ? "--" : t.getResult()); } @Override public BaseObjectResponse info(String patientId, Integer trackType) { List> tabList = new ArrayList<>(); - if(trackType == 0) { + if (trackType == 0) { List trackDowns = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); List> hqjcList = new ArrayList<>(); // 婚前检查 List> hyjdList = new ArrayList<>(); // 怀孕建档 @@ -364,19 +390,19 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); temp.put("reservatDate", DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); temp.put("trackDownTransfer", trackDown.getTrackDownTransfer()); - if(TrackDownDateEnums.A.getId().equals(trackDown.getTrackDownDateType())) { + if (TrackDownDateEnums.A.getId().equals(trackDown.getTrackDownDateType())) { hqjcList.add(temp); - } else if(TrackDownDateEnums.B.getId().equals(trackDown.getTrackDownDateType())) { + } else if (TrackDownDateEnums.B.getId().equals(trackDown.getTrackDownDateType())) { hyjdList.add(temp); - } else if(TrackDownDateEnums.C.getId().equals(trackDown.getTrackDownDateType())) { + } else if (TrackDownDateEnums.C.getId().equals(trackDown.getTrackDownDateType())) { cqjcList.add(temp); - } else if(TrackDownDateEnums.D.getId().equals(trackDown.getTrackDownDateType())) { + } else if (TrackDownDateEnums.D.getId().equals(trackDown.getTrackDownDateType())) { cqscList.add(temp); - } else if(TrackDownDateEnums.E.getId().equals(trackDown.getTrackDownDateType())) { + } else if (TrackDownDateEnums.E.getId().equals(trackDown.getTrackDownDateType())) { zyfmList.add(temp); - } else if(TrackDownDateEnums.F.getId().equals(trackDown.getTrackDownDateType())) { + } else if (TrackDownDateEnums.F.getId().equals(trackDown.getTrackDownDateType())) { chfsList.add(temp); - } else if(TrackDownDateEnums.G.getId().equals(trackDown.getTrackDownDateType())) { + } else if (TrackDownDateEnums.G.getId().equals(trackDown.getTrackDownDateType())) { chfcList.add(temp); } } @@ -389,7 +415,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("trackDownUser", StringUtils.isEmpty(trackDown.getTrackDownUserId()) ? "--" : trackDown.getTrackDownUserId()); temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownType())); temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); - temp.put("reservatDate", trackDown.getReservatDate() == null ? "--" :DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); + temp.put("reservatDate", trackDown.getReservatDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); tabList.add(temp); } return RespBuilder.buildSuccess(tabList); @@ -408,7 +434,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS Patients patients = mongoTemplate.findById(parentId, Patients.class); String hospitalId = autoMatchFacade.getHospitalId(userId); Map map = new HashMap<>(); - if(patients != null) { + if (patients != null) { map.put("username", patients.getUsername()); map.put("phone", patients.getPhone()); map.put("cardNo", patients.getCardNo()); @@ -419,19 +445,19 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS map.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate())); TrackDown tc = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").is(TrackDownDateEnums.E.getId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); - if(tc != null) { + if (tc != null) { map.put("reservatDate", DateUtil.getyyyy_MM_dd(tc.getReservatDate())); /** 预约住院日期 */ } map.put("fcCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").is(TrackDownDateEnums.G.getId()).and("yn").is(1)), TrackDown.class)); /** 复查次数 */ map.put("checkCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("hospitalId").is(hospitalId)), AntenatalExaminationModel.class) + mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId)), AntExChuModel.class)); /** 本院产检次数 */ AntenatalExaminationModel examinationModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), AntenatalExaminationModel.class); - if(examinationModel != null) { + if (examinationModel != null) { map.put("checkTime", DateUtil.getyyyy_MM_dd(examinationModel.getCheckDate())); /** 产检日期 */ map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(examinationModel.getNextCheckTime())); /** 预约产检日期 */ } else { AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), AntExChuModel.class); - if(antExChuModel != null) { + if (antExChuModel != null) { map.put("checkTime", DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime())); /** 产检日期 */ map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(antExChuModel.getNextCheckTime())); /** 预约产检日期 */ } else { @@ -495,8 +521,8 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS cnames.put("result", "追访结果"); } - List> results = new ArrayList<>(); - if(org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) { + List> results = new ArrayList<>(); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) { int i = 0; for (Map data : datas) { Map result = new LinkedHashMap<>(); -- 1.8.3.1