修改

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}
@@ -144,14 +143,14 @@
             b.diagnosis_code as code,
             COUNT(b.id) AS value
         FROM
-            pms_patient_body b
+        pms_patient_diagnosis 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
+            pms_patient p
-                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
         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-client/src/main/java/com/ccsens/client/service/impl/AmsReportServiceImpl.java

@@ -2153,16 +2153,7 @@ public class AmsReportServiceImpl implements AmsReportService {
         params.put("reportDate", DateUtil.format(DateUtil.date(patientInfo.getReportTime()),  "yyyy-MM-dd"));
 
         //生成表格
-        // 创建带有样式的文本
+        //查询报告数据
-        TextRenderData text1 = Texts.of("评估结论").bold().fontSize(12).create();
-        TextRenderData text2 = Texts.of("评估结论").bold().fontSize(12).create();
-        TextRenderData text3 = Texts.of("评估结论").bold().fontSize(12).create();
-        TextRenderData text4 = Texts.of("评估结论").bold().fontSize(12).create();
-//        TextRenderData text5 = Texts.of("评估结论").bold().fontSize(12).create();
-
-        RowRenderData headerRow = Rows.of().create();
-
-        //查询
         List<RmsVo.ExportInfo> exportInfos = rmsDao.queryReportExportInfo(dto.getEvaluationId());
         if (CollUtil.isEmpty(exportInfos)) {
             return null;
@@ -2306,6 +2297,8 @@ public class AmsReportServiceImpl implements AmsReportService {
                 listMap.add(map);
             }
         }
+        //阳性报告单
+        generateYx(params, exportInfos);
 
         params.put("questionTables", listMap);
 
@@ -2316,6 +2309,41 @@ public class AmsReportServiceImpl implements AmsReportService {
         return params;
     }
 
+    public void generateYx(Map<String, Object> params, List<RmsVo.ExportInfo> exportInfos)  {
+        RowRenderData titleRow = Rows.of("一级指标/二级指标", "量表名称", "得分", "结论").center()
+                .create();
+        Tables.TableBuilder of = Tables.of(titleRow);
+        for (int i = 0; i < exportInfos.size(); i++) {
+            RmsVo.Pgjl pgjl = new RmsVo.Pgjl();
+            params.put("yjzb", exportInfos.get(i).getComboParentName());
+            params.put("ejzb", exportInfos.get(i).getComboName());
+            if (exportInfos.get(i).getNeedPlan() != null && exportInfos.get(i).getNeedPlan() == 1) {
+                TextRenderData textStr = Texts.of(StrUtil.isEmpty(exportInfos.get(i).getComboParentName()) ? "" : exportInfos.get(i).getComboParentName() + "/" + exportInfos.get(i).getComboName()).bold().color("FF0000").create();
+                TextRenderData textName = Texts.of(exportInfos.get(i).getScaleName()).bold().color("FF0000").create();
+                TextRenderData textScore = Texts.of(exportInfos.get(i).getScore() == null ? "" : exportInfos.get(i).getScore() + "").bold().color("FF0000").create();
+                TextRenderData textImpression = Texts.of(StrUtil.isEmpty(exportInfos.get(i).getImpression()) ? exportInfos.get(i).getResult() : exportInfos.get(i).getImpression()).bold().color("FF0000").create();
+                pgjl.setTitle(StrUtil.isEmpty(exportInfos.get(i).getComboParentName()) ? "" : exportInfos.get(i).getComboParentName() + "/" + exportInfos.get(i).getComboName());
+
+                //查询一二级套餐
+                RowRenderData row1 = Rows.of(
+                        textStr,
+                        textName,
+                        textScore,
+                        textImpression
+                ).center().create();
+//                if (StrUtil.isNotEmpty(exportInfos.get(i).getComboName() + "/" + exportInfos.get(i).getComboParentName())) {
+//                    of.mergeRule(MergeCellRule.builder().map(MergeCellRule.Grid.of(i + 1, i + 1), MergeCellRule.Grid.of(0, 1)).build());
+//                }
+                of.addRow(row1);
+            }
+        }
+        TableRenderData tableData = of
+                .center()
+                .create();
+        params.put("yxTable", tableData);
+    }
+
+
     @Override
     public AmsReportVo.Result export(RmsDto.Export dto) {
         //1. 查询是否已生成对应版本的报告单