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 1a8168b..3f4eec8 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 @@ -1977,6 +1977,10 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(antExChuModels)) { lastTime = DateUtil.getyyyy_MM_dd(antExChuModels.get(0).getCheckTime()); antexListResult.setTireNumber1(antExChuModels.get(0).getTireNumber()); + + antexListResult.setTreatmentOpinion2Types(mongoUtil.findPlatValues(antExChuModels.get(0).getTreatmentOpinion2Types())); + antexListResult.setTreatmentOpinion2(mongoUtil.findPlatList(antExChuModels.get(0).getTreatmentOpinion2())); + } else { PatientsQuery patientsQuery1 = new PatientsQuery(); patientsQuery1.setYn(YnEnums.YES.getId()); @@ -2001,6 +2005,8 @@ public class AntenatalExaminationFacade { if ((days >= 253) && days <= 258) { antexListResult.setIsH("1"); } + + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java index 85cbc3a..fde3f16 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java @@ -21,7 +21,9 @@ public class AntexListResult { private String id; /** 处理意见 */ - private List> treatmentOpinion2; + private List treatmentOpinion2; + /** 处理意见 */ + private String treatmentOpinion2Types; private String pid; //名字 @@ -57,11 +59,19 @@ public class AntexListResult { // - public List> getTreatmentOpinion2() { + public String getTreatmentOpinion2Types() { + return treatmentOpinion2Types; + } + + public void setTreatmentOpinion2Types(String treatmentOpinion2Types) { + this.treatmentOpinion2Types = treatmentOpinion2Types; + } + + public List getTreatmentOpinion2() { return treatmentOpinion2; } - public void setTreatmentOpinion2(List> treatmentOpinion2) { + public void setTreatmentOpinion2(List treatmentOpinion2) { this.treatmentOpinion2 = treatmentOpinion2; }