jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8baf9d2f8662c3ef2790800c74313bc354405ff1

Authored by litao@lymsh.com
1 parent 54e7174e27
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

徐倩说的 改建档管理的建档孕周

Showing 2 changed files with 7 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 8baf9d2
... ... @@ -1050,8 +1050,8 @@
1050 1050 String dueWeek = "";
1051 1051 try {
1052 1052 // 徐倩说改的
1053   - // if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) {
1054   - if (patients.getBookbuildingDate().getTime() - patients.getFmDate().getTime() > 0 && patients.getBuildType() == 2) {
  1053 + if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) {
  1054 +// if (patients.getBookbuildingDate().getTime() - patients.getFmDate().getTime() > 0 && patients.getBuildType() == 2) {
1055 1055 dueWeek = "已分娩";
1056 1056 } else {
1057 1057 int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getBookbuildingDate());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ 8baf9d2
... ... @@ -385,6 +385,11 @@
385 385 map.put("week", DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));
386 386 map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); /** 预产期 */
387 387 map.put("trackCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").is(TrackDownDateEnums.F.getId()).and("yn").is(1)), TrackDown.class)); /** 访视次数 */
  388 +
  389 + 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);
  390 + if(tc != null) {
  391 + map.put("reservatDate", DateUtil.getyyyy_MM_dd(tc.getReservatDate())); /** 预约住院日期 */
  392 + }
388 393 map.put("fcCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").is(TrackDownDateEnums.G.getId()).and("yn").is(1)), TrackDown.class)); /** 复查次数 */
389 394 map.put("checkCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("hospitalId").is(hospitalId)), AntenatalExaminationModel.class) +
390 395 mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId)), AntExChuModel.class)); /** 本院产检次数 */