diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index 42a546c..4935ec2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -84,6 +84,7 @@ public class ViewController extends BaseController { /** * 初诊B超同步接口 + * * @param startDate * @param endDate * @return @@ -91,8 +92,8 @@ public class ViewController extends BaseController { @RequestMapping(value = "/AntExChuSync", method = RequestMethod.GET) @ResponseBody public BaseObjectResponse AntExChuSync(@RequestParam("startDate") String startDate, - @RequestParam("endDate") String endDate ) { - BaseObjectResponse br= antenatalExaminationFacade.AntExChuSync( startDate, endDate,true ); + @RequestParam("endDate") String endDate) { + BaseObjectResponse br = antenatalExaminationFacade.AntExChuSync(startDate, endDate, true); return br; } @@ -953,7 +954,6 @@ public class ViewController extends BaseController { @TokenRequired public BaseResponse checkReport(@RequestParam(required = false) List antex, HttpServletRequest request) { - return viewFacade.checkReport(antex, getUserId(request)); } 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 698d87d..ee20596 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 @@ -24,6 +24,7 @@ import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.permission.service.impl.MeasureDataInfoServiceImpl; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import jdk.nashorn.internal.ir.LiteralNode; @@ -97,6 +98,9 @@ public class AntExRecordFacade { @Autowired private DzfyHisService dzfyHisService; + @Autowired + private MeasureDataInfoServiceImpl measureDataInfoService; + /** * 组合查询请求 * @@ -274,13 +278,11 @@ public class AntExRecordFacade { patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo()); patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified"); - if (CollectionUtils.isEmpty(patientses)) - { + if (CollectionUtils.isEmpty(patientses)) { String hospitalId = autoMatchFacade.getHospitalId(userId); if ("1000000114".equals(hospitalId)) { List list = dzfyHisService.getDzVcCardNos(antExManagerQueryRequest.getQueryNo()); - if (CollectionUtils.isNotEmpty(list)) - { + if (CollectionUtils.isNotEmpty(list)) { patientsQuery.setVcCardNos(list); patientsQuery.setQueryNo(null); patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified"); @@ -912,7 +914,16 @@ public class AntExRecordFacade { } /** - * 小程序产检录入 + * 小程序创建产检 + * + * @param fuh + * @param abdominalGirth + * @param fhr + * @param pid + * @param hospitalId + * @param nextTime + * @param doctorId + * @return */ public BaseResponse inputWxData(String fuh, String abdominalGirth, String fhr, String pid, String hospitalId, String nextTime, String doctorId) { WxMeasureInfoModel wxMeasureInfo = new WxMeasureInfoModel(); @@ -1028,6 +1039,29 @@ public class AntExRecordFacade { } antExAddRequest.setGuide(stringBuilder.toString()); } + //获取血压记录 + BloodPressure one = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(patients.getId()).and("yn").is(1).and("hospitalId").is(hospitalId)), BloodPressure.class); + if (one != null) { + Map> infos = one.getInfos(); + Map map = infos.get(DateUtil.getyyyy_MM_dd(new Date())); + if (map != null && map.size() > 0) { + Map mapBp = new HashMap(); + mapBp.put("ssy", map.get("ssy")); + mapBp.put("szy", map.get("szy")); + antExAddRequest.setBp(mapBp); + } + } + //获取体重记录 + PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("hospitalId").is(hospitalId).and("patientId").is(patients.getId()).and("yn").is("1")), PatientWeight.class); + if (patientWeight != null) { + Map dayWeights = patientWeight.getDayWeights(); + if (null != dayWeights && dayWeights.size() > 0) { + String valus = dayWeights.get(DateUtil.getyyyy_MM_dd(new Date())); + if (StringUtils.isNotEmpty(value)) { + antExAddRequest.setWeight(Double.valueOf(valus)); + } + } + } antenatalExaminationFacade.addOneAntEx(antExAddRequest, Integer.parseInt(doctorId)); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index ec2740e..e6aeb03 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -341,7 +341,6 @@ public class AntenatalExaminationFacade { sieveDao.updateChanQianSieve(sieveModel); } } - } else { model.setOperator(userId); model.setYn(YnEnums.YES.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java index 4419981..c9e7a1b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java @@ -958,6 +958,24 @@ public class MeasureInfoFacade { Map dayWeights = new LinkedHashMap<>(); List> dayWeights2 = new ArrayList<>(); + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setYn(YnEnums.YES.getId()); + antExQuery.setParentId(patients.getId()); + antExQuery.setHospitalId(hospitalId); + String date = DateUtil.getyyyy_MM_dd(new Date()); + antExQuery.setStart(DateUtil.parseYMDHMS(date + " 00:00:00")); + antExQuery.setEnd(DateUtil.parseYMDHMS(date + " 23:59:59")); + List antenatalExaminationModels = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); + if (CollectionUtils.isNotEmpty(antenatalExaminationModels)) { + AntenatalExaminationModel examinationModel = antenatalExaminationModels.get(0); + try { + examinationModel.setWeight(Double.valueOf(nutritionInfoRequest.getCurrentWeight())); + } catch (Exception e) { + + } + antenatalExaminationService.updateOneAnt(examinationModel, examinationModel.getId()); + } + String currentWeight = nutritionInfoRequest.getCurrentWeight(); if (CollectionUtils.isNotEmpty(patientWeights)) { PatientWeight pw = patientWeights.get(0); @@ -1095,6 +1113,7 @@ public class MeasureInfoFacade { bloodPressure.setSzy(nutritionInfoRequest.getSzy()); bloodPressure.setPulse(nutritionInfoRequest.getPulse()); + String hospitalId = nutritionInfoRequest.getHospitalId(); Map temp = new LinkedHashMap<>(); bloodPressure.setModified(new Date()); @@ -1119,6 +1138,7 @@ public class MeasureInfoFacade { Map> infos = new LinkedHashMap<>(); infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp); bloodPressure.setInfos(infos); + bloodPressureService.add(bloodPressure); } else { Map> infos = bp.getInfos(); @@ -1129,6 +1149,28 @@ public class MeasureInfoFacade { bloodPressureService.update(bloodPressure); } + //复诊自动获取血压 + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setYn(YnEnums.YES.getId()); + antExQuery.setParentId(p.getId()); + antExQuery.setHospitalId(hospitalId); + String date = DateUtil.getyyyy_MM_dd(new Date()); + antExQuery.setStart(DateUtil.parseYMDHMS(date + " 00:00:00")); + antExQuery.setEnd(DateUtil.parseYMDHMS(date + " 23:59:59")); + List antenatalExaminationModels = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); + if (CollectionUtils.isNotEmpty(antenatalExaminationModels)) { + AntenatalExaminationModel examinationModel = antenatalExaminationModels.get(0); + Map map = new HashMap(); + map.put("szy", bloodPressure.getSzy()); + map.put("ssy", bloodPressure.getSsy()); + try { + examinationModel.setBp(JsonUtil.obj2JsonString(map)); + } catch (Exception e) { + } + antenatalExaminationService.updateOneAnt(examinationModel, examinationModel.getId()); + } + + MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest(); measureInfoRequest.setCertNo(p.getCardNo()); measureInfoRequest.setCertType(p.getPcerteTypeId());