jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6c2b7862e5ae5b8b5dc808888e56b9dcf2b7aeac

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

1

Showing 5 changed files with 110 additions and 68 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownDateEnums.java View file @ 6c2b786
... ... @@ -4,17 +4,18 @@
4 4 * 追访数据保存的类型
5 5 */
6 6 public enum TrackDownDateEnums {
7   - A(1, "婚前检查"),
8   - B(2, "怀孕建档"),
9   - C(3, "产前检查"),
10   - D(4, "产前筛查"),
11   - E(5, "分娩住院"),
12   - F(6, "产后访视"),
13   - G(7, "产后复查");
  7 + A(1, "婚前检查",2),
  8 + B(2, "怀孕建档",3),
  9 + C(3, "产前检查",5),
  10 + D(4, "产前筛查",5),
  11 + E(5, "分娩住院",6),
  12 + F(6, "产后访视",7),
  13 + G(7, "产后复查",-1);
14 14  
15   - TrackDownDateEnums(Integer id, String name) {
  15 + TrackDownDateEnums(Integer id, String name,Integer nextid) {
16 16 this.id = id;
17 17 this.name = name;
  18 + this.nextid=nextid;
18 19 }
19 20  
20 21  
21 22  
22 23  
... ... @@ -30,8 +31,31 @@
30 31 }
31 32 return null;
32 33 }
  34 +
  35 + public static TrackDownDateEnums getEnum(Integer id) {
  36 + if(id == null) {
  37 + return null;
  38 + }
  39 + TrackDownDateEnums[] values = TrackDownDateEnums.values();
  40 + for (TrackDownDateEnums value : values) {
  41 + if (value.getId() == id) {
  42 + return value;
  43 + }
  44 + }
  45 + return null;
  46 + }
  47 +
33 48 private Integer id;
  49 + private Integer nextid;
34 50 private String name;
  51 +
  52 + public Integer getNextid() {
  53 + return nextid;
  54 + }
  55 +
  56 + public void setNextid(Integer nextid) {
  57 + this.nextid = nextid;
  58 + }
35 59  
36 60 public Integer getId() {
37 61 return id;
platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java View file @ 6c2b786
... ... @@ -43,11 +43,10 @@
43 43 private Date modified;
44 44 private String hospitalId;
45 45 private Date created;
46   - //这条数据的状态
  46 + //这条数据的状态 1 显示 0不显示
47 47 private Integer status;
  48 + //数据所在的列表
48 49 private Integer trackType;
49   - //是否还在这个列表显示
50   - private Integer done;
51 50  
52 51 public Integer getTrackType() {
53 52 return trackType;
... ... @@ -193,12 +192,5 @@
193 192 this.status = status;
194 193 }
195 194  
196   - public Integer getDone() {
197   - return done;
198   - }
199   -
200   - public void setDone(Integer done) {
201   - this.done = done;
202   - }
203 195 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ 6c2b786
... ... @@ -140,7 +140,7 @@
140 140 @Override
141 141 public Map build(TrackDownRecord downRecord, MongoTemplate mongoTemplate) {
142 142 Map<String, Object> temp = new HashMap<>();
143   - temp.put("id", downRecord.getId());
  143 + temp.put("id", downRecord.getParentId());
144 144 temp.put("pid", downRecord.getPid());
145 145 temp.put("residentsArchiveId", downRecord.getParentId());
146 146 temp.put("username", downRecord.getUsername());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java View file @ 6c2b786
... ... @@ -188,7 +188,7 @@
188 188 downRecord.setAreaRegisterId(model.getAreaRegisterId());
189 189 downRecord.setStatus(1);
190 190 downRecord.setTrackType(TrackDownDateEnums.E.getId());
191   - downRecord.setDone(0);
  191 +// downRecord.setDone(0);
192 192 return downRecord;
193 193 }
194 194 }
... ... @@ -252,7 +252,7 @@
252 252 downRecord.setPhone(model.getPhone());
253 253 downRecord.setStreetRegisterId(model.getStreetRegisterId());
254 254 downRecord.setAreaRegisterId(model.getAreaRegisterId());
255   - downRecord.setDone(0);
  255 +// downRecord.setDone(0);
256 256 downRecord.setStatus(1);
257 257 downRecord.setTrackType(TrackDownDateEnums.C.getId());
258 258 return downRecord;
... ... @@ -335,7 +335,7 @@
335 335 record.setPhone(model.getPhone());
336 336 record.setHospitalId(model.getHospitalId());
337 337 record.setStatus(1);
338   - record.setDone(0);
  338 +// record.setDone(0);
339 339 record.setCardNo(model.getCertificateNum());
340 340 record.setTrackType(TrackDownDateEnums.B.getId());
341 341 return record;
... ... @@ -413,7 +413,7 @@
413 413 record.setPhone(model.getPhone());
414 414 record.setHospitalId(model.getHospitalId());
415 415 record.setStatus(1);
416   - record.setDone(0);
  416 +// record.setDone(0);
417 417 record.setCardNo(model.getCertificateNum());
418 418 record.setTrackType(TrackDownDateEnums.A.getId());
419 419 return record;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ 6c2b786
1 1 package com.lyms.platform.operate.web.service.impl;
2 2  
  3 +import com.lyms.platform.biz.service.TrackDownRecordService;
3 4 import com.lyms.platform.biz.service.TrackDownService;
4 5 import com.lyms.platform.common.enums.*;
5 6 import com.lyms.platform.common.result.BaseObjectResponse;
6 7  
7 8  
8 9  
9 10  
... ... @@ -51,23 +52,23 @@
51 52 Criteria residentCriteria = new Criteria();
52 53 patientCriteria.and("yn").is(1).and("hospitalId").is(hospitalId);
53 54 residentCriteria.and("yn").is(1).and("hospitalId").is(hospitalId);
54   - if(buildStart != null && buildEnd != null) {
  55 + if (buildStart != null && buildEnd != null) {
55 56 residentCriteria.and("buildDay").gte(buildStart).lt(DateUtil.addDay(buildEnd, 1));
56 57 }
57   - if(checkStart != null && checkEnd != null) {
  58 + if (checkStart != null && checkEnd != null) {
58 59 patientCriteria.and("bookbuildingDate").gte(checkStart).lt(DateUtil.addDay(checkEnd, 1));
59 60 }
60   - if(fmStart != null && fmEnd != null) {
  61 + if (fmStart != null && fmEnd != null) {
61 62 patientCriteria.and("fmDate").gte(fmStart).lt(DateUtil.addDay(fmEnd, 1));
62 63 }
63   - if(StringUtils.isNotEmpty(key)) {
  64 + if (StringUtils.isNotEmpty(key)) {
64 65 patientCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("cardNo").is(key));
65 66 residentCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("certificateNum").is(key));
66 67 }
67 68 PageResult mongoPage = findMongoPage(Patients.class, Query.query(patientCriteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
68 69 List<Patients> patients = (List<Patients>) mongoPage.getGrid();
69 70 boolean doPage = false;
70   - if(patients.size() >= limit) {
  71 + if (patients.size() >= limit) {
71 72 patients = (List<Patients>) mongoPage.getGrid();
72 73 } else {
73 74 patients = mongoTemplate.find(Query.query(patientCriteria), Patients.class);
... ... @@ -92,7 +93,7 @@
92 93 temp.put("yjcount", yjCount); // 孕检次数 = 初诊 + 复诊
93 94  
94 95 // 产前筛查 有产晒记录>勾勾 没有: 有产前筛查追访并且流转至下一流程 勾勾 反之xx
95   - 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));
  96 + 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));
96 97  
97 98 // type=3 且（isAutoFm不为1，或者不存在）且dueStatus为0 没有: 有分娩住院追访并且流转至下一流程 勾勾 反之xx
98 99 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 @@
116 117 List<Map<String, Object>> archiveModelList = new ArrayList<>();
117 118 for (ResidentsArchiveModel archiveModel : residentsArchiveModels) {
118 119 for (Map<String, Object> map : restList) {
119   - if(StringUtils.isNotEmpty((String) map.get("cardNo")) && map.get("cardNo").toString().equals(archiveModel.getCertificateNum())) {
  120 + if (StringUtils.isNotEmpty((String) map.get("cardNo")) && map.get("cardNo").toString().equals(archiveModel.getCertificateNum())) {
120 121 map.put("resident", 1); // 妇女建档
121 122 map.put("residentDate", DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay()));
122 123 continue;
123 124  
... ... @@ -145,9 +146,9 @@
145 146 }
146 147  
147 148 // 处理分页
148   - if(restList.size() < limit) {
  149 + if (restList.size() < limit) {
149 150 int count = limit - restList.size();
150   - if(archiveModelList.size() <= count) {
  151 + if (archiveModelList.size() <= count) {
151 152 restList.addAll(archiveModelList);
152 153 } else {
153 154 restList.addAll(archiveModelList.subList(0, count));
154 155  
155 156  
156 157  
... ... @@ -192,22 +193,47 @@
192 193 trackDown.setParentId(parentId);
193 194 }*/
194 195 //婚前检查 怀孕建档 的时候没有pid
195   - if(TrackDownDateEnums.A.getId()==trackDown.getTrackDownDateType()||TrackDownDateEnums.B.getId()==trackDown.getTrackDownDateType()){
196   -
197   - }else {
  196 + if (TrackDownDateEnums.A.getId() != trackDown.getTrackDownDateType() || TrackDownDateEnums.B.getId() != trackDown.getTrackDownDateType()) {
198 197 String parentId = mongoUtil.doHidePatient(trackDown.getParentId(), hospitalId);
199 198 trackDown.setPid(mongoUtil.getPid(parentId));
200 199 trackDown.setParentId(parentId);
201 200 }
  201 + String recordId=trackDown.getId();
  202 + trackDown.setId(null);
202 203 trackDown.setYn(YnEnums.YES.getId());
203 204 trackDown.setCreated(new Date());
204 205 trackDown.setHospitalId(hospitalId);
205 206 trackDown.setOperaterId(userId);
206 207 trackDown.setModified(new Date());
207 208 trackDownService.add(trackDown);
  209 +
  210 + updateRecordStatus(trackDown, recordId);
208 211 return RespBuilder.buildSuccess(trackDown.getId());
209 212 }
210 213  
  214 + /**
  215 + * 处理增加追访的时候流程扭转
  216 + *
  217 + * @param trackDown
  218 + * @param id
  219 + */
  220 + private void updateRecordStatus(TrackDown trackDown, String id) {
  221 + //如果是扭转到下一个流程的话就需要修改record表
  222 + if (TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer()) {
  223 + //
  224 + TrackDownRecord trackDownRecord = new TrackDownRecord();
  225 + trackDownRecord.setTrackType(TrackDownDateEnums.getEnum(trackDown.getTrackDownDateType()).getNextid());
  226 + trackDownRecordService.updateTrackDown(trackDownRecord, id);
  227 + } else if (TrackDownTransferEnums.C.getId() == trackDown.getTrackDownTransfer()) {
  228 + TrackDownRecord trackDownRecord = new TrackDownRecord();
  229 + trackDownRecord.setStatus(0);
  230 + trackDownRecordService.updateTrackDown(trackDownRecord,id);
  231 + }
  232 + }
  233 +
  234 + @Autowired
  235 + private TrackDownRecordService trackDownRecordService;
  236 +
211 237 @Override
212 238 public BaseObjectResponse list(String provinceId, String cityId, String areaId, String streetId, String key, Integer trackType, Integer page, Integer limit, Integer userId) {
213 239 PageResult pageResult = null;
214 240  
215 241  
216 242  
217 243  
218 244  
... ... @@ -216,21 +242,21 @@
216 242 List<Map<String, Object>> restList = new ArrayList<>();
217 243 boolean flag = false; // 判断需不需要对patients进行查询
218 244 Set<String> parentIds = new HashSet<>();
219   - if(StringUtils.isNotEmpty(provinceId) || StringUtils.isNotEmpty(cityId) || StringUtils.isNotEmpty(areaId) || StringUtils.isNotEmpty(streetId) || StringUtils.isNotEmpty(key)) {
  245 + if (StringUtils.isNotEmpty(provinceId) || StringUtils.isNotEmpty(cityId) || StringUtils.isNotEmpty(areaId) || StringUtils.isNotEmpty(streetId) || StringUtils.isNotEmpty(key)) {
220 246 flag = true;
221   - if(StringUtils.isNotEmpty(provinceId)) {
  247 + if (StringUtils.isNotEmpty(provinceId)) {
222 248 patientCriteria.and("provinceRegisterId").is(provinceId);
223 249 }
224   - if(StringUtils.isNotEmpty(cityId)) {
  250 + if (StringUtils.isNotEmpty(cityId)) {
225 251 patientCriteria.and("cityRegisterId").is(cityId);
226 252 }
227   - if(StringUtils.isNotEmpty(areaId)) {
  253 + if (StringUtils.isNotEmpty(areaId)) {
228 254 patientCriteria.and("areaRegisterId").is(areaId);
229 255 }
230   - if(StringUtils.isNotEmpty(streetId)) {
  256 + if (StringUtils.isNotEmpty(streetId)) {
231 257 patientCriteria.and("streetRegisterId").is(streetId);
232 258 }
233   - if(StringUtils.isNotEmpty(key)) {
  259 + if (StringUtils.isNotEmpty(key)) {
234 260 patientCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("cardNo").is(key));
235 261 }
236 262 List<Patients> patients = mongoTemplate.find(Query.query(patientCriteria.and("yn").is(1).and("hospitalId").is(hospitalId)), Patients.class);
237 263  
238 264  
239 265  
240 266  
... ... @@ -239,18 +265,18 @@
239 265 }
240 266 }
241 267  
242   - if(trackType == TrackDownDateEnums.A.getId()) {
  268 + if (trackType == TrackDownDateEnums.A.getId()) {
243 269 Criteria c = new Criteria();
244   - if(StringUtils.isNotEmpty(provinceId)) {
  270 + if (StringUtils.isNotEmpty(provinceId)) {
245 271 c.and("provinceId").is(provinceId);
246 272 }
247   - if(StringUtils.isNotEmpty(cityId)) {
  273 + if (StringUtils.isNotEmpty(cityId)) {
248 274 c.and("cityId").is(cityId);
249 275 }
250   - if(StringUtils.isNotEmpty(areaId)) {
  276 + if (StringUtils.isNotEmpty(areaId)) {
251 277 c.and("areaId").is(areaId);
252 278 }
253   - if(StringUtils.isNotEmpty(streetId)) {
  279 + if (StringUtils.isNotEmpty(streetId)) {
254 280 c.and("streetId").is(streetId);
255 281 }
256 282 List<TrackDown> trackDowns = mongoTemplate.find(Query.query(Criteria.where("yn").is(1).and("trackDownTransfer").in(Arrays.asList(2, 3))
... ... @@ -297,7 +323,7 @@
297 323 temp.put("yycjDate", ""); /** 预约产检日期 */
298 324 temp.put("cjzfDate", ""); /** 产检追访时间 */
299 325 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);
300   - if(trackDown != null) {
  326 + if (trackDown != null) {
301 327 temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); // 婚检追访结果
302 328 temp.put("result", getResultByType(trackType, patient.getId(), new Sort(Sort.Direction.DESC, "created"))); // 婚检追访结果
303 329 temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); // 追访时间
... ... @@ -307,7 +333,7 @@
307 333 temp.put("trackDownTime", "--"); // 追访时间
308 334 temp.put("yyTime", "--"); // 预约时间
309 335 }
310   - if(trackType == TrackDownDateEnums.G.getId()) {// 产后复查
  336 + if (trackType == TrackDownDateEnums.G.getId()) {// 产后复查
311 337 /** 复查次数 */
312 338 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));
313 339 temp.put("fmDate", DateUtil.getyyyy_MM_dd(patient.getFmDate()));
314 340  
... ... @@ -320,12 +346,12 @@
320 346 /** 生产方式 */
321 347 temp.put("scType", FmTypeEnums.getFmNameById2(patient.getFmType()));
322 348  
323   - } else if(trackType == TrackDownDateEnums.C.getId()) {
  349 + } else if (trackType == TrackDownDateEnums.C.getId()) {
324 350 }
325 351 restList.add(temp);
326 352 }
327 353 Criteria trackDowncCriteria = new Criteria();
328   - if(flag) {
  354 + if (flag) {
329 355 trackDowncCriteria.and("parentId").in(parentIds);
330 356 }
331 357 // trackDowncCriteria.and("yn").is(1).and("trackDownTransfer").in(Arrays.asList(2, 3)).and("hospitalId").is(hospitalId);
332 358  
333 359  
... ... @@ -337,17 +363,17 @@
337 363  
338 364 private String getResultByType(Integer type, String parentId, Sort sort) {
339 365 Query query = Query.query(Criteria.where("yn").is(1).and("parentId").is(parentId).and("trackDownDateType").is(type));
340   - if(sort != null) {
  366 + if (sort != null) {
341 367 query.with(sort);
342 368 }
343 369 TrackDown t = mongoTemplate.findOne(query, TrackDown.class);
344   - return (t == null || StringUtils.isEmpty(t.getResult()) ? "--" : t.getResult());
  370 + return (t == null || StringUtils.isEmpty(t.getResult()) ? "--" : t.getResult());
345 371 }
346 372  
347 373 @Override
348 374 public BaseObjectResponse info(String patientId, Integer trackType) {
349 375 List<Map<String, Object>> tabList = new ArrayList<>();
350   - if(trackType == 0) {
  376 + if (trackType == 0) {
351 377 List<TrackDown> trackDowns = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
352 378 List<Map<String, Object>> hqjcList = new ArrayList<>(); // 婚前检查
353 379 List<Map<String, Object>> hyjdList = new ArrayList<>(); // 怀孕建档
354 380  
355 381  
356 382  
357 383  
358 384  
359 385  
... ... @@ -364,19 +390,19 @@
364 390 temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult());
365 391 temp.put("reservatDate", DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));
366 392 temp.put("trackDownTransfer", trackDown.getTrackDownTransfer());
367   - if(TrackDownDateEnums.A.getId().equals(trackDown.getTrackDownDateType())) {
  393 + if (TrackDownDateEnums.A.getId().equals(trackDown.getTrackDownDateType())) {
368 394 hqjcList.add(temp);
369   - } else if(TrackDownDateEnums.B.getId().equals(trackDown.getTrackDownDateType())) {
  395 + } else if (TrackDownDateEnums.B.getId().equals(trackDown.getTrackDownDateType())) {
370 396 hyjdList.add(temp);
371   - } else if(TrackDownDateEnums.C.getId().equals(trackDown.getTrackDownDateType())) {
  397 + } else if (TrackDownDateEnums.C.getId().equals(trackDown.getTrackDownDateType())) {
372 398 cqjcList.add(temp);
373   - } else if(TrackDownDateEnums.D.getId().equals(trackDown.getTrackDownDateType())) {
  399 + } else if (TrackDownDateEnums.D.getId().equals(trackDown.getTrackDownDateType())) {
374 400 cqscList.add(temp);
375   - } else if(TrackDownDateEnums.E.getId().equals(trackDown.getTrackDownDateType())) {
  401 + } else if (TrackDownDateEnums.E.getId().equals(trackDown.getTrackDownDateType())) {
376 402 zyfmList.add(temp);
377   - } else if(TrackDownDateEnums.F.getId().equals(trackDown.getTrackDownDateType())) {
  403 + } else if (TrackDownDateEnums.F.getId().equals(trackDown.getTrackDownDateType())) {
378 404 chfsList.add(temp);
379   - } else if(TrackDownDateEnums.G.getId().equals(trackDown.getTrackDownDateType())) {
  405 + } else if (TrackDownDateEnums.G.getId().equals(trackDown.getTrackDownDateType())) {
380 406 chfcList.add(temp);
381 407 }
382 408 }
... ... @@ -389,7 +415,7 @@
389 415 temp.put("trackDownUser", StringUtils.isEmpty(trackDown.getTrackDownUserId()) ? "--" : trackDown.getTrackDownUserId());
390 416 temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownType()));
391 417 temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult());
392   - temp.put("reservatDate", trackDown.getReservatDate() == null ? "--" :DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));
  418 + temp.put("reservatDate", trackDown.getReservatDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));
393 419 tabList.add(temp);
394 420 }
395 421 return RespBuilder.buildSuccess(tabList);
... ... @@ -408,7 +434,7 @@
408 434 Patients patients = mongoTemplate.findById(parentId, Patients.class);
409 435 String hospitalId = autoMatchFacade.getHospitalId(userId);
410 436 Map<String, Object> map = new HashMap<>();
411   - if(patients != null) {
  437 + if (patients != null) {
412 438 map.put("username", patients.getUsername());
413 439 map.put("phone", patients.getPhone());
414 440 map.put("cardNo", patients.getCardNo());
415 441  
416 442  
... ... @@ -419,19 +445,19 @@
419 445 map.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate()));
420 446  
421 447 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);
422   - if(tc != null) {
  448 + if (tc != null) {
423 449 map.put("reservatDate", DateUtil.getyyyy_MM_dd(tc.getReservatDate())); /** 预约住院日期 */
424 450 }
425 451 map.put("fcCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").is(TrackDownDateEnums.G.getId()).and("yn").is(1)), TrackDown.class)); /** 复查次数 */
426 452 map.put("checkCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("hospitalId").is(hospitalId)), AntenatalExaminationModel.class) +
427 453 mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId)), AntExChuModel.class)); /** 本院产检次数 */
428 454 AntenatalExaminationModel examinationModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), AntenatalExaminationModel.class);
429   - if(examinationModel != null) {
  455 + if (examinationModel != null) {
430 456 map.put("checkTime", DateUtil.getyyyy_MM_dd(examinationModel.getCheckDate())); /** 产检日期 */
431 457 map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(examinationModel.getNextCheckTime())); /** 预约产检日期 */
432 458 } else {
433 459 AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), AntExChuModel.class);
434   - if(antExChuModel != null) {
  460 + if (antExChuModel != null) {
435 461 map.put("checkTime", DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime())); /** 产检日期 */
436 462 map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(antExChuModel.getNextCheckTime())); /** 预约产检日期 */
437 463 } else {
... ... @@ -495,8 +521,8 @@
495 521 cnames.put("result", "追访结果");
496 522 }
497 523  
498   - List<Map<String,Object>> results = new ArrayList<>();
499   - if(org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) {
  524 + List<Map<String, Object>> results = new ArrayList<>();
  525 + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) {
500 526 int i = 0;
501 527 for (Map<String, Object> data : datas) {
502 528 Map<String, Object> result = new LinkedHashMap<>();