jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8783b5ad1a76eac6e8d09e3667595f0947429989

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

第一轮测试bug修改

Showing 2 changed files with 112 additions and 51 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ 8783b5a
... ... @@ -73,6 +73,7 @@
73 73 @PostConstruct
74 74 private void init() {
75 75 trackDownTypeHandlerMap = new HashMap<>();
  76 + //婚前检查
76 77 trackDownTypeHandlerMap.put(TrackDownDateEnums.A.getId(), new FQTrackDownTypeHandler());
77 78 //怀孕建档
78 79 trackDownTypeHandlerMap.put(TrackDownDateEnums.B.getId(), new FQTrackDownTypeHandler());
... ... @@ -144,6 +145,7 @@
144 145 public BaseObjectResponse mother(String parentId, Integer trackType, Integer userId) {
145 146 String hospitalId = autoMatchFacade.getHospitalId(userId);
146 147 Map<String, Object> map = new HashMap<>();
  148 + //如果是婚前检查、怀孕建档
147 149 if (TrackDownDateEnums.C.getId() > trackType) {
148 150 ResidentsArchiveModel resid = residentsArchiveService.getResident(parentId);
149 151 map.put("username", resid.getUsername());
150 152  
151 153  
... ... @@ -152,37 +154,49 @@
152 154 map.put("age", DateUtil.getAge(resid.getBirthday()));
153 155 } else {
154 156 Patients patients = patientsService.findOnePatientById(parentId);
155   - map.put("username", patients.getUsername());
156   - map.put("phone", patients.getPhone());
157   - map.put("cardNo", patients.getCardNo());
158   - map.put("age", DateUtil.getAge(patients.getBirth()));
159   - map.put("week", DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));
160   - map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); /** 预产期 */
161   - map.put("trackCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").is(TrackDownDateEnums.F.getId()).and("yn").is(1)), TrackDown.class)); /** 访视次数 */
162   - map.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate()));
163   - 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);
164   - if (tc != null) {
165   - map.put("reservatDate", DateUtil.getyyyy_MM_dd(tc.getReservatDate())); /** 预约住院日期 */
  157 + if (patients != null) {
  158 + map.put("username", patients.getUsername());
  159 + map.put("phone", patients.getPhone());
  160 + map.put("cardNo", patients.getCardNo());
  161 + map.put("age", DateUtil.getAge(patients.getBirth()));
  162 + map.put("week", DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));
  163 + map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); /** 预产期 */
  164 + map.put("trackCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").is(trackType).and("yn").is(1)), TrackDown.class)); /** 访视次数 */
  165 + map.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate()));
166 166 }
167   - map.put("fcCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").is(TrackDownDateEnums.G.getId()).and("yn").is(1)), TrackDown.class)); /** 复查次数 */
168   - map.put("checkCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("hospitalId").is(hospitalId)), AntenatalExaminationModel.class) +
169   - mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId)), AntExChuModel.class)); /** 本院产检次数 */
170   - AntenatalExaminationModel examinationModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), AntenatalExaminationModel.class);
171   - if (examinationModel != null) {
172   - map.put("checkTime", DateUtil.getyyyy_MM_dd(examinationModel.getCheckDate())); /** 产检日期 */
173   - map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(examinationModel.getNextCheckTime())); /** 预约产检日期 */
174   - } else {
175   - AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), AntExChuModel.class);
176   - if (antExChuModel != null) {
177   - map.put("checkTime", DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime())); /** 产检日期 */
178   - map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(antExChuModel.getNextCheckTime())); /** 预约产检日期 */
179   - } else {
180   - map.put("checkTime", "--"); /** 产检日期 */
181   - map.put("nextCheckTime", "--"); /** 预约产检日期 */
  167 + }
  168 + map.put("checkTime", "--"); /** 产检日期 */
  169 + //查询分娩追访记录
  170 + TrackDown tc = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").is(trackType).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
  171 + if (tc != null) {
  172 + map.put("nextCheckTime", tc.getReservatDate()==null?"--": DateUtil.getyyyy_MM_dd(tc.getReservatDate())); // 预约预约时间
  173 + map.put("yyfsDate", DateUtil.getyyyy_MM_dd(tc.getReservatDate())); /** 预约访视日期 */
  174 + }
  175 + // map.put("fcCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").is(TrackDownDateEnums.G.getId()).and("yn").is(1)), TrackDown.class)); /** 复查次数 */
  176 +
  177 + //产后复查次数
  178 + map.put("fcCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("yn").is(1)), PostReviewModel.class));
  179 + //产前检查次数(初诊+复诊)
  180 + 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));
  181 +
  182 +
  183 + //复诊
  184 + AntenatalExaminationModel examinationModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), AntenatalExaminationModel.class);
  185 + if (examinationModel != null) {
  186 + map.put("checkTime", DateUtil.getyyyy_MM_dd(examinationModel.getCheckDate())); //产检日期
  187 + if (examinationModel.getNextCheckTime() != null) {
  188 + map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(examinationModel.getNextCheckTime())); //预约产检日期
  189 + }
  190 + }else{
  191 + //初诊
  192 + AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), AntExChuModel.class);
  193 + if (antExChuModel != null) {
  194 + map.put("checkTime", DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime())); // 产检日期
  195 + if (antExChuModel.getNextCheckTime() != null) {
  196 + map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(antExChuModel.getNextCheckTime())); // 预约产检日期
182 197 }
183 198 }
184 199 }
185   -
186 200 return RespBuilder.buildSuccess(map);
187 201 }
188 202  
189 203  
190 204  
191 205  
192 206  
193 207  
... ... @@ -246,22 +260,28 @@
246 260 temp.put("phone", StringUtils.encryPhone(downRecord.getPhone()));
247 261 TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1).and("trackDownDateType").is(downRecord.getTrackType())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
248 262 temp.put("age", DateUtil.getAge(downRecord.getBirth()));
249   - // 婚检追访结果
  263 + // 追访结果
250 264 temp.put("result", trackDown == null ? "--" : trackDown.getResult());
251   - // 婚检追访时间
  265 + // 追访时间
252 266 temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate()));
253 267 // 预约时间
254 268 temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));
  269 + //预约复查时间默认用追访时间
  270 + temp.put("yyfcDate", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));
255 271 PostReviewQuery postReviewQuery = new PostReviewQuery();
256 272 postReviewQuery.setYn(YnEnums.YES.getId());
257 273 postReviewQuery.setParentId(downRecord.getParentId());
258   - List<PostReviewModel> list = postReviewService.findWithList(postReviewQuery);
  274 +
259 275 Patients patients = patientsService.findOnePatientById(downRecord.getParentId());
260   - /** 复查次数 */
261   - temp.put("fcNum", list.size());
  276 +
262 277 temp.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate()));
263 278 temp.put("ccfcDate", "--");
264 279 temp.put("yyfcDate ", "--");
  280 +
  281 +
  282 + List<PostReviewModel> list = postReviewService.findWithList(postReviewQuery);
  283 + /** 复查次数 */
  284 + temp.put("fcNum", list.size());
265 285 if (CollectionUtils.isNotEmpty(list)) {
266 286 /** 初次复查日期 */
267 287 temp.put("ccfcDate", list.get(list.size() - 1).getCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(list.size() - 1).getCheckTime()));
268 288  
... ... @@ -289,14 +309,26 @@
289 309 temp.put("trackDownDateType", downRecord.getTrackType());
290 310 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
291 311 temp.put("phone", StringUtils.encryPhone(downRecord.getPhone()));
292   - TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1).and("trackDownDateType").is(downRecord.getTrackType())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
  312 + List<TrackDown> trackDowns = mongoTemplate.find(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1).and("trackDownDateType").is(downRecord.getTrackType())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
293 313 temp.put("age", DateUtil.getAge(downRecord.getBirth()));
294   - // 婚检追访结果
295   - temp.put("result", trackDown == null ? "--" : trackDown.getResult());
296   - // 婚检追访时间
297   - temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate()));
298   - // 预约时间
299   - temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));
  314 + if (CollectionUtils.isNotEmpty(trackDowns)) {
  315 + TrackDown trackDown = trackDowns.get(0);
  316 + // 追访结果
  317 + temp.put("result", trackDown == null ? "--" : trackDown.getResult());
  318 + // 追访时间
  319 + temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate()));
  320 + // 预约时间
  321 + temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));
  322 + //访视次数
  323 + temp.put("trackCount", trackDowns.size());
  324 + }
  325 + Patients patients = patientsService.findOnePatientById(downRecord.getParentId());
  326 + if (patients != null) {
  327 + //分娩日期
  328 + temp.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate()));
  329 + }
  330 +
  331 +
300 332 return temp;
301 333 }
302 334 }
... ... @@ -354,7 +386,7 @@
354 386 // 婚检追访时间
355 387 temp.put("trackDownTime", CollectionUtils.isEmpty(trackDown) ? "--" : DateUtil.getyyyy_MM_dd(trackDown.get(0).getTrackDownDate()));
356 388 // 预约时间
357   - temp.put("yyTime", CollectionUtils.isEmpty(trackDown)? "--" : DateUtil.getyyyy_MM_dd(trackDown.get(0).getReservatDate()));
  389 + temp.put("yyTime", CollectionUtils.isEmpty(trackDown) ? "--" : DateUtil.getyyyy_MM_dd(trackDown.get(0).getReservatDate()));
358 390 return temp;
359 391 }
360 392 }
361 393  
362 394  
363 395  
364 396  
365 397  
366 398  
... ... @@ -367,31 +399,60 @@
367 399  
368 400 @Override
369 401 public Map build(TrackDownRecord downRecord, MongoTemplate mongoTemplate) {
  402 +
  403 + String parentId = downRecord.getParentId();
  404 + String hospitalId = downRecord.getHospitalId();
  405 + Patients patients = patientsService.findOnePatientById(downRecord.getParentId());
370 406 Map<String, Object> temp = new HashMap<>();
371 407 temp.put("username", downRecord.getUsername());
372 408 temp.put("age", DateUtil.getAge(downRecord.getBirth()));
373 409 temp.put("cardNo", StringUtils.encryCardNo(downRecord.getCardNo()));
374 410 temp.put("trackDownDateType", downRecord.getTrackType());
  411 + temp.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); /** 预产期 */
  412 +
375 413 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
376 414 temp.put("phone", StringUtils.encryPhone(downRecord.getPhone()));
377 415 temp.put("id", downRecord.getId());
378 416 temp.put("parentId", downRecord.getParentId());
379   -// temp.put("dueDate", DateUtil.getyyyy_MM_dd(patient.getDueDate()));
380   - if (null != downRecord.getLastMenses()) {
381   - temp.put("week", DateUtil.getWeekDesc(downRecord.getLastMenses(), new Date())); /** 孕周 */
  417 + if (patients != null) {
  418 + if (null != patients.getLastMenses()) {
  419 + temp.put("week", DateUtil.getWeekDesc(patients.getLastMenses(), new Date())); /** 孕周 */
  420 + }
382 421 }
383   - temp.put("cjDate", ""); /** 产检日期 */
384   - temp.put("yycjDate", ""); /** 预约产检日期 */
385   - temp.put("cjzfDate", ""); /** 产检追访时间 */
  422 + temp.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));
  423 +
386 424 TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("yn").is(1).and("parentId").is(downRecord.getParentId()).and("trackDownDateType").is(downRecord.getTrackType())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
387 425 if (trackDown != null) {
388   - temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); // 婚检追访结果
  426 + temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); // 追访结果
389 427 temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); // 追访时间
390   - temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); // 预约时间
  428 + temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); // 预约预约时间
391 429 } else {
392 430 temp.put("result", "--"); // 婚检追访结果
393 431 temp.put("trackDownTime", "--"); // 追访时间
394   - temp.put("yyTime", "--"); // 预约时间
  432 + temp.put("yyTime", "--"); // 预约预约时间
  433 + }
  434 +
  435 + //如果是产前筛查去预约结果
  436 + if (downRecord.getTrackType() == TrackDownDateEnums.C.getId()||downRecord.getTrackType() == TrackDownDateEnums.I.getId()) {
  437 +
  438 +
  439 + //复诊
  440 + AntenatalExaminationModel examinationModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId())).with(new Sort(Sort.Direction.DESC, "created")), AntenatalExaminationModel.class);
  441 + if (examinationModel != null) {
  442 + temp.put("cjDate", DateUtil.getyyyy_MM_dd(examinationModel.getCheckDate())); /** 产检日期 */
  443 + if (examinationModel.getNextCheckTime() != null) {
  444 + temp.put("yyTime", DateUtil.getyyyy_MM_dd(examinationModel.getNextCheckTime())); /** 预约产检日期 */
  445 + }
  446 + }else{
  447 + //初诊
  448 + AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId())).with(new Sort(Sort.Direction.DESC, "created")), AntExChuModel.class);
  449 + if (antExChuModel != null) {
  450 + temp.put("cjDate", DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime())); /** 产检日期 */
  451 + if (antExChuModel.getNextCheckTime() != null) {
  452 + temp.put("yyTime", DateUtil.getyyyy_MM_dd(antExChuModel.getNextCheckTime())); /** 预约产检日期 */
  453 + }
  454 + }
  455 + }
395 456 }
396 457 return temp;
397 458 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ 8783b5a
... ... @@ -456,7 +456,7 @@
456 456 List<Map<String, Object>> chfcList = new ArrayList<>(); // 产后复查
457 457 for (TrackDown trackDown : trackDowns) {
458 458 Map<String, Object> temp = new HashMap<>();
459   - temp.put("trackDownDate", DateUtil.getyyyy_MM_dd_hms(trackDown.getTrackDownDate()));
  459 + temp.put("trackDownDate", DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate()));
460 460 temp.put("trackDownUser", trackDown.getTrackDownUserId());
461 461 temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownDateType()));
462 462 temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult());
... ... @@ -506,7 +506,7 @@
506 506  
507 507 for (TrackDown trackDown : trackDowns) {
508 508 Map<String, Object> temp = new HashMap<>();
509   - temp.put("trackDownDate", trackDown.getTrackDownDate() == null ? "--" : DateUtil.getyyyy_MM_dd_hms(trackDown.getTrackDownDate()));
  509 + temp.put("trackDownDate", trackDown.getTrackDownDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate()));
510 510 temp.put("trackDownUser", StringUtils.isEmpty(trackDown.getTrackDownUserId()) ? "--" : trackDown.getTrackDownUserId());
511 511 if(trackDown.getTrackDownType() == TrackDownDateEnums.H.getId()){
512 512 trackDown.setTrackDownType(4);