jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 702f3d0e1665d933dcd2fda3a81111f2f5e3bf9a

Authored by dongqin
2 parents d19bcbd076 0847ca3774
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java View file @ 702f3d0
... ... @@ -1332,13 +1332,13 @@
1332 1332 downRecord.setHospitalId(getHospitalId());
1333 1333 downRecord.setSource(getId());
1334 1334 downRecord.setStatus(1);
1335   - downRecord.setAppointmentDate(new Date());
  1335 + // downRecord.setAppointmentDate(new Date());
1336 1336 downRecord.setStop("0");
1337 1337 downRecord.setTrackType(TrackDownDateEnums.C.getId());
1338 1338 //特殊处理 产筛预约追访时间
1339   - downRecord.setSieveAppointmentDate(new Date());
  1339 + //downRecord.setSieveAppointmentDate(new Date());
1340 1340 //特殊处理 分娩住院预约追访时间
1341   - downRecord.setFmzyAppointmentDate(new Date());
  1341 + //downRecord.setFmzyAppointmentDate(new Date());
1342 1342 return downRecord;
1343 1343 }
1344 1344  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 702f3d0
... ... @@ -366,7 +366,7 @@
366 366 sieveDao.updateChanQianSieve(sieveModel);
367 367 }
368 368 }
369   - /* *//**修改孕妇追访管理修改*//*
  369 + /* *//**修改孕妇追访管理修改*//*
370 370 if (StringUtils.isNotEmpty(antExAddRequest.getNextCheckTime()) && StringUtils.isNotEmpty(antExAddRequest.getParentId())) {
371 371 TrackDownRecord trackDownRecord = new TrackDownRecord();
372 372 trackDownRecord.setAppointmentDate(DateUtil.parseYMD(antExAddRequest.getNextCheckTime()));
... ... @@ -385,7 +385,7 @@
385 385 }
386 386 operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), model, OptActionEnums.ADD.getId(), "添加复诊");
387 387 //添加复诊时添加追访信息
388   - addTrackDownInfo(userId, patients);
  388 + addTrackDownInfo(userId, patients, antExAddRequest.getNextCheckTime());
389 389 }
390 390 //自动数据处理
391 391 updateAutoData(model, antExAddRequest, hospitalId);
... ... @@ -657,7 +657,7 @@
657 657 stopWatch.start("queryAntExChu");
658 658  
659 659  
660   - /* *//**孕妇追访功能下次预约时间修改*//*
  660 + /* *//**孕妇追访功能下次预约时间修改*//*
661 661 if (StringUtils.isNotEmpty(excAddRequest.getNextCheckTime()) && StringUtils.isNotEmpty(excAddRequest.getParentId())) {
662 662 TrackDownRecord trackDownRecord = new TrackDownRecord();
663 663 trackDownRecord.setAppointmentDate(DateUtil.parseYMD(excAddRequest.getNextCheckTime()));
... ... @@ -755,7 +755,7 @@
755 755  
756 756  
757 757 //初诊是添加追访记录
758   - addTrackDownInfo(userId, patients);
  758 + addTrackDownInfo(userId, patients, excAddRequest.getNextCheckTime());
759 759 } else {
760 760 return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("您已经做过初诊");
761 761 }
... ... @@ -1120,7 +1120,7 @@
1120 1120 * @param userId
1121 1121 * @param patient
1122 1122 */
1123   - public void addTrackDownInfo(Integer userId, Patients patient) {
  1123 + public void addTrackDownInfo(Integer userId, Patients patient, String nextCheckTime) {
1124 1124 //添加产后追访信息
1125 1125 TrackDownRecord trackDownRecord = patient.build();
1126 1126 //根据patient查询是否存在追访信息
... ... @@ -1131,6 +1131,10 @@
1131 1131 if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型
1132 1132 TrackDownRecord trackDownRecord1 = records.get(0);
1133 1133 trackDownRecord.setId(trackDownRecord1.getId());
  1134 +
  1135 + }
  1136 + if (StringUtils.isNotEmpty(nextCheckTime)) {
  1137 + trackDownRecord.setAppointmentDate(DateUtil.parseYMD(nextCheckTime));
1134 1138 }
1135 1139 trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord);
1136 1140 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 702f3d0
... ... @@ -545,7 +545,12 @@
545 545 if (week > 20) {//不能做产前筛查追访，产前检查追访
546 546 trackDownRecord.setTrackType(TrackDownDateEnums.I.getId());
547 547 }
548   -
  548 + //孕妇追访默认时间
  549 + trackDownRecord.setAppointmentDate(new Date());
  550 + //产筛默认时间
  551 + trackDownRecord.setSieveAppointmentDate(new Date());
  552 + //设置默认分娩住院时间
  553 + trackDownRecord.setFmzyAppointmentDate(new Date());
549 554 trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord);
550 555 }
551 556 });
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ 702f3d0
... ... @@ -170,7 +170,7 @@
170 170 Integer userId, Integer type, Integer check, String checkup, String pregnantBuild,
171 171 Integer followupStatus, Boolean isDeliver, HttpServletResponse response, Integer encryption) {
172 172 String hospitalId = autoMatchFacade.getHospitalId(userId);
173   - List<Map<String, Object>> restList = new ArrayList<>();
  173 + List<Map<String, Object>> restList;
174 174 Integer archiveModelCount = 0;
175 175 if (type == 1) {//查询妇女建档为主数据
176 176 //查询条件
... ... @@ -306,6 +306,8 @@
306 306 temp.put("chfc", 3);//产后复查空白
307 307 temp.put("resident", 1); // 妇女建档
308 308 temp.put("check", 3); // 婚检
  309 + temp.put("cqzd", 3);//产前诊断默认
  310 +
309 311  
310 312 temp.put("id", archiveModel.getId());
311 313 temp.put("cardNo", encryption == 0 ? StringUtils.encryCardNo(archiveModel.getCertificateNum()) : archiveModel.getCertificateNum());