diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutoDiagnoseRiskFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutoDiagnoseRiskFacade.java index b8e77cb..3ebeecf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutoDiagnoseRiskFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutoDiagnoseRiskFacade.java @@ -862,7 +862,7 @@ public class BabyAutoDiagnoseRiskFacade { * @Author: 武涛涛 * @Date: 2020/9/3 15:22 */ - public BaseResponse updateStatus(AutoBabyRiskRecord autoBabyRiskRecord, Integer userId) { + public BaseResponse updateStatus_2021back(AutoBabyRiskRecord autoBabyRiskRecord, Integer userId) { //当前登录人医院Id String hospitalId = autoMatchFacade.getHospitalId(userId); AutoBabyRiskRecord autoBabyRiskRecord1 = queryById(autoBabyRiskRecord.getId()); @@ -912,11 +912,70 @@ public class BabyAutoDiagnoseRiskFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + public BaseResponse updateStatus(AutoBabyRiskRecord autoBabyRiskRecord, Integer userId) { + //当前登录人医院Id + String hospitalId = autoMatchFacade.getHospitalId(userId); + AutoBabyRiskRecord autoBabyRiskRecord1 = queryById(autoBabyRiskRecord.getId()); + if(autoBabyRiskRecord1 ==null){ + return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有改数据"); + } + + //修改成确认状态后，修改最后一条检查诊断，或修改儿童建档诊断 + BabyCheckModelQuery query = new BabyCheckModelQuery(); + query.setYn(YnEnums.YES.getId()); + query.setBuildId(autoBabyRiskRecord1.getBabyId()); + //查询儿童的检查记录 + List babyCheckModels = babyCheckService.queryBabyCheckRecord(query); + //诊断listmap转liststring + List list = new ArrayList<>(); + List stringList = new ArrayList<>(); + getDiagnosisId(autoBabyRiskRecord1, list); + boolean bb = false; + if (CollectionUtils.isNotEmpty(babyCheckModels)) { + bb = true; + BabyCheckModel babyCheckModel = babyCheckModels.get(0); + if (babyCheckModel != null && StringUtils.isNotEmpty(babyCheckModel.getDiagnose())) { + stringList = JsonUtil.toList(babyCheckModel.getDiagnose(), String.class); + } + if (CollectionUtils.isNotEmpty(list)) { + stringList.addAll(list); + JSONArray jsonArray = JSONArray.fromObject(stringList); + mongoTemplate.updateFirst(new Query(Criteria.where("id").is(babyCheckModel.getId())), Update.update("diagnose", jsonArray.toString()).set("highRisk", 1), BabyCheckModel.class); + } + } else if (CollectionUtils.isEmpty(babyCheckModels)) { + Set setbabyModel = new HashSet<>(); + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setId(autoBabyRiskRecord1.getBabyId()); + babyQuery.setYn(YnEnums.YES.getId()); + List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + if (CollectionUtils.isNotEmpty(models)) { + bb = true; + BabyModel babyModel = models.get(0); + List babyModelList = JsonUtil.toList(babyModel.getDiagnose(), String.class); + setbabyModel.addAll(babyModelList); + + if (CollectionUtils.isNotEmpty(list)) { + setbabyModel.addAll(list); + JSONArray jsonArray = JSONArray.fromObject(setbabyModel); + mongoTemplate.updateFirst(new Query(Criteria.where("id").is(babyModel.getId())), Update.update("diagnose", jsonArray.toString()).set("highRisk", 1), BabyModel.class); + } + } + } + + if (autoBabyRiskRecord1 != null && autoBabyRiskRecord1.getId() != null && bb) { + mongoTemplate.updateFirst(new Query(Criteria.where("id").is(autoBabyRiskRecord1.getId())), Update.update("status", 1), AutoBabyRiskRecord.class); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + }else { + return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("失败"); + } + + + } public BaseResponse saveLisBabyData(List lisResultModelRequests) { for (LisResultModelRequest modelRequest : lisResultModelRequests) { - + System.out.println("----1----getHospitalId: "+modelRequest.getHospitalId()+"---------getVcCardNo: "+modelRequest.getVcCardNo()+"--------getXhdb: "+modelRequest.getXhdb()); if (StringUtils.isEmpty(modelRequest.getHospitalId()) || StringUtils.isEmpty(modelRequest.getVcCardNo()) || StringUtils.isEmpty(modelRequest.getXhdb())) { continue; } @@ -925,6 +984,7 @@ public class BabyAutoDiagnoseRiskFacade { babyQuery.setHospitalId(modelRequest.getHospitalId());//查询上传医院儿童档案 babyQuery.setVcCardNo(modelRequest.getVcCardNo()); List builds = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + System.out.println("--2-------builds-------"+builds.size()); if (CollectionUtils.isNotEmpty(builds)) { BabyModel babyModel = builds.get(0); if (babyModel == null && StringUtils.isEmpty(babyModel.getId())) { @@ -935,6 +995,8 @@ public class BabyAutoDiagnoseRiskFacade { query.setYn(YnEnums.YES.getId()); query.setBuildId(babyModel.getId()); List babyCheckModels = babyCheckService.queryBabyCheckRecord(query); + System.out.println("--3-------babyCheckModels-------"+babyCheckModels.size()); + if (CollectionUtils.isEmpty(babyCheckModels)) { continue; } @@ -946,7 +1008,9 @@ public class BabyAutoDiagnoseRiskFacade { Set setbabyModel = new HashSet<>(); List babyModelList = new ArrayList<>(); try { - babyModelList = JsonUtil.toList(babyCheckModel.getDiagnose(), String.class); +// babyModelList = JsonUtil.toList(babyCheckModel.getDiagnose(), String.class); + babyModelList = babyCheckModel.getHighRiskInfo(); + System.out.println("--4-------babyModelList-------"+babyModelList.size()); } catch (Exception e) { e.printStackTrace(); } @@ -960,26 +1024,32 @@ public class BabyAutoDiagnoseRiskFacade { babies.add(baby); babyAutoRiskRequest.setBabies(babies); List> maps = autoRisk(babyAutoRiskRequest, babyCheckModel.getHospitalId(), 2, 0); + System.out.println("--5-------maps-------"+maps.size()); + babyModelList.addAll(getListMap(maps)); } catch (Exception e) { e.printStackTrace(); } - // 注意：这里是不管以前有没有血红蛋白都会累加高危 + // 注意：这里是不管以前有没有血红蛋白都会累加高危，更新血红蛋白 setbabyModel.addAll(babyModelList); - + System.out.println("--6-------maps-------"+setbabyModel.size()); if(CollectionUtils.isNotEmpty(babyModelList)){ BabyCheckModel model = new BabyCheckModel(); - JSONArray jsonArray = JSONArray.fromObject(setbabyModel); - model.setDiagnose(jsonArray.toString()); +// JSONArray jsonArray = JSONArray.fromObject(setbabyModel); +// model.setDiagnose(jsonArray.toString()); + model.setHighRiskInfo(new ArrayList<>(setbabyModel)); model.setHighRisk(1); model.setHemoglobin(modelRequest.getXhdb()); model.setModified(new Date()); babyCheckService.updateBabyCheck(model, babyCheckModel.getId()); + System.out.println("--------7.1--------------"+babyCheckModel.getId()); }else if(StringUtils.isEmpty(babyCheckModel.getHemoglobin())){//以前有血红蛋白，没有自动诊断高危是不更新 BabyCheckModel model = new BabyCheckModel(); model.setHemoglobin(modelRequest.getXhdb()); model.setModified(new Date()); babyCheckService.updateBabyCheck(model, babyCheckModel.getId()); + System.out.println("--------7.2--------------"+babyCheckModel.getId()); + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index de479be..288989d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -448,7 +448,7 @@ public class MatDeliverFacade { //新增分娩信息 matDeliverService.addMatDeliver(maternalDeliverModel); - //儿童自动诊断 + /*//儿童自动诊断,20210109 张洁说分娩时候不用自动诊断 try { List baby = maternalDeliverModel.getBaby(); for (int i = 0; i