|
@@ -38,6 +38,7 @@ import com.diagbot.util.EntityUtil;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
import com.diagbot.util.StringUtil;
|
|
|
import com.diagbot.util.UserUtils;
|
|
|
+import com.diagbot.vo.DelDisScaleInfoVO;
|
|
|
import com.diagbot.vo.DeleteQuestionVO;
|
|
|
import com.diagbot.vo.GetQuestionIdsByTypeVO;
|
|
|
import com.diagbot.vo.GetQuestionInfoVO;
|
|
@@ -97,7 +98,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
|
|
|
RetrievalMappingFacade retrievalMappingFacade;
|
|
|
@Autowired
|
|
|
DisTypeFacade disTypeFacade;
|
|
|
-
|
|
|
+ @Autowired
|
|
|
+ DisScaleFacade disScaleFacade;
|
|
|
|
|
|
/**
|
|
|
* 标签保存
|
|
@@ -507,6 +509,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
|
|
|
.set("is_deleted", IsDeleteEnum.Y.getKey()));
|
|
|
|
|
|
//如果是诊断,删除映射关系
|
|
|
+ DelDisScaleInfoVO delDisScaleInfoVO = new DelDisScaleInfoVO();
|
|
|
if (deleteQuestionVO.getType() == QuestionTypeEnum.Disease.getKey()) {
|
|
|
disTypeFacade.update(new DisType(), new UpdateWrapper<DisType>()
|
|
|
.eq("dis_id", id)
|
|
@@ -514,9 +517,16 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
|
|
|
.set("gmt_modified", now)
|
|
|
.set("modifier", person)
|
|
|
.set("is_deleted", IsDeleteEnum.Y.getKey()));
|
|
|
+ delDisScaleInfoVO = new DelDisScaleInfoVO();
|
|
|
+ delDisScaleInfoVO.setDisId(Long.parseLong(id));
|
|
|
+ disScaleFacade.delDisScaleInfo(delDisScaleInfoVO);
|
|
|
+ }
|
|
|
+ //如果是量表,删除量表内容,并删除诊断和量表的关联
|
|
|
+ if(deleteQuestionVO.getType() == QuestionTypeEnum.Scale.getKey()){
|
|
|
+ delDisScaleInfoVO = new DelDisScaleInfoVO();
|
|
|
+ delDisScaleInfoVO.setScaleId(Long.parseLong(id));
|
|
|
+ disScaleFacade.delDisScaleInfo(delDisScaleInfoVO);
|
|
|
}
|
|
|
- //TODO 如果是量表,删除量表内容,并删除诊断和量表的关联
|
|
|
-
|
|
|
|
|
|
//TODO 删除映射关系或检查抛异常
|
|
|
|