diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntexDoctorStatistController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntexDoctorStatistController.java index fa431dc..42c6335 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntexDoctorStatistController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntexDoctorStatistController.java @@ -183,7 +183,6 @@ public class AntexDoctorStatistController extends BaseController { //复诊集合列表 List antenatalExaminationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery()); - List antextDoctorPatient = new ArrayList<>(); //添加初诊结果 for (AntExChuModel ac : antExChuModels) { AntextDoctorPatient doctorPatient = resultInfo.get(ac.getParentId()); @@ -191,9 +190,9 @@ public class AntexDoctorStatistController extends BaseController { if (ac.getCheckTime().after(doctorPatient.getCheckTime())) { doctorPatient.setCheckTime(ac.getCheckTime()); - doctorPatient.setCheckTimeStr(DateUtil.getyyyy_MM_dd(ac.getCheckTime())); - doctorPatient.setCheckDoctor(ac.getProdDoctor()); + doctorPatient.setDoctorId(ac.getProdDoctor()); } + doctorPatient.setCheckTimeStr(DateUtil.getyyyy_MM_dd(doctorPatient.getCheckTime())); } //添加复诊结果 for (AntenatalExaminationModel aec : antenatalExaminationModels) { @@ -201,9 +200,9 @@ public class AntexDoctorStatistController extends BaseController { doctorPatient.setAllCjNum(doctorPatient.getAllCjNum() + 1); if (aec.getCheckDate().after(doctorPatient.getCheckTime())) { doctorPatient.setCheckTime(aec.getCheckDate()); - doctorPatient.setCheckTimeStr(DateUtil.getyyyy_MM_dd(aec.getCheckDate())); - doctorPatient.setCheckDoctor(aec.getCheckDoctor()); + doctorPatient.setDoctorId(aec.getCheckDoctor()); } + doctorPatient.setCheckTimeStr(DateUtil.getyyyy_MM_dd(doctorPatient.getCheckTime())); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntextDoctorPatient.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntextDoctorPatient.java index a45f66f..2bfc555 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntextDoctorPatient.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntextDoctorPatient.java @@ -35,8 +35,6 @@ public class AntextDoctorPatient { private Date checkTime; //产检时间 private String checkTimeStr; - //产检医生 - private String checkDoctor; public String getDoctorName() { return doctorName; @@ -70,13 +68,6 @@ public class AntextDoctorPatient { this.checkTime = checkTime; } - public String getCheckDoctor() { - return checkDoctor; - } - - public void setCheckDoctor(String checkDoctor) { - this.checkDoctor = checkDoctor; - } public int getCjNum() { return cjNum; @@ -163,7 +154,6 @@ public class AntextDoctorPatient { ", cDueWeek='" + cDueWeek + '\'' + ", dueFmDate=" + dueFmDate + ", checkTime=" + checkTime + - ", checkDoctor='" + checkDoctor + '\'' + '}'; } }