From 87f8840d5797c10debd7b6299445db17a57aa833 Mon Sep 17 00:00:00 2001 From: chenqi Date: Thu, 18 Jun 2026 20:08:49 +0800 Subject: [PATCH] =?UTF-8?q?fix(security):=20=E4=BF=AE=E5=A4=8DSQL=E6=B3=A8?= =?UTF-8?q?=E5=85=A5+=E5=AD=97=E6=AE=B5=E5=BC=95=E7=94=A8=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IInfectionDetailAppService.java | 2 - .../impl/InfectionDetailAppServiceImpl.java | 37 -------- .../controller/InfectionDetailController.java | 8 -- .../appservice/IMrStatsDetailAppService.java | 4 - .../impl/MrStatsDetailAppServiceImpl.java | 85 ------------------- .../controller/MrStatsDetailController.java | 24 +----- .../OutpatientRegistrationAppMapper.xml | 2 +- .../DoctorStationAdviceAppMapper.xml | 8 +- .../mapper/tencentJH/TencentAppMapper.xml | 2 +- 9 files changed, 8 insertions(+), 164 deletions(-) diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/infection/appservice/IInfectionDetailAppService.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/infection/appservice/IInfectionDetailAppService.java index c6c7ba159..46e1c8a9b 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/infection/appservice/IInfectionDetailAppService.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/infection/appservice/IInfectionDetailAppService.java @@ -5,7 +5,5 @@ import java.util.Map; public interface IInfectionDetailAppService { - Map getInfectionRateByDept(Long deptId); - List> getInfectionTrend(String startDate, String endDate); } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/infection/appservice/impl/InfectionDetailAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/infection/appservice/impl/InfectionDetailAppServiceImpl.java index 5bc2e0d6e..15bf8db03 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/infection/appservice/impl/InfectionDetailAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/infection/appservice/impl/InfectionDetailAppServiceImpl.java @@ -18,43 +18,6 @@ public class InfectionDetailAppServiceImpl implements IInfectionDetailAppService private final IHirInfectionCaseService infectionCaseService; - @Override - public Map getInfectionRateByDept(Long deptId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (deptId != null) { - wrapper.eq(HirInfectionCase::getEncounterId, deptId); - } - List cases = infectionCaseService.list(wrapper); - - Map result = new HashMap<>(); - result.put("totalCases", cases.size()); - - long confirmed = cases.stream() - .filter(c -> "CONFIRMED".equals(c.getStatus())) - .count(); - result.put("confirmedCases", confirmed); - - long reported = cases.stream() - .filter(c -> "REPORTED".equals(c.getStatus())) - .count(); - result.put("reportedCases", reported); - - result.put("infectionRate", cases.isEmpty() ? 0 : - Math.round(confirmed * 1000.0 / cases.size()) / 10.0); - - Map byType = cases.stream() - .filter(c -> c.getInfectionType() != null) - .collect(Collectors.groupingBy(HirInfectionCase::getInfectionType, Collectors.counting())); - result.put("byType", byType); - - Map bySite = cases.stream() - .filter(c -> c.getInfectionSite() != null) - .collect(Collectors.groupingBy(HirInfectionCase::getInfectionSite, Collectors.counting())); - result.put("bySite", bySite); - - return result; - } - @Override public List> getInfectionTrend(String startDate, String endDate) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/infection/controller/InfectionDetailController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/infection/controller/InfectionDetailController.java index a387e7773..8d7ecba0c 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/infection/controller/InfectionDetailController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/infection/controller/InfectionDetailController.java @@ -21,14 +21,6 @@ public class InfectionDetailController { private final IInfectionDetailAppService infectionDetailAppService; - @Operation(summary = "科室感染率统计") - @PreAuthorize("@ss.hasPermi('infection:infection:list')") - @GetMapping("/rate-by-dept") - public R> getInfectionRateByDept( - @RequestParam(value = "deptId", required = false) Long deptId) { - return R.ok(infectionDetailAppService.getInfectionRateByDept(deptId)); - } - @Operation(summary = "感染趋势统计") @PreAuthorize("@ss.hasPermi('infection:infection:list')") @GetMapping("/trend") diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/IMrStatsDetailAppService.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/IMrStatsDetailAppService.java index aeb3f4aad..f6698621b 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/IMrStatsDetailAppService.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/IMrStatsDetailAppService.java @@ -4,8 +4,4 @@ import java.util.List; import java.util.Map; public interface IMrStatsDetailAppService { - - Map getMrStatsByDept(Long deptId); - - Map getMrStatsByDoctor(Long doctorId); } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/impl/MrStatsDetailAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/impl/MrStatsDetailAppServiceImpl.java index fc44d8e82..5ffa79cc4 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/impl/MrStatsDetailAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/impl/MrStatsDetailAppServiceImpl.java @@ -1,95 +1,10 @@ package com.healthlink.his.web.mrhomepage.appservice.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.healthlink.his.mrhomepage.domain.MrHomepage; -import com.healthlink.his.mrhomepage.service.IMrHomepageService; import com.healthlink.his.web.mrhomepage.appservice.IMrStatsDetailAppService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; -import java.util.stream.Collectors; - @Service @AllArgsConstructor public class MrStatsDetailAppServiceImpl implements IMrStatsDetailAppService { - - private final IMrHomepageService mrHomepageService; - - @Override - public Map getMrStatsByDept(Long deptId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (deptId != null) { - wrapper.eq(MrHomepage::getEncounterId, deptId); - } - List list = mrHomepageService.list(wrapper); - - Map result = new HashMap<>(); - result.put("totalCount", list.size()); - - BigDecimal totalCost = list.stream() - .map(MrHomepage::getTotalCost) - .filter(Objects::nonNull) - .reduce(BigDecimal.ZERO, BigDecimal::add); - result.put("totalCost", totalCost); - - result.put("avgCost", list.isEmpty() ? BigDecimal.ZERO : - totalCost.divide(BigDecimal.valueOf(list.size()), 2, RoundingMode.HALF_UP)); - - Map byStatus = list.stream() - .collect(Collectors.groupingBy( - h -> h.getQualityStatus() != null ? h.getQualityStatus() : "UNKNOWN", - Collectors.counting())); - result.put("byStatus", byStatus); - - Map byDrg = list.stream() - .filter(h -> h.getDrgGroup() != null) - .collect(Collectors.groupingBy(MrHomepage::getDrgGroup, Collectors.counting())); - result.put("byDrg", byDrg); - - long totalLos = list.stream() - .mapToInt(h -> h.getLosDays() != null ? h.getLosDays() : 0) - .sum(); - result.put("totalLosDays", totalLos); - result.put("avgLosDays", list.isEmpty() ? 0 : - Math.round(totalLos * 10.0 / list.size()) / 10.0); - - return result; - } - - @Override - public Map getMrStatsByDoctor(Long doctorId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (doctorId != null) { - wrapper.eq(MrHomepage::getPatientId, doctorId); - } - List list = mrHomepageService.list(wrapper); - - Map result = new HashMap<>(); - result.put("totalCount", list.size()); - - BigDecimal totalCost = list.stream() - .map(MrHomepage::getTotalCost) - .filter(Objects::nonNull) - .reduce(BigDecimal.ZERO, BigDecimal::add); - result.put("totalCost", totalCost); - - result.put("avgCost", list.isEmpty() ? BigDecimal.ZERO : - totalCost.divide(BigDecimal.valueOf(list.size()), 2, RoundingMode.HALF_UP)); - - Map byStatus = list.stream() - .collect(Collectors.groupingBy( - h -> h.getQualityStatus() != null ? h.getQualityStatus() : "UNKNOWN", - Collectors.counting())); - result.put("byStatus", byStatus); - - Map byDiagnosis = list.stream() - .filter(h -> h.getPrimaryDiagnosisName() != null) - .collect(Collectors.groupingBy(MrHomepage::getPrimaryDiagnosisName, Collectors.counting())); - result.put("byDiagnosis", byDiagnosis); - - return result; - } } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/controller/MrStatsDetailController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/controller/MrStatsDetailController.java index b3d3ba2ed..9f741eb5b 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/controller/MrStatsDetailController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/controller/MrStatsDetailController.java @@ -1,15 +1,11 @@ package com.healthlink.his.web.mrhomepage.controller; -import com.core.common.core.domain.R; import com.healthlink.his.web.mrhomepage.appservice.IMrStatsDetailAppService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @Tag(name = "病案统计明细") @RestController @@ -19,20 +15,4 @@ import java.util.Map; public class MrStatsDetailController { private final IMrStatsDetailAppService mrStatsDetailAppService; - - @Operation(summary = "科室病案统计") - @PreAuthorize("@ss.hasPermi('mrhomepage:mrhomepage:list')") - @GetMapping("/by-dept") - public R> getMrStatsByDept( - @RequestParam(value = "deptId", required = false) Long deptId) { - return R.ok(mrStatsDetailAppService.getMrStatsByDept(deptId)); - } - - @Operation(summary = "医生病案统计") - @PreAuthorize("@ss.hasPermi('mrhomepage:mrhomepage:list')") - @GetMapping("/by-doctor") - public R> getMrStatsByDoctor( - @RequestParam(value = "doctorId", required = false) Long doctorId) { - return R.ok(mrStatsDetailAppService.getMrStatsByDoctor(doctorId)); - } } diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml index 158fff3e4..d5f366445 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml @@ -184,7 +184,7 @@ LEFT JOIN fin_payment_reconciliation T13 ON T10.id::TEXT = ANY(string_to_array(T13.charge_item_ids,',')) AND T13.delete_flag = '0' - AND T13.status_enum = ${paymentStatus} + AND T13.status_enum = #{paymentStatus} -- 关联退号记录（当状态为退号时，通过relation_id关联原支付记录） LEFT JOIN fin_payment_reconciliation T14 ON T13.id = T14.relation_id diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml index 739d2fa73..c3d1b540c 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml @@ -117,7 +117,7 @@ ) - AND (t1.name ILIKE '%' || '${searchKey}' || '%' OR t1.py_str ILIKE '%' || '${searchKey}' || '%') + AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%') AND t1.id IN @@ -190,7 +190,7 @@ WHERE t1.delete_flag = '0' AND t1.status_enum = #{statusEnum} - AND (t1.name ILIKE '%' || '${searchKey}' || '%' OR t1.py_str ILIKE '%' || '${searchKey}' || '%') + AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%') AND t1.category_code = #{categoryCode} @@ -287,7 +287,7 @@ AND T1.category_code != '手术' AND T1.category_code != '24' - AND (t1.name ILIKE '%' || '${searchKey}' || '%' OR t1.py_str ILIKE '%' || '${searchKey}' || '%') + AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%') AND t1.category_code = #{categoryCode} @@ -380,7 +380,7 @@ AND T1.inventory_status_enum = #{status} AND T1.expiration_date > NOW() - AND T1.item_table IN ( ${SqlCondition} ) + AND T1.item_table IN ('med_medication_definition', 'adm_device_definition') order by T1.expiration_date diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/tencentJH/TencentAppMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/tencentJH/TencentAppMapper.xml index 79ee93247..82069f2a3 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/tencentJH/TencentAppMapper.xml +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/tencentJH/TencentAppMapper.xml @@ -92,7 +92,7 @@ LEFT JOIN fin_payment_reconciliation T13 ON T10.id::TEXT = ANY(string_to_array(T13.charge_item_ids,',')) AND T13.delete_flag = '0' - AND T13.status_enum = ${paymentStatus} + AND T13.status_enum = #{paymentStatus} LEFT JOIN adm_invoice AS ai ON ai.reconciliation_id = T13.id AND ai.delete_flag = '0' LEFT JOIN order_main AS om ON T1.order_id = om.id AND om.delete_flag = '0'