Commit a35d5fb8f59ba835c7ee885e8deb720202186a67
1 parent
dad16d4e38
Exists in
master
and in
6 other branches
住院管理提醒
Showing 1 changed file with 8 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java
View file @
a35d5fb
| ... | ... | @@ -161,7 +161,10 @@ |
| 161 | 161 | markHospitalLog.setMarkeDoctor(ps.getInHospitDoctor()); |
| 162 | 162 | markHospitalLog.setMarkeDate(ps.getInHospitDate()); |
| 163 | 163 | markHospitalLog.setMarkeType(3); |
| 164 | - ps.setHospitStatus(1); | |
| 164 | + // ps.setHospitStatus(1); | |
| 165 | + if(ps.getHospitStatus()==null){ | |
| 166 | + ps.setHospitStatus(1); | |
| 167 | + } | |
| 165 | 168 | ps.setInHospitDoctor(String.valueOf(id)); |
| 166 | 169 | ps.setInHospitDate(new Date()); |
| 167 | 170 | ps.setInHospitStatus(2); |
| ... | ... | @@ -330,6 +333,8 @@ |
| 330 | 333 | patientMarkHospQuery.setBackFailure(patientMarkRequest.getFailure()); |
| 331 | 334 | patientMarkHospQuery.setBackStartDate(patientMarkRequest.getMakeStartDate()); |
| 332 | 335 | patientMarkHospQuery.setBackEndDate(patientMarkRequest.getMakeEndDate()); |
| 336 | + patientMarkHospQuery.setSort("back_status asc,back_date desc"); | |
| 337 | + patientMarkHospQuery.setNeed("y"); | |
| 333 | 338 | } else if (patientMarkRequest.getType() == 3) {//3-住院提醒 |
| 334 | 339 | //回院提醒状态为已提醒 |
| 335 | 340 | patientMarkHospQuery.setBackStatus(2); |
| 336 | 341 | |
| ... | ... | @@ -339,10 +344,10 @@ |
| 339 | 344 | patientMarkHospQuery.setInHospitFailure(patientMarkRequest.getFailure()); |
| 340 | 345 | patientMarkHospQuery.setInHospitStartDate(patientMarkRequest.getMakeStartDate()); |
| 341 | 346 | patientMarkHospQuery.setInHospitEndDate(patientMarkRequest.getMakeEndDate()); |
| 347 | + patientMarkHospQuery.setSort("in_hospit_status asc,in_hospit_date desc"); | |
| 348 | + patientMarkHospQuery.setNeed("y"); | |
| 342 | 349 | } |
| 343 | 350 | |
| 344 | - patientMarkHospQuery.setSort("hospit_date"); | |
| 345 | - patientMarkHospQuery.setNeed("y"); | |
| 346 | 351 | patientMarkHospQuery.setOffset((patientMarkRequest.getPage() - 1) * patientMarkRequest.getLimit()); |
| 347 | 352 | patientMarkHospQuery.setLimit(patientMarkRequest.getLimit()); |
| 348 | 353 | patientMarkHospQuery.setPage(patientMarkRequest.getPage()); |