Commit 8d0c1d8ca9c028473e2cedd3dafe1b33a9ac1b8f
1 parent
0aebfe59e5
Exists in
master
and in
1 other branch
update
Showing 1 changed file with 18 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java
View file @
8d0c1d8
| ... | ... | @@ -188,8 +188,25 @@ |
| 188 | 188 | model.setOnly("0"); |
| 189 | 189 | } |
| 190 | 190 | model = babyKindergartenCheckService.add(model); |
| 191 | - if (model != null && model.getId() != null && "1".equals(model.getOnly()) ) { | |
| 191 | + | |
| 192 | + | |
| 193 | + //首次2 定期体检判断是否存在档案，存在就更新为主表id | |
| 194 | + List <BabyKindergartenCheckModel> babyResultList = null; | |
| 195 | + if (StringUtils.isNotEmpty(model.getPhon()) && "2".equals(model.getType()) ) { | |
| 196 | + BabyKindergartenCheckQuery babyQuery1 = new BabyKindergartenCheckQuery(); | |
| 197 | + babyQuery1.setYn(YnEnums.YES.getId()); | |
| 198 | + babyQuery1.setHospitalId(hospitalId); | |
| 199 | + babyQuery1.setPhon(model.getPhon()); | |
| 200 | + babyQuery1.setOnly("1"); | |
| 201 | + babyQuery1.setSort("checkDate"); | |
| 202 | + babyResultList = babyKindergartenCheckService.queryOne(babyQuery1); | |
| 203 | + } | |
| 204 | + | |
| 205 | + if ((model != null && model.getId() != null && "1".equals(model.getOnly()))|| CollectionUtils.isEmpty(babyResultList)) { | |
| 192 | 206 | BabyKindergartenCheckModel m = new BabyKindergartenCheckModel(); |
| 207 | + if(CollectionUtils.isEmpty(babyResultList)){ | |
| 208 | + m.setOnly("1"); | |
| 209 | + } | |
| 193 | 210 | m.setParentId(model.getId());//区分一个手机号码多个儿童 |
| 194 | 211 | babyKindergartenCheckService.update(m, model.getId()); |
| 195 | 212 |