diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index 69c545f..dfbc68e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -165,14 +165,21 @@ public class DischargeAbstractFacade extends BaseServiceImpl { dischargeAbstractBabyModel.setpId(baby.getpId()); if (StringUtils.isEmpty(dischargeAbstractBabyModel.getId())) { dischargeAbstractBabyModelList.add(dischargeAbstractBabyModel); - operateLogFacade.addAddOptLog(userId, Integer.parseInt(hId), dischargeAbstractBabyModel, OptActionEnums.ADD.getId(), "添加出院小结儿童内容添加"); } else { - DischargeAbstractBabyQuery dischargeAbstractBabyQuery = new DischargeAbstractBabyQuery(); - dischargeAbstractBabyQuery.setId(dischargeAbstractBabyModel.getId()); - List list = dischargeAbstractBabyService.query(dischargeAbstractBabyQuery); - dischargeAbstractBabyService.update(dischargeAbstractBabyModel); - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hId), list.get(0), dischargeAbstractBabyModel, OptActionEnums.UPDATE.getId(), "修改出院小结儿童内容"); + dischargeAbstractBabyService.update(dischargeAbstractBabyModel); + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setPid(dischargeAbstractBabyModel.getpId()); + //查询儿童的基本信息 + List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + for (BabyModel b: babyModels) {//如果出院小结前有多个儿童档案都更新,后就无法控制了 + BabyModel babyModel = setBabyModel(dischargeAbstractBabyModel, b); + babyModel.setTxngNew(dischargeAbstractBabyModel.getTxngNew()); + babyModel.setKouqNew(dischargeAbstractBabyModel.getKouqNew()); + if(babyModel !=null && StringUtils.isNotBlank(babyModel.getId())){ + babyBookbuildingService.updateBabyBuild(babyModel,babyModel.getId()); + } + } } } } @@ -271,7 +278,7 @@ public class DischargeAbstractFacade extends BaseServiceImpl { } - if(babyModel.getHighRisk() == null && dabm.getIsHighRisk() != null){ //是否是高危儿童 + if(dabm.getIsHighRisk() != null){ //是否是高危儿童 if ("yes".equals(dabm.getIsHighRisk())) { babyModel.setHighRisk(1);