Commit 58417542446445688cff186dac9f96adbf5c15d8
1 parent
487253d4f8
Exists in
master
and in
1 other branch
儿童电子病历
Showing 1 changed file with 11 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
5841754
... | ... | @@ -165,7 +165,7 @@ |
165 | 165 | //查询儿童母亲身份证号码下面的产妇 |
166 | 166 | PatientsQuery patientsQuery = new PatientsQuery(); |
167 | 167 | patientsQuery.setYn(YnEnums.YES.getId()); |
168 | - patientsQuery.setPid(request.getMommyCertificateNum()); | |
168 | + patientsQuery.setCardNo(request.getMommyCertificateNum()); | |
169 | 169 | patientsQuery.setDueStatus(0); |
170 | 170 | List<Patients> pats = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); |
171 | 171 | if (CollectionUtils.isNotEmpty(pats)) |
172 | 172 | |
173 | 173 | |
... | ... | @@ -786,14 +786,18 @@ |
786 | 786 | |
787 | 787 | if (StringUtils.isNotEmpty(model.getBuildDoctor())) |
788 | 788 | { |
789 | - Users users = usersService.getUsers(Integer.parseInt(model.getBuildDoctor())); | |
790 | - if (users != null) | |
789 | + Map<String,String> doctorObj = new HashMap<>(); | |
790 | + doctorObj.put("id",model.getBuildDoctor()); | |
791 | + if ("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29".equals(model.getBuildDoctor())) | |
791 | 792 | { |
792 | - Map<String,String> doctorObj = new HashMap<>(); | |
793 | - doctorObj.put("id",model.getBuildDoctor()); | |
794 | - doctorObj.put("name",users.getName()); | |
795 | - result.setBuildDoctor(doctorObj); | |
793 | + doctorObj.put("name", "产科病房"); | |
796 | 794 | } |
795 | + else | |
796 | + { | |
797 | + Users users = usersService.getUsers(Integer.parseInt(model.getBuildDoctor())); | |
798 | + doctorObj.put("name", users.getName()); | |
799 | + } | |
800 | + result.setBuildDoctor(doctorObj); | |
797 | 801 | } |
798 | 802 | |
799 | 803 | result.setBuildDate(DateUtil.getyyyy_MM_dd(model.getBuildDate())); |