Commit 6e40db3b1f2615a569bf0fa75b0379b768f7cd4c
1 parent
2bd54a75e1
Exists in
master
and in
6 other branches
区域产妇和孕妇备注导出
Showing 1 changed file with 6 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
6e40db3
| ... | ... | @@ -802,7 +802,7 @@ |
| 802 | 802 | String[] dates = riskPatientsQueryRequest.getBuildDate().split(" - "); |
| 803 | 803 | bookbuildingDateStart=DateUtil.parseYMD(dates[0]); |
| 804 | 804 | if (dates.length == 2) { |
| 805 | - bookbuildingDateEnd=new Date(DateUtil.parseYMD(dates[1]).getTime() + 24 * 60 * 60 * 1000 - 1); | |
| 805 | + bookbuildingDateEnd=new Date(DateUtil.parseYMD(dates[1]).getTime() + 24 * 60 * 60 * 1000 - 1); | |
| 806 | 806 | } |
| 807 | 807 | //根据建档时间查询 拼查询语句 |
| 808 | 808 | if(null!=bookbuildingDateStart && null!=bookbuildingDateEnd){ |
| 809 | 809 | |
| ... | ... | @@ -2745,12 +2745,12 @@ |
| 2745 | 2745 | } |
| 2746 | 2746 | //初诊时间和初诊医生字段展示,作为模块化 |
| 2747 | 2747 | if (StringUtils.isNotEmpty(patients.getFirstCheckId())) { |
| 2748 | - Users users = usersService.getUsers(Integer.parseInt(patients.getFirstCheckId())); | |
| 2749 | - if (users != null) { | |
| 2750 | - patientManagerQueryModel.setProdDoctor(users.getName()); | |
| 2751 | - } | |
| 2748 | + Users users = usersService.getUsers(Integer.parseInt(patients.getFirstCheckId())); | |
| 2749 | + if (users != null) { | |
| 2750 | + patientManagerQueryModel.setProdDoctor(users.getName()); | |
| 2751 | + } | |
| 2752 | 2752 | patientManagerQueryModel.setCheckTime(DateUtil.getyyyy_MM_dd(patients.getFirstCheckTime())); |
| 2753 | - } | |
| 2753 | + } | |
| 2754 | 2754 | //滦平,围场,需求。初诊时间和初诊医生字段展示。 |
| 2755 | 2755 | // if ("2100001377".equals(hospitalId)||"2100001452".equals(hospitalId)) { |
| 2756 | 2756 | // //初诊 |