diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 4c1d65e..1bd9986 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -1764,7 +1764,14 @@ public class AntExRecordFacade { WxMeasureInfoModel wxMeasureInfo = new WxMeasureInfoModel(); boolean falg = true; if (StringUtils.isNotEmpty(pid) && StringUtils.isNotEmpty(hospitalId)) { - if (isOpenAutoSaveAntenatal(hospitalId) && !"216".equals(hospitalId)) { + if (isOpenAutoSaveAntenatal(hospitalId)) { + List fhrList = new ArrayList<>(); + if(StringUtils.isNotEmpty(fhr)) { + String[] split = fhr.split(","); + for (String s : split) { + fhrList.add(s); + } + } System.out.println("inputWxData enter 1"); List examinationModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid)), AntenatalExaminationModel.class); if (CollectionUtils.isNotEmpty(examinationModel)) { @@ -1775,10 +1782,11 @@ public class AntExRecordFacade { model.setGongGao(fuh); model.setAbdominalCircumference(abdominalGirth); model.setSieveType(sieveType); - List list = JsonUtil.jkstr2Obj(fhr, List.class); - if (CollectionUtils.isNotEmpty(list)) { + + + if (CollectionUtils.isNotEmpty(fhrList)) { List placentaList = new ArrayList<>(); - for (String l : list) { + for (String l : fhrList) { if (StringUtils.isEmpty(l)) { continue; } @@ -1788,12 +1796,19 @@ public class AntExRecordFacade { } model.setTireData(placentaList); - model.setTireNumber(list.size() + ""); + model.setTireNumber(fhrList.size() + ""); } + + model.setCheckDoctor(doctorId); model.setEdema(edema); if(StringUtils.isNotEmpty(riskFactor)){ - model.setRiskFactor(JsonUtil.array2JsonString(riskFactor)); + String[] split = riskFactor.split(","); + List list = new ArrayList<>(); + for(String s : split){ + list.add(s); + } + model.setRiskFactor(JsonUtil.array2JsonString(list)); } antenatalExaminationService.updateOneAnt(model, model.getId()); @@ -1891,10 +1906,13 @@ public class AntExRecordFacade { antExAddRequest.setGongGao(fuh); antExAddRequest.setAbdominalCircumference(abdominalGirth); - List list = JsonUtil.jkstr2Obj(fhr, List.class); - if (CollectionUtils.isNotEmpty(list)) { + + if (CollectionUtils.isNotEmpty(fhrList)) { + + + List placentaList = new ArrayList<>(); - for (String l : list) { + for (String l : fhrList) { if (StringUtils.isEmpty(l)) { continue; } @@ -1903,7 +1921,7 @@ public class AntExRecordFacade { placentaList.add(map); } antExAddRequest.setTireData(placentaList); - antExAddRequest.setTireNumber(list.size() + ""); + antExAddRequest.setTireNumber(fhrList.size() + ""); antExAddRequest.setNextCheckTime(nextTime); GuidelinesQuery guidelinesQuery = new GuidelinesQuery();