合并后端

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/PmsPatientVo.java

@@ -893,6 +893,52 @@ public class PmsPatientVo {
 
         private String hospitalName;
         private Integer birthYear;
+        @ApiModelProperty("病人名字")
+        private String name;
+        @ApiModelProperty("名称首字母")
+        private String nameInitial;
+        @ApiModelProperty("名称全全拼")
+        private String nameFull;
+        @ApiModelProperty("病人门诊号")
+        private String patientNumber;
+        @ApiModelProperty("病人住院号")
+        private String hospitalNumber;
+        @ApiModelProperty("婚姻状况（1：未婚2：已婚 3：离异 4：分居 5：丧偶 6：同居 7：其他 ）")
+        private Byte maritalStatus;
+        @ApiModelProperty("教育程度（1：文盲 2：小学 3：初中 4：高中 5：大学 6：大学以上 7：其他）")
+        private Byte educationalStatus;
+        @ApiModelProperty("受教育时间（年或月）")
+        private String educationalStatusUnit;
+        @ApiModelProperty("民族")
+        private String nation;
+        @ApiModelProperty("籍贯")
+        private String nativePlace;
+        @ApiModelProperty("职业（1：农林牧渔水利生产人员 2：教师 3：医务工作者 4：专业技术人员 5：生产、运输设备操作人员及有关人员6：商业、服务业人员7：国家机关、事业单位、企业负责人8：国家机关、事业单位、企业办事人员和有关人员9：军人 10：媒体、文体类工作人员 11：在校学生 12：未就业 13：家务 14：其他")
+        private Byte career;
+        @ApiModelProperty("生育数量")
+        private Integer birthNumber;
+        @ApiModelProperty("绝经年龄（女）")
+        private Integer menopauseAge;
+        @ApiModelProperty("联系人")
+        private String contact;
+        @ApiModelProperty("手机")
+        private String mobile;
+        @ApiModelProperty("电话")
+        private String phone;
+        @ApiModelProperty("省份")
+        private String province;
+        @ApiModelProperty("城市")
+        private String city;
+        @ApiModelProperty("住址")
+        private String address;
+        @ApiModelProperty("住所（1：自己家中 2：养老院 3：其他）")
+        private Byte domicile;
+        @ApiModelProperty("独立生活能力（1：能够独立生活 2：需要他人帮助完成复杂活动 3：需要他人帮助完成基本活动 4：完全依赖他人生活 5：未知 6：其他）")
+        private Byte independentLivingSkills;
+        @ApiModelProperty("居住状态（1：独居 2：与配偶或对象或子女 3：与亲戚或朋友居住）")
+        private Byte dwellingState;
+        private String birthday;
+        private String contactName;
 
         @ApiModelProperty("其他病史信息")
         private Map<String,List<Map<String, Object>>> otherMsg;

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java

@@ -185,7 +185,7 @@ public class RmsVo {
 
         private String visitNo;
         private String scaleName;
-        private Byte needPlan;
+        private Integer needPlan;
 
         private String deptName;
         private Byte evaluationStatus = 1;

ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/controller/StatisticsController.java

@@ -1,6 +1,8 @@
 package com.ccsens.admin.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.ccsens.common.annotation.Anonymous;
+import com.ccsens.common.constant.WebConstant;
 import com.ccsens.common.core.domain.JsonResponse;
 import com.ccsens.system.domain.dto.StatisticsDto;
 import com.ccsens.system.domain.vo.HomeDpVo;
@@ -13,8 +15,11 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -37,6 +42,15 @@ public class StatisticsController {
     @ApiOperation("获取疾病统计信息")
     @PostMapping("/nntotal")
     public JsonResponse<HomeDpVo.Zhsjgl> nntotal(@RequestBody StatisticsDto.Query dto) {
+        if (dto.getDeptId() == null) {
+            // 获取请求携带的令牌
+            HttpServletRequest request = ((ServletRequestAttributes)
+                    RequestContextHolder.getRequestAttributes()).getRequest();
+            String deptId = request.getHeader(WebConstant.HEADER_KEY_DEPT_ID);
+            if (StrUtil.isNotEmpty(deptId)) {
+                dto.setDeptId(Long.parseLong(deptId));
+            }
+        }
         return JsonResponse.ok(statisticsService.nntotal(dto));
     }
 
@@ -44,6 +58,15 @@ public class StatisticsController {
     @ApiOperation("BMI")
     @PostMapping("/nnbmihjxy")
     public JsonResponse<HomeDpVo.Bmi> nnbmihjxy(@RequestBody StatisticsDto.Query dto) {
+        if (dto.getDeptId() == null) {
+            // 获取请求携带的令牌
+            HttpServletRequest request = ((ServletRequestAttributes)
+                    RequestContextHolder.getRequestAttributes()).getRequest();
+            String deptId = request.getHeader(WebConstant.HEADER_KEY_DEPT_ID);
+            if (StrUtil.isNotEmpty(deptId)) {
+                dto.setDeptId(Long.parseLong(deptId));
+            }
+        }
         return JsonResponse.ok(statisticsService.nnbmihjxy(dto));
     }
 
@@ -51,6 +74,15 @@ public class StatisticsController {
     @ApiOperation("评估情况")
     @PostMapping("/nnlast")
     public JsonResponse<List<HomeDpVo.Pgqk>> nnlast(@RequestBody StatisticsDto.Query dto) {
+        if (dto.getDeptId() == null) {
+            // 获取请求携带的令牌
+            HttpServletRequest request = ((ServletRequestAttributes)
+                    RequestContextHolder.getRequestAttributes()).getRequest();
+            String deptId = request.getHeader(WebConstant.HEADER_KEY_DEPT_ID);
+            if (StrUtil.isNotEmpty(deptId)) {
+                dto.setDeptId(Long.parseLong(deptId));
+            }
+        }
         return JsonResponse.ok(statisticsService.nnlast(dto));
     }
 
@@ -58,6 +90,15 @@ public class StatisticsController {
     @ApiOperation("年龄")
     @PostMapping("/nnage")
     public JsonResponse<HomeDpVo.Nlfb> nnage(@RequestBody StatisticsDto.Query dto) {
+        if (dto.getDeptId() == null) {
+            // 获取请求携带的令牌
+            HttpServletRequest request = ((ServletRequestAttributes)
+                    RequestContextHolder.getRequestAttributes()).getRequest();
+            String deptId = request.getHeader(WebConstant.HEADER_KEY_DEPT_ID);
+            if (StrUtil.isNotEmpty(deptId)) {
+                dto.setDeptId(Long.parseLong(deptId));
+            }
+        }
         return JsonResponse.ok(statisticsService.nnage(dto));
     }
 
@@ -65,6 +106,15 @@ public class StatisticsController {
     @ApiOperation("T值")
     @PostMapping("/nntgb")
     public JsonResponse<HomeDpVo.Tz> nntgb(@RequestBody StatisticsDto.Query dto) {
+        if (dto.getDeptId() == null) {
+            // 获取请求携带的令牌
+            HttpServletRequest request = ((ServletRequestAttributes)
+                    RequestContextHolder.getRequestAttributes()).getRequest();
+            String deptId = request.getHeader(WebConstant.HEADER_KEY_DEPT_ID);
+            if (StrUtil.isNotEmpty(deptId)) {
+                dto.setDeptId(Long.parseLong(deptId));
+            }
+        }
         return JsonResponse.ok(statisticsService.nntgb(dto));
     }
 
@@ -72,6 +122,15 @@ public class StatisticsController {
     @ApiOperation("疾病排行")
     @PostMapping("/nnicd")
     public JsonResponse<List<HomeDpVo.Jbph>> nnicd(@RequestBody StatisticsDto.Query dto) {
+        if (dto.getDeptId() == null) {
+            // 获取请求携带的令牌
+            HttpServletRequest request = ((ServletRequestAttributes)
+                    RequestContextHolder.getRequestAttributes()).getRequest();
+            String deptId = request.getHeader(WebConstant.HEADER_KEY_DEPT_ID);
+            if (StrUtil.isNotEmpty(deptId)) {
+                dto.setDeptId(Long.parseLong(deptId));
+            }
+        }
         return JsonResponse.ok(statisticsService.nnicd(dto));
     }
 
@@ -79,6 +138,15 @@ public class StatisticsController {
     @ApiOperation("地图")
     @PostMapping("/nnmap")
     public JsonResponse<List<HomeDpVo.Dt>> nnmap(@RequestBody  StatisticsDto.Query dto) {
+        if (dto.getDeptId() == null) {
+            // 获取请求携带的令牌
+            HttpServletRequest request = ((ServletRequestAttributes)
+                    RequestContextHolder.getRequestAttributes()).getRequest();
+            String deptId = request.getHeader(WebConstant.HEADER_KEY_DEPT_ID);
+            if (StrUtil.isNotEmpty(deptId)) {
+                dto.setDeptId(Long.parseLong(deptId));
+            }
+        }
         return JsonResponse.ok(statisticsService.nnmap(dto));
     }
 
@@ -86,6 +154,15 @@ public class StatisticsController {
     @ApiOperation("评估结果")
     @PostMapping("/nnscale")
     public JsonResponse<List<HomeDpVo.Pgjg>> nnscale(@RequestBody StatisticsDto.Query dto) {
+        if (dto.getDeptId() == null) {
+            // 获取请求携带的令牌
+            HttpServletRequest request = ((ServletRequestAttributes)
+                    RequestContextHolder.getRequestAttributes()).getRequest();
+            String deptId = request.getHeader(WebConstant.HEADER_KEY_DEPT_ID);
+            if (StrUtil.isNotEmpty(deptId)) {
+                dto.setDeptId(Long.parseLong(deptId));
+            }
+        }
         return JsonResponse.ok(statisticsService.nnscale(dto));
     }
 
@@ -93,6 +170,15 @@ public class StatisticsController {
     @ApiOperation("学历统计")
     @PostMapping("/qualificationStatistics")
     public JsonResponse<List<HomeDpVo.QualificationStatistics>> qualificationStatistics(@RequestBody StatisticsDto.Query dto) {
+        if (dto.getDeptId() == null) {
+            // 获取请求携带的令牌
+            HttpServletRequest request = ((ServletRequestAttributes)
+                    RequestContextHolder.getRequestAttributes()).getRequest();
+            String deptId = request.getHeader(WebConstant.HEADER_KEY_DEPT_ID);
+            if (StrUtil.isNotEmpty(deptId)) {
+                dto.setDeptId(Long.parseLong(deptId));
+            }
+        }
         return JsonResponse.ok(statisticsService.qualificationStatistics(dto));
     }
 
@@ -100,6 +186,15 @@ public class StatisticsController {
     @ApiOperation("就诊数量统计")
     @PostMapping("/jzStatistics")
     public JsonResponse<HomeDpVo.JzStatistics> jzStatistics(@RequestBody StatisticsDto.Query dto){
+        if (dto.getDeptId() == null) {
+            // 获取请求携带的令牌
+            HttpServletRequest request = ((ServletRequestAttributes)
+                    RequestContextHolder.getRequestAttributes()).getRequest();
+            String deptId = request.getHeader(WebConstant.HEADER_KEY_DEPT_ID);
+            if (StrUtil.isNotEmpty(deptId)) {
+                dto.setDeptId(Long.parseLong(deptId));
+            }
+        }
         return JsonResponse.ok(statisticsService.jzStatistics(dto));
     }
 
@@ -107,6 +202,15 @@ public class StatisticsController {
     @ApiOperation("测评量表统计")
     @PostMapping("/scaleStatistics")
     public JsonResponse<List<HomeDpVo.ScaleStatistics>> scaleStatistics(@RequestBody StatisticsDto.Query dto){
+        if (dto.getDeptId() == null) {
+            // 获取请求携带的令牌
+            HttpServletRequest request = ((ServletRequestAttributes)
+                    RequestContextHolder.getRequestAttributes()).getRequest();
+            String deptId = request.getHeader(WebConstant.HEADER_KEY_DEPT_ID);
+            if (StrUtil.isNotEmpty(deptId)) {
+                dto.setDeptId(Long.parseLong(deptId));
+            }
+        }
         return JsonResponse.ok(statisticsService.scaleStatistics(dto));
     }
 
@@ -114,6 +218,15 @@ public class StatisticsController {
     @ApiOperation("测评版本统计")
     @PostMapping("/versionStatistics")
     public JsonResponse<List<HomeDpVo.VersionStatistics>> versionStatistics(@RequestBody StatisticsDto.Query dto){
+        if (dto.getDeptId() == null) {
+            // 获取请求携带的令牌
+            HttpServletRequest request = ((ServletRequestAttributes)
+                    RequestContextHolder.getRequestAttributes()).getRequest();
+            String deptId = request.getHeader(WebConstant.HEADER_KEY_DEPT_ID);
+            if (StrUtil.isNotEmpty(deptId)) {
+                dto.setDeptId(Long.parseLong(deptId));
+            }
+        }
         return JsonResponse.ok(statisticsService.versionStatistics(dto));
     }
 
@@ -121,6 +234,15 @@ public class StatisticsController {
     @ApiOperation("测评师测评统计")
     @PostMapping("/userStatistics")
     public JsonResponse<List<HomeDpVo.UserStatistics>> userStatistics(@RequestBody StatisticsDto.Query dto){
+        if (dto.getDeptId() == null) {
+            // 获取请求携带的令牌
+            HttpServletRequest request = ((ServletRequestAttributes)
+                    RequestContextHolder.getRequestAttributes()).getRequest();
+            String deptId = request.getHeader(WebConstant.HEADER_KEY_DEPT_ID);
+            if (StrUtil.isNotEmpty(deptId)) {
+                dto.setDeptId(Long.parseLong(deptId));
+            }
+        }
         return JsonResponse.ok(statisticsService.userStatistics(dto));
     }
 
@@ -128,6 +250,15 @@ public class StatisticsController {
     @ApiOperation("性别统计")
     @PostMapping("/sexStatistics")
     public JsonResponse<HomeDpVo.SexStatistics> sexStatistics(@RequestBody StatisticsDto.Query dto){
+        if (dto.getDeptId() == null) {
+            // 获取请求携带的令牌
+            HttpServletRequest request = ((ServletRequestAttributes)
+                    RequestContextHolder.getRequestAttributes()).getRequest();
+            String deptId = request.getHeader(WebConstant.HEADER_KEY_DEPT_ID);
+            if (StrUtil.isNotEmpty(deptId)) {
+                dto.setDeptId(Long.parseLong(deptId));
+            }
+        }
         return JsonResponse.ok(statisticsService.sexStatistics(dto));
     }
 
@@ -135,6 +266,15 @@ public class StatisticsController {
     @ApiOperation("吸烟饮酒统计")
     @PostMapping("/xyYjStatistics")
     public JsonResponse<HomeDpVo.XyYjStatistics> xyYjStatistics(@RequestBody StatisticsDto.Query dto){
+        if (dto.getDeptId() == null) {
+            // 获取请求携带的令牌
+            HttpServletRequest request = ((ServletRequestAttributes)
+                    RequestContextHolder.getRequestAttributes()).getRequest();
+            String deptId = request.getHeader(WebConstant.HEADER_KEY_DEPT_ID);
+            if (StrUtil.isNotEmpty(deptId)) {
+                dto.setDeptId(Long.parseLong(deptId));
+            }
+        }
         return JsonResponse.ok(statisticsService.xyYjStatistics(dto));
     }
 }

ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/controller/TjfxController.java

@@ -1,6 +1,8 @@
 package com.ccsens.admin.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.ccsens.common.annotation.Anonymous;
+import com.ccsens.common.constant.WebConstant;
 import com.ccsens.common.core.domain.JsonResponse;
 import com.ccsens.system.domain.dto.StatisticsDto;
 import com.ccsens.system.domain.vo.HomeDpVo;
@@ -8,16 +10,19 @@ import com.ccsens.system.service.StatisticsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.HttpRequestHandler;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
- *
  * @Author zzc
  * @Package com.ccsens.admin.controller
  * @Date 2025/9/6 9:47
@@ -78,7 +83,7 @@ public class TjfxController {
     @Anonymous
     @ApiOperation("地图")
     @PostMapping("/nnmap")
-    public JsonResponse<List<HomeDpVo.Dt>> nnmap(@RequestBody  StatisticsDto.Query dto) {
+    public JsonResponse<List<HomeDpVo.Dt>> nnmap(@RequestBody StatisticsDto.Query dto) {
         return JsonResponse.ok(statisticsService.nnmap(dto));
     }
 
@@ -99,42 +104,51 @@ public class TjfxController {
     @Anonymous
     @ApiOperation("就诊数量统计")
     @PostMapping("/jzStatistics")
-    public JsonResponse<HomeDpVo.JzStatistics> jzStatistics(@RequestBody StatisticsDto.Query dto){
+    public JsonResponse<HomeDpVo.JzStatistics> jzStatistics(@RequestBody StatisticsDto.Query dto) {
         return JsonResponse.ok(statisticsService.jzStatistics(dto));
     }
 
     @Anonymous
     @ApiOperation("测评量表统计")
     @PostMapping("/scaleStatistics")
-    public JsonResponse<List<HomeDpVo.ScaleStatistics>> scaleStatistics(@RequestBody StatisticsDto.Query dto){
+    public JsonResponse<List<HomeDpVo.ScaleStatistics>> scaleStatistics(@RequestBody StatisticsDto.Query dto) {
         return JsonResponse.ok(statisticsService.scaleStatistics(dto));
     }
 
     @Anonymous
     @ApiOperation("测评版本统计")
     @PostMapping("/versionStatistics")
-    public JsonResponse<List<HomeDpVo.VersionStatistics>> versionStatistics(@RequestBody StatisticsDto.Query dto){
+    public JsonResponse<List<HomeDpVo.VersionStatistics>> versionStatistics(@RequestBody StatisticsDto.Query dto) {
         return JsonResponse.ok(statisticsService.versionStatistics(dto));
     }
 
     @Anonymous
     @ApiOperation("测评师测评统计")
     @PostMapping("/userStatistics")
-    public JsonResponse<List<HomeDpVo.UserStatistics>> userStatistics(@RequestBody StatisticsDto.Query dto){
+    public JsonResponse<List<HomeDpVo.UserStatistics>> userStatistics(@RequestBody StatisticsDto.Query dto) {
         return JsonResponse.ok(statisticsService.userStatistics(dto));
     }
 
     @Anonymous
     @ApiOperation("性别统计统计")
     @PostMapping("/sexStatistics")
-    public JsonResponse<HomeDpVo.SexStatistics> sexStatistics(@RequestBody StatisticsDto.Query dto){
+    public JsonResponse<HomeDpVo.SexStatistics> sexStatistics(@RequestBody StatisticsDto.Query dto) {
         return JsonResponse.ok(statisticsService.sexStatistics(dto));
     }
 
     @Anonymous
     @ApiOperation("吸烟饮酒统计")
     @PostMapping("/xyYjStatistics")
-    public JsonResponse<HomeDpVo.XyYjStatistics> xyYjStatistics(@RequestBody StatisticsDto.Query dto){
+    public JsonResponse<HomeDpVo.XyYjStatistics> xyYjStatistics(@RequestBody StatisticsDto.Query dto) {
+        if (dto.getDeptId() == null) {
+            // 获取请求携带的令牌
+            HttpServletRequest request = ((ServletRequestAttributes)
+                    RequestContextHolder.getRequestAttributes()).getRequest();
+            String deptId = request.getHeader(WebConstant.HEADER_KEY_DEPT_ID);
+            if (StrUtil.isNotEmpty(deptId)) {
+                dto.setDeptId(Long.parseLong(deptId));
+            }
+        }
         return JsonResponse.ok(statisticsService.xyYjStatistics(dto));
     }
 }

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,
@@ -281,7 +281,28 @@
         b.is_main_diagnosis as isMainDiagnosis,
         b.diagnosis_code as diagnosisCode,
         b.diagnosis_name as diagnosisName,
-        b.diagnosis_date as diagnosisDate
+        b.diagnosis_date as diagnosisDate,
+        b.create_time as createTime,
+        b.create_by as createBy,
+        p.hospital_id as hospitalId,
+        p.hospital_number as hospitalNumber,
+        p.patient_number as patientNumber,
+        p.native_place as nativePlace,
+        p.nation,
+        p.phone,
+        p.mobile,
+        p.birth_year as birthYear,
+        p.birth_number as birthNumber,
+        p.menopause_age as menopauseAge,
+        p.educational_status as  educationalStatus,
+        p.educational_status_unit as educationalStatusUnit,
+        p.marital_status as maritalStatus,
+        p.dwelling_state as dwellingState,
+        p.birthday,
+        p.career,
+        p.address,
+        p.native_place as nativePlace,
+        p.contact_name as contactName
 
         from
         pms_patient_body b

ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/RmsDao.xml

@@ -1019,14 +1019,17 @@ d.dept_name                as hospitalName
         hv.version as versionName,
         uu.nick_name as testerName,
         FROM_UNIXTIME(rr.report_time / 1000, '%Y-%m-%d') as evaluationTime,
-        ee.complete_status as completeStatus
+        ee.complete_status as completeStatus,
+        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
         LEFT JOIN ums_user uu on ee.tester_id = uu.user_id
+        LEFT JOIN ems_evaluation_scale_relevance e on e.evaluation_id = ee.id and e.del_flag = 0
+        LEFT join qms_scale q on q.code = e.scale_code and q.del_flag = 0
         WHERE
         ee.del_flag = 0
         <if test="dto.completeStatus != null">
@@ -1065,24 +1068,6 @@ d.dept_name                as hospitalName
             WHERE user_id = #{userId}
             )
         </if>
-<!--        <choose>-->
-<!--            <when test="dataScope == 5">-->
-<!--                and (pp.create_by = #{userName} or ee.tester_id = #{userId})-->
-<!--            </when>-->
-<!--            <when test="dataScope == 3 or dataScope == 4">-->
-<!--                and uu.dept_id = (SELECT dept_id FROM ums_user WHERE user_id = #{userId})-->
-<!--            </when>-->
-<!--            <when test="dataScope == 2">-->
-<!--                and uu.dept_id in (-->
-<!--                SELECT pud.dept_id FROM ums_user u-->
-<!--                LEFT JOIN ums_dept ud ON ud.dept_id = u.dept_id-->
-<!--                LEFT JOIN ums_dept pud ON pud.dept_id = ud.parent_id-->
-<!--                WHERE u.user_id = #{userId}-->
-<!--                UNION ALL-->
-<!--                SELECT u.dept_id FROM ums_user u WHERE u.user_id = #{userId}-->
-<!--                )-->
-<!--            </when>-->
-<!--        </choose>-->
         group by rr.id
         order by rr.create_time desc
     </select>
@@ -1438,7 +1423,7 @@ d.dept_name                as hospitalName
         select
         e.id,
         e.id as evaluationId,
-        e.doctor_name as testerName,
+        u.nick_name as testerName,
         e.patient_id as patientId,
         pp.name as name,
         e.patient_idcard as patientIdcard,

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/AmsReportServiceImpl.java

@@ -2291,22 +2291,22 @@ public class AmsReportServiceImpl implements AmsReportService {
         //1. 查询是否已生成对应版本的报告单
         RmsReport report = rmsReportMapper.selectByPrimaryKey(dto.getReportId());
         if (ObjectUtil.isNotNull(report)) {
-            if (dto.getVersion() != null && dto.getVersion() == 0 && report.getAllUrl() != null) {
+            if (dto.getVersion() != null && dto.getVersion() == 0 && StrUtil.isNotEmpty(report.getAllUrl())) {
                 AmsReportVo.Result result = new AmsReportVo.Result();
                 result.setPath(report.getAllUrl());
                 return result;
             }
-            if (dto.getVersion() != null && dto.getVersion() == 1 && report.getUrl() != null) {
+            if (dto.getVersion() != null && dto.getVersion() == 1 && StrUtil.isNotEmpty(report.getUrl())) {
                 AmsReportVo.Result result = new AmsReportVo.Result();
                 result.setPath(report.getUrl());
                 return result;
             }
-            if (dto.getVersion() != null && dto.getVersion() == 2 && report.getPersionUrl() != null) {
+            if (dto.getVersion() != null && dto.getVersion() == 2 && StrUtil.isNotEmpty(report.getPersionUrl())) {
                 AmsReportVo.Result result = new AmsReportVo.Result();
                 result.setPath(report.getPersionUrl());
                 return result;
             }
-            if (dto.getVersion() != null && dto.getVersion() == 3 && report.getPositiveUrl() != null) {
+            if (dto.getVersion() != null && dto.getVersion() == 3 && StrUtil.isNotEmpty(report.getPositiveUrl())) {
                 AmsReportVo.Result result = new AmsReportVo.Result();
                 result.setPath(report.getPositiveUrl());
                 return result;

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/IEmsServiceImpl.java

@@ -261,6 +261,7 @@ public class IEmsServiceImpl implements IEmsService {
         PmsPatientBody patientBody = null;
         PmsPatientBodyExample patientBodyExample = new PmsPatientBodyExample();
         patientBodyExample.createCriteria().andPatientIdEqualTo(dto.getPatientId());
+        patientBodyExample.setOrderByClause("update_time desc");
         List<PmsPatientBody> pmsPatientBodies = patientBodyMapper.selectByExample(patientBodyExample);
         if (CollectionUtil.isNotEmpty(pmsPatientBodies)) {
             patientBody = pmsPatientBodies.get(0);

ruisi_java/ruisi-web-client/src/main/resources/application-dev.yml

@@ -11,14 +11,14 @@ spring:
 #        password: po3OynBO[M3579p6L7)o
         url: jdbc:mysql://127.0.0.1:3306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: 123456
+        password: q7510327
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
         enabled: true
         url: jdbc:mysql://127.0.0.1:3306/ruisi_cga_yf?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: 123456
+        password: q7510327
 #        driverClassName: oracle.jdbc.driver.OracleDriver
 #        url: jdbc:oracle:thin:@200.1.8.115:1521:hisdb
 #        username: interface_lnpg

ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/RmsDao.xml

@@ -1171,7 +1171,7 @@ group by ee.id
         LEFT JOIN pms_patient pp on ee.patient_id = pp.id
         LEFT JOIN ums_user uu on ee.tester_id = uu.user_id
         LEFT JOIN ems_evaluation_aduit a on ee.id = a.evaluation_id and a.del_flag = 0
-        left join pms_patient_body b on pp.id = b.patient_id
+        left join pms_patient_body b on pp.id = b.patient_id and ee.visit_no = b.outpatient_no and b.del_flag = 0
         left join hms_version v on v.id = ee.version
 
         WHERE