jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f24cea643487547cc45895d0604d8ae6512858a3

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

追访数据个节点更新bug第三轮自测bug修改

Showing 4 changed files with 68 additions and 87 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/TrackDown.java View file @ f24cea6
... ... @@ -54,7 +54,7 @@
54 54 private String trackDownUserId;
55 55  
56 56 /**
57   - * 追访方式
  57 + * 追访方式 电话、上门
58 58 */
59 59 private Integer trackDownType;
60 60  
... ... @@ -74,7 +74,7 @@
74 74 private String result;
75 75  
76 76 /**
77   - * 追访转接
  77 + * 追访转接 是否流转
78 78 */
79 79 private Integer trackDownTransfer;
80 80  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java View file @ f24cea6
... ... @@ -59,13 +59,6 @@
59 59 return trackDownService.add(getUserId(request), trackDown);
60 60 }
61 61  
62   - /* @ResponseBody
63   - @TokenRequired
64   - @RequestMapping(method = RequestMethod.GET)
65   - public BaseResponse list(String provinceId, String cityId, String areaId, String streetId, String key, @RequestParam Integer trackType, @RequestParam Integer page, @RequestParam Integer limit, HttpServletRequest request) {
66   - return trackDownService.list(provinceId, cityId, areaId, streetId, key, trackType, page, limit, getUserId(request));
67   - }*/
68   -
69 62 @TokenRequired
70 63 @RequestMapping(value = "/export", method = RequestMethod.GET)
71 64 public void export(String provinceId, String cityId, String areaId, String streetId, String key, @RequestParam Integer trackType, HttpServletRequest request, HttpServletResponse response) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ f24cea6
... ... @@ -184,14 +184,15 @@
184 184 }
185 185 }
186 186 map.put("checkTime", "--"); /** 产检日期 */
187   - //查询分娩追访记录
  187 + //查询追访记录
188 188 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);
189 189 if (tc != null) {
190 190 map.put("nextCheckTime", tc.getReservatDate() == null ? "--" : DateUtil.getyyyy_MM_dd(tc.getReservatDate())); // 预约预约时间
191 191 map.put("yyfsDate", DateUtil.getyyyy_MM_dd(tc.getReservatDate())); /** 预约访视日期 */
  192 + map.put("reservatDate", DateUtil.getyyyy_MM_dd(tc.getReservatDate())); /** 预约日期 */
192 193 }
193   - // map.put("fcCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").is(TrackDownDateEnums.G.getId()).and("yn").is(1)), TrackDown.class)); /** 复查次数 */
194 194  
  195 +
195 196 //产后复查次数
196 197 map.put("fcCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("yn").is(1)), PostReviewModel.class));
197 198 //产前检查次数(初诊+复诊)
198 199  
199 200  
... ... @@ -249,14 +250,22 @@
249 250 if (CollectionUtils.isNotEmpty(downRecordList) && null != downTypeHandler) {
250 251 for (TrackDownRecord trackDownRecord : downRecordList) {
251 252 //追访类型
252   - Integer trackType = trackDownRecord.getTrackType();
253 253 //查询的追访类型
254 254 trackDownRecord.setTrackType(downQueryRequest.getTrackType());
255 255 Map map = downTypeHandler.build(trackDownRecord, mongoTemplate);
  256 + Integer trackType = trackDownRecord.getTrackType();
  257 + if(downQueryRequest.getTrackType()==TrackDownDateEnums.D.getId()){
  258 + if(trackType == TrackDownDateEnums.C.getId()){
  259 + trackType = TrackDownDateEnums.D.getId();
  260 + }
  261 + }else if(downQueryRequest.getTrackType()==TrackDownDateEnums.G.getId()){
  262 + if(trackType == TrackDownDateEnums.F.getId()){
  263 + trackType = TrackDownDateEnums.G.getId();
  264 + }
  265 + }
256 266 //设置数据真实的追访类型
257 267 map.put("trackDownDateType", trackType);
258 268 data.add(map);
259   -
260 269 }
261 270 }
262 271 PageResult pageResult = new PageResult();
... ... @@ -280,7 +289,7 @@
280 289 temp.put("trackDownDateType", downRecord.getTrackType());
281 290 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
282 291 temp.put("phone", StringUtils.encryPhone(downRecord.getPhone()));
283   - 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);
  292 + TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1).and("trackDownDateType").in(7,10)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
284 293 temp.put("age", DateUtil.getAge(downRecord.getBirth()));
285 294 // 追访结果
286 295 temp.put("result", trackDown == null ? "--" : trackDown.getResult());
... ... @@ -331,7 +340,9 @@
331 340 temp.put("trackDownDateType", downRecord.getTrackType());
332 341 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
333 342 temp.put("phone", StringUtils.encryPhone(downRecord.getPhone()));
334   - 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);
  343 +
  344 +
  345 + List<TrackDown> trackDowns = mongoTemplate.find(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1).and("trackDownDateType").in(6,11)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
335 346 temp.put("age", DateUtil.getAge(downRecord.getBirth()));
336 347 if (CollectionUtils.isNotEmpty(trackDowns)) {
337 348 TrackDown trackDown = trackDowns.get(0);
... ... @@ -441,8 +452,15 @@
441 452 }
442 453 //产检次数
443 454 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));
444   -
445   - 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);
  455 + Criteria criteria = Criteria.where("yn").is(1).and("parentId").is(downRecord.getParentId());
  456 + if (TrackDownDateEnums.C.getId() == downRecord.getTrackType()) {
  457 + criteria.and("trackDownDateType").in(3, 9);
  458 + } else if (TrackDownDateEnums.D.getId() == downRecord.getTrackType()) {
  459 + criteria.and("trackDownDateType").in(4, 8);
  460 + } else {
  461 + criteria.and("trackDownDateType").in(downRecord.getTrackType());
  462 + }
  463 + TrackDown trackDown = mongoTemplate.findOne(Query.query(criteria).with(new Sort(Sort.Direction.DESC, "created")),TrackDown.class);
446 464 if (trackDown != null) {
447 465 temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); // 追访结果
448 466 temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); // 追访时间
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ f24cea6
... ... @@ -206,71 +206,41 @@
206 206 }
207 207 }
208 208  
  209 + /**
  210 + * 新增追访详情
  211 + *
  212 + * @param userId
  213 + * @param trackDown
  214 + * @return
  215 + */
209 216 public BaseResponse add(Integer userId, TrackDown trackDown) {
210 217 String hospitalId = autoMatchFacade.getHospitalId(userId);
211   - //婚前检查 怀孕建档 的时候没有pid
212   - // if (TrackDownDateEnums.A.getId() != trackDown.getTrackDownDateType() && TrackDownDateEnums.B.getId() != trackDown.getTrackDownDateType()) {
213   - // String parentId = mongoUtil.doHidePatient(trackDown.getParentId(), hospitalId);
214   - // trackDown.setPid(mongoUtil.getPid(parentId));
215   - // trackDown.setParentId(parentId);
216   - // }
217   - //怀孕建档:怀孕建档流转至孕期检查的时候需要有孕妇的档案才可以扭转 : 作废，孕妇建档时自动流转到孕检追访
218   - /*if (TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer() &&
219   - TrackDownDateEnums.B.getId() == trackDown.getTrackDownDateType()
220   - && StringUtils.isNotEmpty(trackDown.getParentId())) {
221   -
222   - ResidentsArchiveModel archiveModel = residentsArchiveService.getResident(trackDown.getParentId());
223   - //TODO 需要去验证或者绑定孕妇的建档记录,不然不能进行后续的操作
224   - PatientsQuery patientsQuery1 = new PatientsQuery();
225   - patientsQuery1.setCardNo(archiveModel.getCertificateNum());
226   - patientsQuery1.setPcerteTypeId(archiveModel.getCertificateTypeId());
227   - patientsQuery1.setHospitalId(hospitalId);
228   - patientsQuery1.setType(1);
229   - patientsQuery1.setYn(YnEnums.YES.getId());
230   - List<Patients> patientses = patientsService.queryPatient(patientsQuery1);
231   - if (CollectionUtils.isNotEmpty(patientses)) {
232   - TrackDownRecordQuery trackDownRecordQuery = new TrackDownRecordQuery();
233   - trackDownRecordQuery.setResidentsArchiveId(trackDown.getParentId());
234   -
235   - TrackDownRecord trackDownRecord = new TrackDownRecord();
236   - trackDownRecord.setParentId(patientses.get(0).getId());
237   - //修改绑定建档信息的id
238   - trackDownRecordService.findAndMoidify(trackDownRecordQuery, trackDownRecord);
239   - } else {
240   - return new BaseResponse().setErrorcode(4016).setErrormsg("您还没有孕妇的档案,请去医院建档.");
241   - }
242   - }*/
243   -
244   - //追访列表ID
245   - if (trackDown.getTrackDownRecId() != null) {
246   - TrackDownRecord trackDownRecord = trackDownRecordService.getTrackDown(trackDown.getTrackDownRecId());
247   - if (trackDownRecord != null) {
248   - //当传入的状态和数据库一致时才能进行有效操作
249   - if (trackDownRecord.getTrackType().intValue() == trackDown.getTrackDownDateType()) {
250   - if (TrackDownDateEnums.A.getId() == trackDown.getTrackDownDateType()&&"5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(trackDownRecord.getSex())) {//性别男：特殊处理，流转到下一流程时结束流程
  218 + if (trackDown.getTrackDownDateType() != TrackDownDateEnums.D.getId() && trackDown.getTrackDownDateType() != TrackDownDateEnums.G.getId()) {//不等于产检追访和产后访视时进行数据验证状态
  219 + //追访列表ID
  220 + if (trackDown.getTrackDownRecId() != null) {
  221 + TrackDownRecord trackDownRecord = trackDownRecordService.getTrackDown(trackDown.getTrackDownRecId());
  222 + if (trackDownRecord != null) {
  223 + //当传入的状态和数据库一致时才能进行有效操作
  224 + if (trackDownRecord.getTrackType().intValue() != trackDown.getTrackDownDateType()) {
  225 + return RespBuilder.buildErro(ResponseCode.DATA_ERROR, "数据已经被修改请回到列表刷新后再操作！");
  226 + }
  227 + if (TrackDownDateEnums.A.getId() == trackDown.getTrackDownDateType()
  228 + && "5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(trackDownRecord.getSex())) {//性别男：特殊处理，流转到下一流程时结束流程
251 229 trackDown.setTrackDownTransfer(TrackDownTransferEnums.C.getId());
252 230 }
253   - trackDown.setId(null);
254   - trackDown.setYn(YnEnums.YES.getId());
255   - trackDown.setCreated(new Date());
256   - trackDown.setHospitalId(hospitalId);
257   - trackDown.setOperaterId(userId);
258   - trackDown.setModified(new Date());
259   - trackDownService.add(trackDown);
260   - String recordId = trackDown.getTrackDownRecId();
261   - updateRecordStatus(trackDown, recordId);
262   - return RespBuilder.buildSuccess(trackDown.getId());
263   - } else {
264   - return RespBuilder.buildErro(ResponseCode.DATA_ERROR, "数据已经被修改请回到列表刷新后再操作！");
265 231 }
266   - } else {
267   - return RespBuilder.buildErro(ResponseCode.DATA_ERROR, "传入的trackDownRecId没有找到数据");
268 232 }
269   - } else {
270   - return RespBuilder.buildErro(ResponseCode.DATA_ERROR, "请传入trackDownRecId");
271 233 }
272   -
273   -
  234 + trackDown.setId(null);
  235 + trackDown.setYn(YnEnums.YES.getId());
  236 + trackDown.setCreated(new Date());
  237 + trackDown.setHospitalId(hospitalId);
  238 + trackDown.setOperaterId(userId);
  239 + trackDown.setModified(new Date());
  240 + trackDownService.add(trackDown);
  241 + String recordId = trackDown.getTrackDownRecId();
  242 + updateRecordStatus(trackDown, recordId);
  243 + return RespBuilder.buildSuccess(trackDown.getId());
274 244 }
275 245  
276 246 /**
277 247  
... ... @@ -476,13 +446,13 @@
476 446 chfsList.add(temp);
477 447 } else if (TrackDownDateEnums.G.getId().equals(trackDown.getTrackDownDateType())) {
478 448 chfcList.add(temp);
479   - } else if (TrackDownDateEnums.H.getId().equals(trackDown.getTrackDownDateType())) {
  449 + } else if (TrackDownDateEnums.H.getId().equals(trackDown.getTrackDownDateType())) {
480 450 cqscList.add(temp);
481 451 } else if (TrackDownDateEnums.I.getId().equals(trackDown.getTrackDownDateType())) {
482 452 cqjcList.add(temp);
483 453 } else if (TrackDownDateEnums.J.getId().equals(trackDown.getTrackDownDateType())) {
484 454 chfcList.add(temp);
485   - }else if (TrackDownDateEnums.K.getId().equals(trackDown.getTrackDownDateType())) {
  455 + } else if (TrackDownDateEnums.K.getId().equals(trackDown.getTrackDownDateType())) {
486 456 chfsList.add(temp);
487 457 }
488 458 }
489 459  
490 460  
... ... @@ -491,14 +461,14 @@
491 461  
492 462 Criteria criteria = Criteria.where("parentId").is(patientId).and("yn").is(1);
493 463  
494   - if (TrackDownDateEnums.D.getId() == trackType) {
495   - criteria.and("trackDownDateType").in(3,8);
496   - } else if (TrackDownDateEnums.C.getId() == trackType) {
497   - criteria.and("trackDownDateType").in(3,9);
  464 + if (TrackDownDateEnums.C.getId() == trackType) {
  465 + criteria.and("trackDownDateType").in(3, 9);
  466 + } else if (TrackDownDateEnums.D.getId() == trackType) {
  467 + criteria.and("trackDownDateType").in(4, 8);
498 468 } else if (TrackDownDateEnums.F.getId() == trackType) {
499   - criteria.and("trackDownDateType").in(6,11);
  469 + criteria.and("trackDownDateType").in(6, 11);
500 470 } else if (TrackDownDateEnums.G.getId() == trackType) {
501   - criteria.and("trackDownDateType").in(7,10);
  471 + criteria.and("trackDownDateType").in(7, 10);
502 472 } else {
503 473 criteria.and("trackDownDateType").in(trackType);
504 474 }
505 475  
506 476  
507 477  
... ... @@ -508,13 +478,13 @@
508 478 Map<String, Object> temp = new HashMap<>();
509 479 temp.put("trackDownDate", trackDown.getTrackDownDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate()));
510 480 temp.put("trackDownUser", StringUtils.isEmpty(trackDown.getTrackDownUserId()) ? "--" : trackDown.getTrackDownUserId());
511   - if(trackDown.getTrackDownType() == TrackDownDateEnums.H.getId()){
  481 + if (trackDown.getTrackDownType() == TrackDownDateEnums.H.getId()) {
512 482 trackDown.setTrackDownType(4);
513   - }else if(trackDown.getTrackDownType() == TrackDownDateEnums.I.getId()){
  483 + } else if (trackDown.getTrackDownType() == TrackDownDateEnums.I.getId()) {
514 484 trackDown.setTrackDownType(3);
515   - }else if(trackDown.getTrackDownType() == TrackDownDateEnums.J.getId()){
  485 + } else if (trackDown.getTrackDownType() == TrackDownDateEnums.J.getId()) {
516 486 trackDown.setTrackDownType(7);
517   - }else if(trackDown.getTrackDownType() == TrackDownDateEnums.K.getId()){
  487 + } else if (trackDown.getTrackDownType() == TrackDownDateEnums.K.getId()) {
518 488 trackDown.setTrackDownType(6);
519 489 }
520 490