Commit dffdd110790d4cb252102dcfd6cd06b8e1d3511e
1 parent
e97ca04f06
Exists in
master
and in
6 other branches
服务同步
Showing 2 changed files with 8 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
View file @
dffdd11
| ... | ... | @@ -115,6 +115,7 @@ |
| 115 | 115 | //根据用户id获取医院ID |
| 116 | 116 | // String hospitalId = autoMatchFacade.getHospitalId(id); |
| 117 | 117 | PatientServiceQuery patientQuery = new PatientServiceQuery(); |
| 118 | + //显示所有医院 | |
| 118 | 119 | // patientQuery.setHospitalId(hospitalId); |
| 119 | 120 | patientQuery.setParentid(pid); |
| 120 | 121 | patientQuery.setSort("create_date desc"); |
| 121 | 122 | |
| ... | ... | @@ -313,8 +314,10 @@ |
| 313 | 314 | result.setUpdateUser(users.getName()); |
| 314 | 315 | } |
| 315 | 316 | } catch (Exception e) { |
| 316 | - result.setSerDoctStr("产检医生"); | |
| 317 | + result.setUpdateUser("产检医生"); | |
| 317 | 318 | } |
| 319 | + }else { | |
| 320 | + result.setUpdateUser("小程序开通"); | |
| 318 | 321 | } |
| 319 | 322 | result.setParentid(ps.getParentid()); |
| 320 | 323 | result.setCreateDate(DateUtil.getyyyy_MM_dd(ps.getCreateDate())); |
| ... | ... | @@ -331,7 +334,7 @@ |
| 331 | 334 | result.setSerCode(ps.getSerCode()); |
| 332 | 335 | result.setCreateUser(ps.getCreateUser()); |
| 333 | 336 | result.setUpdateDate(DateUtil.getyyyy_MM_dd(ps.getUpdateDate())); |
| 334 | - if (ps.getSerDoct() != null) { | |
| 337 | + if (StringUtils.isNotEmpty(ps.getSerDoct())) { | |
| 335 | 338 | try { |
| 336 | 339 | Users users = usersService.getUsers(Integer.parseInt(ps.getSerDoct())); |
| 337 | 340 | if (users != null) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java
View file @
dffdd11
| ... | ... | @@ -47,9 +47,8 @@ |
| 47 | 47 | patientQuery.setParentid(patientService.getParentid()); |
| 48 | 48 | //开通服务 |
| 49 | 49 | patientQuery.setSerType(patientService.getSerType()); |
| 50 | - //指定医生 | |
| 51 | - patientQuery.setSerDoct(patientService.getSerDoct()); | |
| 52 | - | |
| 50 | + //开通医院 | |
| 51 | + patientQuery.setHospitalId(patientService.getHospitalId()); | |
| 53 | 52 | List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery); |
| 54 | 53 | if (CollectionUtils.isNotEmpty(patientServices)) {//修改 |
| 55 | 54 | PatientService ps = patientServices.get(0); |
| ... | ... | @@ -61,6 +60,7 @@ |
| 61 | 60 | } else {//新增 |
| 62 | 61 | patientService.setId(UUID.randomUUID().toString().replace("-", "")); |
| 63 | 62 | int serType = patientService.getSerType(); |
| 63 | + patientService.setUpdateDate(new Date()); | |
| 64 | 64 | // 1高危精准指导、5-专家咨询默认已经领取 |
| 65 | 65 | if(serType == PatientSerEnums.SerTypeEnums.yqjzzd.getId()||serType == PatientSerEnums.SerTypeEnums.zjzx.getId()){ |
| 66 | 66 | //默认已领取 |