diff --git a/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/PmsPatientDao.xml b/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/PmsPatientDao.xml index 3fe550d..d0868ed 100644 --- a/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/PmsPatientDao.xml +++ b/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/PmsPatientDao.xml @@ -92,7 +92,7 @@ MAX(ee.create_time) as lastEvaluationTime, uu.nick_name as lastTesterName, COUNT(ee.id) as evaluationCount, - (select nick_name from ums_user where user_name = pp.create_by and del_flag = 0) as creatorName, + (select nick_name from ums_user where user_name = pp.create_by and del_flag = 0) as createBy, pp.create_time as createTime, ud.dept_name as hospitalName, pp.birthday, diff --git a/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/RmsDao.xml b/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/RmsDao.xml index bb421a4..3cb9cb3 100644 --- a/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/RmsDao.xml +++ b/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/RmsDao.xml @@ -1023,7 +1023,7 @@ d.dept_name as hospitalName IFNULL(GROUP_CONCAT(DISTINCT q.name SEPARATOR ','), '') AS scaleNames FROM rms_report rr - Left Join pms_patient_body pb on rr.visit_no = pb.outpatient_no + Left Join pms_patient_body pb on rr.visit_no = pb.outpatient_no and pb.del_flag = 0 LEFT JOIN pms_patient pp on pb.patient_id = pp.id left join ems_evaluation ee on rr.evaluation_id = ee.id LEFT JOIN hms_version hv on ee.version = hv.id diff --git a/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/IEmsServiceImpl.java b/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/IEmsServiceImpl.java index d0ef068..2f7c785 100644 --- a/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/IEmsServiceImpl.java +++ b/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/IEmsServiceImpl.java @@ -261,7 +261,7 @@ public class IEmsServiceImpl implements IEmsService { PmsPatientBody patientBody = null; PmsPatientBodyExample patientBodyExample = new PmsPatientBodyExample(); patientBodyExample.createCriteria().andPatientIdEqualTo(dto.getPatientId()); - patientBodyExample.setOrderByClause("id desc"); + patientBodyExample.setOrderByClause("update_time desc"); List pmsPatientBodies = patientBodyMapper.selectByExample(patientBodyExample); if (CollectionUtil.isNotEmpty(pmsPatientBodies)) { patientBody = pmsPatientBodies.get(0);