|
@ -677,7 +677,16 @@ public class QuestionService implements IQuestionService { |
|
|
|
|
|
|
|
|
private List<QuestionVo.PointStatus> getCanvasPoints(HtPatientCanvas htPatientCanvas) { |
|
|
private List<QuestionVo.PointStatus> getCanvasPoints(HtPatientCanvas htPatientCanvas) { |
|
|
// List<QuestionVo.Point> canvasPoints = patientCanvasDao.getCanvasPoints(htPatientCanvas.getId());
|
|
|
// 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; |
|
|
int num = 16; |
|
|
if(canvasPoints.size() > num){ |
|
|
if(canvasPoints.size() > num){ |
|
|
int c = 240 / (((canvasPoints.size() + 1) / 4) - 1); |
|
|
int c = 240 / (((canvasPoints.size() + 1) / 4) - 1); |
|
@ -707,7 +716,7 @@ public class QuestionService implements IQuestionService { |
|
|
point.setColor(colours.get(b)); |
|
|
point.setColor(colours.get(b)); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
return canvasPoints; |
|
|
return allPoints; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|