Commit 2a91cf526e08c6134cb0d5d41c50ef85d569745e
1 parent
293f4f6f99
Exists in
master
and in
6 other branches
//增加社保卡、就诊卡。
查询儿科医生id,随便默认一个儿科医生,查询科室名字中带有“儿”的医生
Showing 7 changed files with 35 additions and 2 deletions
- platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterUsersMapper.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/service/UsersService.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java
- platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml
- platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAppBuildAddRequest.java
platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterUsersMapper.java
View file @
2a91cf5
platform-biz-service/src/main/java/com/lyms/platform/permission/service/UsersService.java
View file @
2a91cf5
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java
View file @
2a91cf5
platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml
View file @
2a91cf5
... | ... | @@ -358,5 +358,15 @@ |
358 | 358 | <select id="getBabySeq" resultType="long" parameterType="String"> |
359 | 359 | select seq from baby_seq where year = #{yearStr} |
360 | 360 | </select> |
361 | + <select id="getUsersByDept" resultType="java.lang.String"> | |
362 | + SELECT | |
363 | + u.id | |
364 | + FROM | |
365 | + users u | |
366 | + LEFT JOIN departments d ON d.id = u.dept_id | |
367 | + WHERE | |
368 | + d.`name` LIKE '%儿%' | |
369 | + LIMIT 1 | |
370 | + </select> | |
361 | 371 | </mapper> |
platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
View file @
2a91cf5
... | ... | @@ -255,7 +255,9 @@ |
255 | 255 | //儿童姓名首字母拼音 |
256 | 256 | private String firstPyName; |
257 | 257 | |
258 | - //儿童社保卡 | |
258 | + /** | |
259 | + * 儿童社保卡 | |
260 | + */ | |
259 | 261 | private String sINCard; |
260 | 262 | /** |
261 | 263 | * 1, "有效",0, "无效" |
... | ... | @@ -296,7 +298,9 @@ |
296 | 298 | |
297 | 299 | //服务状态 |
298 | 300 | private Integer serviceStatus; |
299 | - //就诊卡号 | |
301 | + /** | |
302 | + * 就诊卡号 | |
303 | + */ | |
300 | 304 | private String vcCardNo; |
301 | 305 | //apgar评分 |
302 | 306 | private String apgarScore; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
2a91cf5
... | ... | @@ -6516,6 +6516,8 @@ |
6516 | 6516 | model.setDataStatus(2); |
6517 | 6517 | model.setBuildType(1); |
6518 | 6518 | model.setHospitalId(request.getHospitalId()); |
6519 | + model.setsINCard(request.getsINCard()); | |
6520 | + model.setVcCardNo(request.getVcCardNo()); | |
6519 | 6521 | //母亲 |
6520 | 6522 | model.setMname(request.getMommyName()); |
6521 | 6523 | model.setMcertNo(request.getMommyCardNo()); |
... | ... | @@ -6546,6 +6548,9 @@ |
6546 | 6548 | model.setBabyAddress(request.getBabyAddress()); |
6547 | 6549 | model.setBuildDate(new Date()); |
6548 | 6550 | model.setCreated(new Date()); |
6551 | + //查询儿科医生id,随便默认一个儿科医生,查询科室名字中带有“儿”的医生 | |
6552 | + String doctorId = usersService.getUsersByDept(model.getHospitalId()); | |
6553 | + model.setBuildDoctor(doctorId); | |
6549 | 6554 | model = babyBookbuildingService.addBabyBookbuilding(model); |
6550 | 6555 | }else { |
6551 | 6556 | return new BaseObjectResponse().setErrormsg("身份证号已经存在档案").setErrorcode(ErrorCodeConstants.DATA_EXIST); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAppBuildAddRequest.java
View file @
2a91cf5
... | ... | @@ -13,6 +13,9 @@ |
13 | 13 | @Form |
14 | 14 | public class BabyAppBuildAddRequest { |
15 | 15 | private String id; |
16 | + /** | |
17 | + *社保卡 | |
18 | + */ | |
16 | 19 | private String sINCard; |
17 | 20 | private String phone; |
18 | 21 | private String mommyCardNo; |
... | ... | @@ -20,6 +23,9 @@ |
20 | 23 | private String birth; |
21 | 24 | private String babyName; |
22 | 25 | private String mommyName; |
26 | + /** | |
27 | + * 就诊卡 | |
28 | + */ | |
23 | 29 | private String vcCardNo; |
24 | 30 | private String hospitalId; |
25 | 31 | //父亲 |