From 4a35e764316f814121f732dd6dbed9807b4787fe Mon Sep 17 00:00:00 2001
From: ccsens_wu <2377881365@qq.com>
Date: Tue, 1 Mar 2022 16:45:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E4=BD=9C=E8=BF=98=E5=8E=9F=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ccsens/ht/service/QuestionService.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/ht/src/main/java/com/ccsens/ht/service/QuestionService.java b/ht/src/main/java/com/ccsens/ht/service/QuestionService.java
index 26761747..59d7a761 100644
--- a/ht/src/main/java/com/ccsens/ht/service/QuestionService.java
+++ b/ht/src/main/java/com/ccsens/ht/service/QuestionService.java
@@ -677,7 +677,16 @@ public class QuestionService implements IQuestionService {
 
     private List<QuestionVo.PointStatus> getCanvasPoints(HtPatientCanvas htPatientCanvas) {
 //        List<QuestionVo.Point> canvasPoints = patientCanvasDao.getCanvasPoints(htPatientCanvas.getId());
-        List<QuestionVo.PointStatus> canvasPoints = patientCanvasDao.getCanvasPointsDel(htPatientCanvas.getId());
+        List<QuestionVo.PointStatus> allPoints = patientCanvasDao.getCanvasPointsDel(htPatientCanvas.getId());
+        // 只对未删除的线条添加颜色
+        List<QuestionVo.PointStatus> canvasPoints = new ArrayList<>();
+        allPoints.forEach(point->{
+            if (point.getDelStatus() == 0) {
+                // 未删除
+                canvasPoints.add(point);
+            }
+        });
+
         int num = 16;
         if(canvasPoints.size() > num){
             int c = 240 / (((canvasPoints.size() + 1) / 4) - 1);
@@ -707,7 +716,7 @@ public class QuestionService implements IQuestionService {
                 point.setColor(colours.get(b));
             }
         }
-        return canvasPoints;
+        return allPoints;
     }
 
     /**