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 2a22f1c..faacdd2 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 @@ -414,6 +414,7 @@ public class AntExRecordFacade { patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo()); patientsQuery.setHighRiskFileCode(antExManagerQueryRequest.getHighRiskFileCode()); + System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified"); if (CollectionUtils.isEmpty(patientses)) { @@ -443,10 +444,9 @@ public class AntExRecordFacade { parentIds.add(pa.getId()); } antExRecordQuery.setParentIds(parentIds); - } else if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) { + } else if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo()) || StringUtils.isNotEmpty(antExManagerQueryRequest.getHighRiskFileCode())) { return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(antExRecordQuery.getPageInfo()); } - String hospital = autoMatchFacade.getHospitalId(userId); List antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created"); List data = getAntExRecords(antExRecordModelList, hospital, isRegion, antExManagerQueryRequest.getShowDetail()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java index 9f82047..0fdfaaa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java @@ -370,6 +370,36 @@ public class AntexChuResult { //存活胎儿数 private Integer survFetus; + + //大同高危手册 + private String other;//高危手册初诊其他 + private String symptoms;//高危手册症状与体征 + private String otherCheck;//高危手册其他检查项 + + public String getOther() { + return other; + } + + public void setOther(String other) { + this.other = other; + } + + public String getSymptoms() { + return symptoms; + } + + public void setSymptoms(String symptoms) { + this.symptoms = symptoms; + } + + public String getOtherCheck() { + return otherCheck; + } + + public void setOtherCheck(String otherCheck) { + this.otherCheck = otherCheck; + } + public String getZyzlState() { return zyzlState; } @@ -2532,6 +2562,10 @@ public class AntexChuResult { setFollowupDoctorName(antExChuModel.getFollowupDoctorName()); setFollowupDate(antExChuModel.getFollowupDate()); setName(antExChuModel.getName()); + + setOther(antExChuModel.getOther()); + setOtherCheck(antExChuModel.getOtherCheck()); + setSymptoms(antExChuModel.getSymptoms()); } return this; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java index 91fcdae..b1086cd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java @@ -791,7 +791,7 @@ public class MaternalDeliverResult { setCfyc(destModel.getCfyc()); setBabySize(destModel.getBabySize()); - setPerinealCondition(destModel.getPerinealCondition()); + setPelvicCondition(destModel.getPelvicCondition()); setCurrentCondition(destModel.getCurrentCondition()); setDtDiagnosis(destModel.getDtDiagnosis()); setAdvice(destModel.getAdvice());