Commit 4802c25d8927074290135ca80735b4e797a4a37b
1 parent
4ccbf07108
Exists in
master
and in
6 other branches
听力诊断模块
Showing 2 changed files with 11 additions and 11 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java
View file @
4802c25
| ... | ... | @@ -592,7 +592,7 @@ |
| 592 | 592 | result.setBackDoctor("产检医生"); |
| 593 | 593 | } |
| 594 | 594 | } |
| 595 | - result.setBackDate(DateUtil.getyyyy_MM_dd(ps.getBackDate())); | |
| 595 | + result.setBackDate(DateUtil.gety_m_dhm(ps.getBackDate())); | |
| 596 | 596 | result.setBackMakeDate(DateUtil.getyyyy_MM_dd(ps.getBackMakeDate())); |
| 597 | 597 | result.setBackRemark(ps.getBackRemark()); |
| 598 | 598 | if (ps.getBackFailure() != null) { |
| ... | ... | @@ -618,7 +618,7 @@ |
| 618 | 618 | } |
| 619 | 619 | } |
| 620 | 620 | |
| 621 | - result.setInHospitDate(DateUtil.getyyyy_MM_dd(ps.getInHospitDate())); | |
| 621 | + result.setInHospitDate(DateUtil.gety_m_dhm(ps.getInHospitDate())); | |
| 622 | 622 | result.setInHospitMakeDate(DateUtil.getyyyy_MM_dd(ps.getInHospitMakeDate())); |
| 623 | 623 | result.setInHospitRemark(ps.getInHospitRemark()); |
| 624 | 624 | if (ps.getInHospitFailure() != null) { |
| ... | ... | @@ -642,7 +642,7 @@ |
| 642 | 642 | } |
| 643 | 643 | result.setHospitType(ps.getHospitType()); |
| 644 | 644 | result.setMakeInHospitDate(DateUtil.getyyyy_MM_dd(ps.getMakeInHospitDate())); |
| 645 | - result.setMakeDate(DateUtil.getyyyy_MM_dd(ps.getMakeDate())); | |
| 645 | + result.setMakeDate(DateUtil.gety_m_dhm(ps.getMakeDate())); | |
| 646 | 646 | if (ps.getMakeDoctor() != null) { |
| 647 | 647 | Users users = usersService.getUsers(Integer.parseInt(ps.getMakeDoctor())); |
| 648 | 648 | if (users != null) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatienMarkHospResult.java
View file @
4802c25
| ... | ... | @@ -73,38 +73,38 @@ |
| 73 | 73 | */ |
| 74 | 74 | private String backRemark; |
| 75 | 75 | /** |
| 76 | - * 回院失败原因（1-电话无人接听、2-他院已办理住院、3-暂时未确定、4-其他） | |
| 76 | + * 回院预约失败原因（1-电话无人接听、2-他院已办理住院、3-暂时未确定、4-其他） | |
| 77 | 77 | */ |
| 78 | 78 | private Integer backFailure; |
| 79 | 79 | private String backFailureStr; |
| 80 | 80 | /** |
| 81 | - * 住院是否提醒（1-待提醒、2-已提醒） | |
| 81 | + * 住院预约是否提醒（1-待提醒、2-已提醒） | |
| 82 | 82 | */ |
| 83 | 83 | private Integer inHospitStatus; |
| 84 | 84 | private String inHospitStatusStr; |
| 85 | 85 | /** |
| 86 | - * 住院提醒结果（1-成功、2-失败） | |
| 86 | + * 住院预约提醒结果（1-成功、2-失败） | |
| 87 | 87 | */ |
| 88 | 88 | private Integer inHospitResult; |
| 89 | 89 | private String inHospitResultStr; |
| 90 | 90 | /** |
| 91 | - * 住院操作员id | |
| 91 | + * 住院预约操作员id | |
| 92 | 92 | */ |
| 93 | 93 | private String inHospitDoctor; |
| 94 | 94 | /** |
| 95 | - * 住院操作时间 | |
| 95 | + * 住院预约操作时间 | |
| 96 | 96 | */ |
| 97 | 97 | private String inHospitDate; |
| 98 | 98 | /** |
| 99 | - * 住院预约时间 | |
| 99 | + * 住院预约预约时间 | |
| 100 | 100 | */ |
| 101 | 101 | private String inHospitMakeDate; |
| 102 | 102 | /** |
| 103 | - * 住院备注信息 | |
| 103 | + * 住院预约备注信息 | |
| 104 | 104 | */ |
| 105 | 105 | private String inHospitRemark; |
| 106 | 106 | /** |
| 107 | - * 住院失败原因（1-电话无人接听、2-他院已办理住院、3-暂时未确定、4-其他）2 | |
| 107 | + * 住院预约失败原因（1-电话无人接听、2-他院已办理住院、3-暂时未确定、4-其他）2 | |
| 108 | 108 | */ |
| 109 | 109 | private Integer inHospitFailure; |
| 110 | 110 | private String inHospitFailureStr; |