修改统计

ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/web/service/SysLoginService.java

@@ -95,7 +95,7 @@ public class SysLoginService {
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"), null));
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
         //非总测评师不能登录
-        if (!loginUser.getUser().isAdmin() || CollectionUtil.isEmpty(loginUser.getUser().getRoles()) || !loginUser.getUser().getRoles().stream().map(e -> e.getRoleKey()).collect(Collectors.toList()).contains("yy_zcps")) {
+        if (!loginUser.getUser().isAdmin() && ( CollectionUtil.isEmpty(loginUser.getUser().getRoles()) || !loginUser.getUser().getRoles().stream().map(e -> e.getRoleKey()).collect(Collectors.toList()).contains("yy_zcps"))) {
             throw new BaseException(ErrorConstant.USER_NO_PERMISSION);
         }
         recordLoginInfo(loginUser.getUserId());

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

@@ -98,7 +98,7 @@ public class HomeDpVo {
             if (StrUtil.isNotEmpty(name)) {
                 switch (name) {
                     case "DCYY-TP":
-                       return "多重用药";
+                        return "多重用药";
                     case "CIRS-G":
                         return "老年共病";
                     case "theFRAILscale":
@@ -149,6 +149,26 @@ public class HomeDpVo {
     public static class QualificationStatistics {
         private String qualification;
         private int num;
+
+//        public String getQualification() {
+//            //1文盲、2小学、3初中、4高中/技校/中专、5大专/大学、6研究生及以上
+//            switch (qualification) {
+//                case "1":
+//                    return "文盲";
+//                case "2":
+//                    return "小学";
+//                case "3":
+//                    return "初中";
+//                case "4":
+//                    return "高中/技校/中专";
+//                case "5":
+//                    return "大专/大学";
+//                case "6":
+//                    return "研究生及以上";
+//                default:
+//                    return "未知";
+//            }
+//        }
     }
 
     @Data

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/service/impl/StatisticsServiceImpl.java

@@ -175,7 +175,12 @@ public class StatisticsServiceImpl implements StatisticsService {
             dto.setBeginTime(dateByType.get(0));
             dto.setEndTime(dateByType.get(1));
         }
-        return statisticsDao.sexStatistics(dto);
+        HomeDpVo.SexStatistics sexStatistics = new HomeDpVo.SexStatistics();
+
+        sexStatistics.setBoy(statisticsDao.getPatientNum(dto, (byte) 0));
+        sexStatistics.setGirl(statisticsDao.getPatientNum(dto, (byte) 1));
+
+        return sexStatistics;
     }
 
     @Override

ruisi_java/ruisi-system/src/main/resources/mapper/dao/StatisticsDao.xml

@@ -30,10 +30,9 @@
             COUNT(DISTINCT p.id) AS total
         FROM
             pms_patient p
-        LEFT JOIN ums_user u ON p.create_by = u.user_name
         where p.del_flag = 0
         <if test="dto.deptId != null">
-            AND u.dept_id = #{dto.deptId}
+            AND p.hospital_id = #{dto.deptId}
         </if>
         <if test="dto.beginTime != null">
             AND p.create_time >= #{dto.beginTime}
@@ -145,13 +144,13 @@
             COUNT(b.id) AS value
         FROM
             pms_patient_body b
-        LEFT JOIN ums_user u ON b.create_by = u.user_name
+        LEFT JOIN pms_patient p ON b.patient_id = p.id
         WHERE
         b.diagnosis_name IS NOT NULL
           and diagnosis_name != ''
           and b.del_flag = 0
         <if test="dto.deptId != null">
-            AND u.dept_id = #{dto.deptId}
+            AND p.hospital_id = #{dto.deptId}
         </if>
         <if test="dto.beginTime != null">
             AND b.create_time >= #{dto.beginTime}
@@ -220,6 +219,7 @@
         LEFT JOIN rms_report rr ON rr.evaluation_id = e.id
         LEFT JOIN rms_report_scale_score rs ON rs.report_id = rr.id and r.scale_code = rs.scale_code
         LEFT JOIN ums_user u ON r.create_by = u.user_name
+        LEFT JOIN pms_patient p ON e.patient_id = p.id
         where e.del_flag = 0
           and r.scale_code in (
                          "DCYY-TP",
@@ -236,7 +236,7 @@
                          "CAM"
             )
         <if test="dto.deptId != null">
-            AND u.dept_id = #{dto.deptId}
+            AND p.hospital_id = #{dto.deptId}
         </if>
         <if test="dto.beginTime != null">
             AND r.create_time >= #{dto.beginTime}
@@ -249,16 +249,14 @@
 
     <select id="qualificationStatistics" resultType="com.ccsens.system.domain.vo.HomeDpVo$QualificationStatistics">
         SELECT
-            s.dict_value AS qualification,
+        p.educational_status AS qualification,
             COUNT( p.id ) AS num
         FROM
-            sys_dict_data s
-                LEFT JOIN pms_patient p ON p.educational_status = s.dict_value AND p.del_flag = 0
-                LEFT JOIN ums_user u ON p.create_by = u.user_name
+            pms_patient p
         where
-            s.dict_type = 'sys_qualification'
+        p.del_flag = 0
         <if test="dto.deptId != null">
-            AND u.dept_id = #{dto.deptId}
+            AND p.hospital_id = #{dto.deptId}
         </if>
         <if test="dto.beginTime != null">
             AND p.create_time >= #{dto.beginTime}
@@ -267,7 +265,7 @@
             AND p.create_time &lt;= #{dto.endTime}
         </if>
         GROUP BY
-            p.educational_status
+        p.educational_status
         ORDER BY
             qualification desc
     </select>
@@ -361,10 +359,11 @@
         LEFT JOIN ems_evaluation_scale_relevance ees on e.id = ees.evaluation_id AND ees.del_flag = 0
         LEFT JOIN qms_scale qs ON qs.code = ees.scale_code
         LEFT JOIN ums_user u ON e.create_by = u.user_name AND u.del_flag = 0
+        LEFT JOIN pms_patient p ON e.patient_id = p.id
         WHERE
             e.del_flag = 0
         <if test="dto.deptId != null">
-            AND u.dept_id = #{dto.deptId}
+            AND p.hospital_id = #{dto.deptId}
         </if>
         <if test="dto.beginTime != null">
             AND ees.create_time >= #{dto.beginTime}

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

@@ -41,7 +41,7 @@ public class StatisticsController {
     @Anonymous
     @ApiOperation("获取疾病统计信息")
     @PostMapping("/nntotal")
-    public JsonResponse<HomeDpVo.Zhsjgl> nntotal(@RequestBody StatisticsDto.Query dto) {
+    public JsonResponse<HomeDpVo.Zhsjgl> nntotal(StatisticsDto.Query dto) {
         if (dto.getDeptId() == null) {
             // 获取请求携带的令牌
             HttpServletRequest request = ((ServletRequestAttributes)
@@ -57,7 +57,7 @@ public class StatisticsController {
     @Anonymous
     @ApiOperation("BMI")
     @PostMapping("/nnbmihjxy")
-    public JsonResponse<HomeDpVo.Bmi> nnbmihjxy(@RequestBody StatisticsDto.Query dto) {
+    public JsonResponse<HomeDpVo.Bmi> nnbmihjxy(StatisticsDto.Query dto) {
         if (dto.getDeptId() == null) {
             // 获取请求携带的令牌
             HttpServletRequest request = ((ServletRequestAttributes)
@@ -73,7 +73,7 @@ public class StatisticsController {
     @Anonymous
     @ApiOperation("评估情况")
     @PostMapping("/nnlast")
-    public JsonResponse<List<HomeDpVo.Pgqk>> nnlast(@RequestBody StatisticsDto.Query dto) {
+    public JsonResponse<List<HomeDpVo.Pgqk>> nnlast(StatisticsDto.Query dto) {
         if (dto.getDeptId() == null) {
             // 获取请求携带的令牌
             HttpServletRequest request = ((ServletRequestAttributes)
@@ -89,7 +89,7 @@ public class StatisticsController {
     @Anonymous
     @ApiOperation("年龄")
     @PostMapping("/nnage")
-    public JsonResponse<HomeDpVo.Nlfb> nnage(@RequestBody StatisticsDto.Query dto) {
+    public JsonResponse<HomeDpVo.Nlfb> nnage(StatisticsDto.Query dto) {
         if (dto.getDeptId() == null) {
             // 获取请求携带的令牌
             HttpServletRequest request = ((ServletRequestAttributes)
@@ -105,7 +105,7 @@ public class StatisticsController {
     @Anonymous
     @ApiOperation("T值")
     @PostMapping("/nntgb")
-    public JsonResponse<HomeDpVo.Tz> nntgb(@RequestBody StatisticsDto.Query dto) {
+    public JsonResponse<HomeDpVo.Tz> nntgb(StatisticsDto.Query dto) {
         if (dto.getDeptId() == null) {
             // 获取请求携带的令牌
             HttpServletRequest request = ((ServletRequestAttributes)
@@ -121,7 +121,7 @@ public class StatisticsController {
     @Anonymous
     @ApiOperation("疾病排行")
     @PostMapping("/nnicd")
-    public JsonResponse<List<HomeDpVo.Jbph>> nnicd(@RequestBody StatisticsDto.Query dto) {
+    public JsonResponse<List<HomeDpVo.Jbph>> nnicd(StatisticsDto.Query dto) {
         if (dto.getDeptId() == null) {
             // 获取请求携带的令牌
             HttpServletRequest request = ((ServletRequestAttributes)
@@ -137,7 +137,7 @@ public class StatisticsController {
     @Anonymous
     @ApiOperation("地图")
     @PostMapping("/nnmap")
-    public JsonResponse<List<HomeDpVo.Dt>> nnmap(@RequestBody  StatisticsDto.Query dto) {
+    public JsonResponse<List<HomeDpVo.Dt>> nnmap( StatisticsDto.Query dto) {
         if (dto.getDeptId() == null) {
             // 获取请求携带的令牌
             HttpServletRequest request = ((ServletRequestAttributes)
@@ -153,7 +153,7 @@ public class StatisticsController {
     @Anonymous
     @ApiOperation("评估结果")
     @PostMapping("/nnscale")
-    public JsonResponse<List<HomeDpVo.Pgjg>> nnscale(@RequestBody StatisticsDto.Query dto) {
+    public JsonResponse<List<HomeDpVo.Pgjg>> nnscale(StatisticsDto.Query dto) {
         if (dto.getDeptId() == null) {
             // 获取请求携带的令牌
             HttpServletRequest request = ((ServletRequestAttributes)
@@ -169,7 +169,7 @@ public class StatisticsController {
     @Anonymous
     @ApiOperation("学历统计")
     @PostMapping("/qualificationStatistics")
-    public JsonResponse<List<HomeDpVo.QualificationStatistics>> qualificationStatistics(@RequestBody StatisticsDto.Query dto) {
+    public JsonResponse<List<HomeDpVo.QualificationStatistics>> qualificationStatistics(StatisticsDto.Query dto) {
         if (dto.getDeptId() == null) {
             // 获取请求携带的令牌
             HttpServletRequest request = ((ServletRequestAttributes)
@@ -185,7 +185,7 @@ public class StatisticsController {
     @Anonymous
     @ApiOperation("就诊数量统计")
     @PostMapping("/jzStatistics")
-    public JsonResponse<HomeDpVo.JzStatistics> jzStatistics(@RequestBody StatisticsDto.Query dto){
+    public JsonResponse<HomeDpVo.JzStatistics> jzStatistics(StatisticsDto.Query dto){
         if (dto.getDeptId() == null) {
             // 获取请求携带的令牌
             HttpServletRequest request = ((ServletRequestAttributes)
@@ -201,7 +201,7 @@ public class StatisticsController {
     @Anonymous
     @ApiOperation("测评量表统计")
     @PostMapping("/scaleStatistics")
-    public JsonResponse<List<HomeDpVo.ScaleStatistics>> scaleStatistics(@RequestBody StatisticsDto.Query dto){
+    public JsonResponse<List<HomeDpVo.ScaleStatistics>> scaleStatistics(StatisticsDto.Query dto){
         if (dto.getDeptId() == null) {
             // 获取请求携带的令牌
             HttpServletRequest request = ((ServletRequestAttributes)
@@ -217,7 +217,7 @@ public class StatisticsController {
     @Anonymous
     @ApiOperation("测评版本统计")
     @PostMapping("/versionStatistics")
-    public JsonResponse<List<HomeDpVo.VersionStatistics>> versionStatistics(@RequestBody StatisticsDto.Query dto){
+    public JsonResponse<List<HomeDpVo.VersionStatistics>> versionStatistics(StatisticsDto.Query dto){
         if (dto.getDeptId() == null) {
             // 获取请求携带的令牌
             HttpServletRequest request = ((ServletRequestAttributes)
@@ -233,7 +233,7 @@ public class StatisticsController {
     @Anonymous
     @ApiOperation("测评师测评统计")
     @PostMapping("/userStatistics")
-    public JsonResponse<List<HomeDpVo.UserStatistics>> userStatistics(@RequestBody StatisticsDto.Query dto){
+    public JsonResponse<List<HomeDpVo.UserStatistics>> userStatistics(StatisticsDto.Query dto){
         if (dto.getDeptId() == null) {
             // 获取请求携带的令牌
             HttpServletRequest request = ((ServletRequestAttributes)
@@ -249,7 +249,7 @@ public class StatisticsController {
     @Anonymous
     @ApiOperation("性别统计")
     @PostMapping("/sexStatistics")
-    public JsonResponse<HomeDpVo.SexStatistics> sexStatistics(@RequestBody StatisticsDto.Query dto){
+    public JsonResponse<HomeDpVo.SexStatistics> sexStatistics(StatisticsDto.Query dto){
         if (dto.getDeptId() == null) {
             // 获取请求携带的令牌
             HttpServletRequest request = ((ServletRequestAttributes)
@@ -265,7 +265,7 @@ public class StatisticsController {
     @Anonymous
     @ApiOperation("吸烟饮酒统计")
     @PostMapping("/xyYjStatistics")
-    public JsonResponse<HomeDpVo.XyYjStatistics> xyYjStatistics(@RequestBody StatisticsDto.Query dto){
+    public JsonResponse<HomeDpVo.XyYjStatistics> xyYjStatistics(StatisticsDto.Query dto){
         if (dto.getDeptId() == null) {
             // 获取请求携带的令牌
             HttpServletRequest request = ((ServletRequestAttributes)

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

@@ -66,28 +66,28 @@ spring:
         wall:
           config:
             multi-statement-allow: true
-    # redis 配置
-    redis:
-      # 地址
-      host: 172.20.9.15
-      # 端口，默认为6379
-      port: 26379
-      # 数据库索引
-      database: 1
-      # 密码
-      password: redis111^#
-      # 连接超时时间
-      timeout: 10s
-      lettuce:
-        pool:
-          # 连接池中的最小空闲连接
-          min-idle: 0
-          # 连接池中的最大空闲连接
-          max-idle: 8
-          # 连接池的最大数据库连接数
-          max-active: 8
-          # #连接池最大阻塞等待时间（使用负值表示没有限制）
-          max-wait: -1ms
+  # redis 配置
+  redis:
+    # 地址
+    host: 172.20.9.15
+    # 端口，默认为6379
+    port: 26379
+    # 数据库索引
+    database: 1
+    # 密码
+    password: redis111^#
+    # 连接超时时间
+    timeout: 10s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
 
   # 核心：SpringBoot全局UTF-8编码配置
   server:
@@ -110,7 +110,7 @@ app:
   # 资源访问路径前缀 示例（/profile）
   profileUrl: /profile
   # 资源存储路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profilePath: /data/cgav2/server/profile
+  profilePath: /data/cgav2/profile
   # 分布式ID-WorkID
   workerId: 1
   # 分布式ID-DataCenterID
@@ -127,6 +127,8 @@ file:
   reportPath: /data/cgav2/profile
   grPath: /data/cgav2/profile/grReportTemplate.docx
   ysPath: /data/cgav2/profile/ysReportTemplate.docx
+  allPath: /data/cgav2/profile/allPath.docx
+
 informed:
   studySign: /data/cgav2/profile/studySign.png
   template: /data/cgav2/profile/知情同意模板.docx

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

@@ -57,6 +57,8 @@
         pp.del_flag = 0
         <if test="searchValue != null and searchValue != ''">
             and (
+            pp.id = #{searchValue}
+            or
             pp.name like CONCAT('%',#{searchValue},'%')
             or
             pp.name_initial like CONCAT('%',LOWER(#{searchValue}),'%')