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 getCanvasPoints(HtPatientCanvas htPatientCanvas) { // List canvasPoints = patientCanvasDao.getCanvasPoints(htPatientCanvas.getId()); - List canvasPoints = patientCanvasDao.getCanvasPointsDel(htPatientCanvas.getId()); + List allPoints = patientCanvasDao.getCanvasPointsDel(htPatientCanvas.getId()); + // 只对未删除的线条添加颜色 + List 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; } /**