Commit 8cb5c1ba1560938fc2f8bc55535c94f860ca13f3
1 parent
0b77a0b3ea
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 14 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
View file @
8cb5c1b
| ... | ... | @@ -165,14 +165,21 @@ |
| 165 | 165 | dischargeAbstractBabyModel.setpId(baby.getpId()); |
| 166 | 166 | if (StringUtils.isEmpty(dischargeAbstractBabyModel.getId())) { |
| 167 | 167 | dischargeAbstractBabyModelList.add(dischargeAbstractBabyModel); |
| 168 | - operateLogFacade.addAddOptLog(userId, Integer.parseInt(hId), dischargeAbstractBabyModel, OptActionEnums.ADD.getId(), "添加出院小结儿童内容添加"); | |
| 169 | 168 | } else { |
| 170 | - DischargeAbstractBabyQuery dischargeAbstractBabyQuery = new DischargeAbstractBabyQuery(); | |
| 171 | - dischargeAbstractBabyQuery.setId(dischargeAbstractBabyModel.getId()); | |
| 172 | - List<DischargeAbstractBabyModel> list = dischargeAbstractBabyService.query(dischargeAbstractBabyQuery); | |
| 173 | - dischargeAbstractBabyService.update(dischargeAbstractBabyModel); | |
| 174 | 169 | |
| 175 | - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hId), list.get(0), dischargeAbstractBabyModel, OptActionEnums.UPDATE.getId(), "修改出院小结儿童内容"); | |
| 170 | + dischargeAbstractBabyService.update(dischargeAbstractBabyModel); | |
| 171 | + BabyModelQuery babyQuery = new BabyModelQuery(); | |
| 172 | + babyQuery.setPid(dischargeAbstractBabyModel.getpId()); | |
| 173 | + //查询儿童的基本信息 | |
| 174 | + List <BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyQuery); | |
| 175 | + for (BabyModel b: babyModels) {//如果出院小结前有多个儿童档案都更新，后就无法控制了 | |
| 176 | + BabyModel babyModel = setBabyModel(dischargeAbstractBabyModel, b); | |
| 177 | + babyModel.setTxngNew(dischargeAbstractBabyModel.getTxngNew()); | |
| 178 | + babyModel.setKouqNew(dischargeAbstractBabyModel.getKouqNew()); | |
| 179 | + if(babyModel !=null && StringUtils.isNotBlank(babyModel.getId())){ | |
| 180 | + babyBookbuildingService.updateBabyBuild(babyModel,babyModel.getId()); | |
| 181 | + } | |
| 182 | + } | |
| 176 | 183 | } |
| 177 | 184 | } |
| 178 | 185 | } |
| ... | ... | @@ -271,7 +278,7 @@ |
| 271 | 278 | } |
| 272 | 279 | |
| 273 | 280 | |
| 274 | - if(babyModel.getHighRisk() == null && dabm.getIsHighRisk() != null){ //是否是高危儿童 | |
| 281 | + if(dabm.getIsHighRisk() != null){ //是否是高危儿童 | |
| 275 | 282 | if ("yes".equals(dabm.getIsHighRisk())) |
| 276 | 283 | { |
| 277 | 284 | babyModel.setHighRisk(1); |