From 6e1fb3981507efd81f688e940ad00b332322ea98 Mon Sep 17 00:00:00 2001 From: liu Date: Thu, 22 Feb 2024 15:28:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=9B=B7=E8=BE=BE=E5=9B=BE?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AskDiagnosisResultServiceImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java index 2cab9fd9..4e4a1e54 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java @@ -323,10 +323,10 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService BigDecimal clinicalThinking = NumberUtil.add(askChart.getNodePer(), physicalChart.getNodePer(), ancillaryChart.getNodePer(), treatmentPlanChart.getNodePer()).divide(BigDecimal.valueOf(4), 1, RoundingMode.HALF_UP); ChartNodeVO chartNodeVO = new ChartNodeVO(); chartNodeVO.setNodePer(clinicalThinking); - chartNodeVO.setTotal(askChart.getTotal() + physicalChart.getTotal() + ancillaryChart.getTotal() + treatmentPlanChart.getTotal()); - chartNodeVO.setCorrect(askChart.getCorrect() + physicalChart.getCorrect() + ancillaryChart.getCorrect() + treatmentPlanChart.getCorrect()); - chartNodeVO.setUnCorrect(askChart.getUnCorrect() + physicalChart.getUnCorrect() + ancillaryChart.getUnCorrect() + treatmentPlanChart.getUnCorrect()); - chartNodeVO.setStandard(askChart.getStandard() + physicalChart.getStandard() + ancillaryChart.getStandard() + treatmentPlanChart.getStandard()); + chartNodeVO.setTotal(NumberUtil.add(askChart.getTotal(), physicalChart.getTotal(), ancillaryChart.getTotal(), treatmentPlanChart.getTotal()).intValue()); + chartNodeVO.setCorrect(NumberUtil.add(askChart.getCorrect(), physicalChart.getCorrect(), ancillaryChart.getCorrect(), treatmentPlanChart.getCorrect()).intValue()); + chartNodeVO.setUnCorrect(NumberUtil.add(askChart.getUnCorrect(), physicalChart.getUnCorrect(), ancillaryChart.getUnCorrect(), treatmentPlanChart.getUnCorrect()).intValue()); + chartNodeVO.setStandard(NumberUtil.add(askChart.getStandard(), physicalChart.getStandard(), ancillaryChart.getStandard(), treatmentPlanChart.getStandard()).intValue()); radarChartResVO.setClinicalThinking(chartNodeVO); return radarChartResVO; @@ -375,7 +375,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService chartNodeVO.setCorrect(hitPlanCount); chartNodeVO.setUnCorrect(medicalCount - hitPlanCount); chartNodeVO.setStandard(medicalCount); - chartNodeVO.setTotal(chartNodeVO.getUnCorrect() + chartNodeVO.getStandard() + chartNodeVO.getCorrect()); + chartNodeVO.setTotal(NumberUtil.add(chartNodeVO.getUnCorrect(), chartNodeVO.getStandard(), chartNodeVO.getCorrect()).intValue()); return chartNodeVO; @@ -407,7 +407,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService chartNodeVO.setCorrect(userHitCount); chartNodeVO.setUnCorrect(medicalCount - userHitCount); chartNodeVO.setStandard(medicalCount); - chartNodeVO.setTotal(chartNodeVO.getUnCorrect() + chartNodeVO.getStandard() + chartNodeVO.getCorrect()); + chartNodeVO.setTotal(NumberUtil.add(chartNodeVO.getUnCorrect(), chartNodeVO.getStandard(), chartNodeVO.getCorrect()).intValue()); return chartNodeVO; } @@ -440,7 +440,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService chartNodeVO.setCorrect(userHitCount); chartNodeVO.setUnCorrect(medicalCount - userHitCount); chartNodeVO.setStandard(medicalCount); - chartNodeVO.setTotal(chartNodeVO.getUnCorrect() + chartNodeVO.getStandard() + chartNodeVO.getCorrect()); + chartNodeVO.setTotal(NumberUtil.add(chartNodeVO.getUnCorrect(), chartNodeVO.getStandard(), chartNodeVO.getCorrect()).intValue()); return chartNodeVO; } @@ -485,8 +485,8 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService chartNodeVO.setNodePer(num2.multiply(num3)); chartNodeVO.setCorrect(userHitQuestionCount); chartNodeVO.setStandard(Integer.parseInt(String.valueOf(medicalQuestionCount))); - chartNodeVO.setUnCorrect(chartNodeVO.getStandard() - chartNodeVO.getCorrect()); - chartNodeVO.setTotal(chartNodeVO.getUnCorrect() + chartNodeVO.getStandard() + chartNodeVO.getCorrect()); + chartNodeVO.setUnCorrect(NumberUtil.sub(chartNodeVO.getStandard(), chartNodeVO.getCorrect()).intValue()); + chartNodeVO.setTotal(NumberUtil.add(chartNodeVO.getUnCorrect(), chartNodeVO.getStandard(), chartNodeVO.getCorrect()).intValue()); return chartNodeVO; }