Commit 54e7174e270ab34cafb07e245cbd3fd19a75b913
1 parent
44bdfd3d84
Exists in
master
and in
6 other branches
徐倩说的 改建档管理的建档孕周
Showing 2 changed files with 4 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
54e7174
| 1 | 1 | package com.lyms.platform.operate.web.facade; |
| 2 | 2 | |
| 3 | -import com.lyms.platform.beans.MsgListRequest; | |
| 4 | 3 | import com.lyms.platform.beans.MsgRequest; |
| 5 | 4 | import com.lyms.platform.biz.service.*; |
| 6 | 5 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| ... | ... | @@ -14,7 +13,6 @@ |
| 14 | 13 | import com.lyms.platform.operate.web.request.*; |
| 15 | 14 | import com.lyms.platform.operate.web.result.*; |
| 16 | 15 | import com.lyms.platform.operate.web.utils.CommonsHelper; |
| 17 | -import com.lyms.platform.operate.web.utils.MessageCenterService; | |
| 18 | 16 | import com.lyms.platform.operate.web.worker.QuanChanPatientWorker; |
| 19 | 17 | import com.lyms.platform.operate.web.worker.QuanPatientWorker; |
| 20 | 18 | import com.lyms.platform.operate.web.worker.WorkHR; |
| ... | ... | @@ -1051,7 +1049,9 @@ |
| 1051 | 1049 | patientManagerQueryModel.setpId(patients.getPid()); |
| 1052 | 1050 | String dueWeek = ""; |
| 1053 | 1051 | try { |
| 1054 | - if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) { | |
| 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) { | |
| 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 @
54e7174
| ... | ... | @@ -322,6 +322,7 @@ |
| 322 | 322 | temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownDateType())); |
| 323 | 323 | temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); |
| 324 | 324 | temp.put("reservatDate", DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); |
| 325 | + temp.put("trackDownTransfer", trackDown.getTrackDownTransfer()); | |
| 325 | 326 | if(TrackDownDateEnums.A.getId().equals(trackDown.getTrackDownDateType())) { |
| 326 | 327 | hqjcList.add(temp); |
| 327 | 328 | } else if(TrackDownDateEnums.B.getId().equals(trackDown.getTrackDownDateType())) { |