Commit eb7d0c085381dd4106a83783434731ddf2b84c4e
1 parent
57413705b1
Exists in
dev
#fix:优化产后追访，追访时间默认为分娩日期+41天
Showing 3 changed files with 18 additions and 3 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
View file @
eb7d0c0
| ... | ... | @@ -754,6 +754,8 @@ |
| 754 | 754 | if (day > 42) {//不需要做产后访视追访记录，只做产后复查追访 |
| 755 | 755 | trackDownRecord.setTrackType(TrackDownDateEnums.J.getId()); |
| 756 | 756 | } |
| 757 | + //产后复查追访预约时间调整为分娩日期➕41天 | |
| 758 | + trackDownRecord.setAppointmentDate(DateUtil.addDay(patients.getFmDate(),41)); | |
| 757 | 759 | trackDownRecordService.addOrupdateTrackDownRecord(patients.getOperator(), trackDownRecord); |
| 758 | 760 | } |
| 759 | 761 | } |
platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java
View file @
eb7d0c0
| ... | ... | @@ -110,7 +110,15 @@ |
| 110 | 110 | } |
| 111 | 111 | if (CollectionUtils.isNotEmpty(patientses) && patientses.size()>0) { |
| 112 | 112 | patient = patientses.get(0); |
| 113 | - | |
| 113 | + patient.setIsAutoFm(0); | |
| 114 | + patient.setFmHospital(HOSPITALID); | |
| 115 | + patient.setFmDate(new Date()); | |
| 116 | + patient.setType(3); | |
| 117 | + patient.setBuildType(2); | |
| 118 | + patient.setDueStatus(0); | |
| 119 | + patient.setDeliverDoctor(String.valueOf(users.get(0).getId())); | |
| 120 | + patient.setModified(new Date()); | |
| 121 | + patientsService.updatePatientOne(patient,patient.getId()); | |
| 114 | 122 | } else{ |
| 115 | 123 | |
| 116 | 124 | if (StringUtils.isNotEmpty(allFm.getIdcard())&&CollectionUtils.isNotEmpty(users)){ |
| ... | ... | @@ -135,7 +143,6 @@ |
| 135 | 143 | patient.setType(3); |
| 136 | 144 | patient.setBuildType(2); |
| 137 | 145 | patient.setBookbuildingDate(new Date()); |
| 138 | - //patient.setBookbuildingDoctor(); | |
| 139 | 146 | patient.setUsername(allFm.getName()); |
| 140 | 147 | patient.setPhone(allFm.getPhone()); |
| 141 | 148 | patient.setPid(resperson.getId()); |
| 142 | 149 | |
| ... | ... | @@ -201,8 +208,12 @@ |
| 201 | 208 | deliverAddRequest.setProdprocess(map); |
| 202 | 209 | deliverAddRequest.setTotalprocess(totalMap); |
| 203 | 210 | // System.out.println("6----------" + allFm.getDELIVER_DOCTOR()); |
| 211 | + if (StringUtils.isNotEmpty(allFm.getDeliver_DOCTOR())){ | |
| 212 | + deliverAddRequest.setDeliverDoctor(allFm.getDeliver_DOCTOR()); | |
| 213 | + }else { | |
| 214 | + deliverAddRequest.setDeliverDoctor(patient.getDeliverDoctor()); | |
| 215 | + } | |
| 204 | 216 | |
| 205 | - deliverAddRequest.setDeliverDoctor(allFm.getDeliver_DOCTOR()); | |
| 206 | 217 | deliverAddRequest.setDueDate(DateUtil.getyyyy_MM_dd(dueDate)); |
| 207 | 218 | deliverAddRequest.setParentId(patient.getId()); |
| 208 | 219 | deliverAddRequest.setPid(patient.getPid()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
eb7d0c0
| ... | ... | @@ -825,6 +825,8 @@ |
| 825 | 825 | if (day > 42) {//不需要做产后访视追访记录，只做产后复查追访 |
| 826 | 826 | trackDownRecord.setTrackType(TrackDownDateEnums.J.getId()); |
| 827 | 827 | } |
| 828 | + //产后复查追访预约时间调整为分娩日期➕41天 | |
| 829 | + trackDownRecord.setAppointmentDate(DateUtil.addDay(patients.getFmDate(),41)); | |
| 828 | 830 | trackDownService.addOrupdateTrackDownRecord(patients.getOperator(), trackDownRecord); |
| 829 | 831 | } |
| 830 | 832 | } |