|
|
@@ -11,6 +11,7 @@ import com.diagbot.dto.RespDTO;
|
|
|
import com.diagbot.entity.CommonParam;
|
|
|
import com.diagbot.entity.DeptInfo;
|
|
|
import com.diagbot.entity.DeptVital;
|
|
|
+import com.diagbot.entity.DisScale;
|
|
|
import com.diagbot.entity.DisType;
|
|
|
import com.diagbot.entity.ModuleDetail;
|
|
|
import com.diagbot.entity.ModuleInfo;
|
|
|
@@ -38,7 +39,6 @@ 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;
|
|
|
@@ -507,25 +507,32 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
|
|
|
.set("gmt_modified", now)
|
|
|
.set("modifier", person)
|
|
|
.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)
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.set("gmt_modified", now)
|
|
|
.set("modifier", person)
|
|
|
.set("is_deleted", IsDeleteEnum.Y.getKey()));
|
|
|
- delDisScaleInfoVO = new DelDisScaleInfoVO();
|
|
|
- delDisScaleInfoVO.setDisId(Long.parseLong(id));
|
|
|
- disScaleFacade.delDisScaleInfo(delDisScaleInfoVO);
|
|
|
+ //删除诊断和量表的映射关系
|
|
|
+ disScaleFacade.update(new DisScale(), new UpdateWrapper<DisScale>()
|
|
|
+ .eq("dis_id", id)
|
|
|
+ .eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
+ .set("gmt_modified", now)
|
|
|
+ .set("modifier", person)
|
|
|
+ .set("is_deleted", IsDeleteEnum.Y.getKey()));
|
|
|
}
|
|
|
- //如果是量表，删除量表内容，并删除诊断和量表的关联
|
|
|
+ //如果是量表
|
|
|
if(deleteQuestionVO.getType() == QuestionTypeEnum.Scale.getKey()){
|
|
|
- delDisScaleInfoVO = new DelDisScaleInfoVO();
|
|
|
- delDisScaleInfoVO.setScaleId(Long.parseLong(id));
|
|
|
- disScaleFacade.delDisScaleInfo(delDisScaleInfoVO);
|
|
|
+ //删除诊断和量表的映射关系
|
|
|
+ disScaleFacade.update(new DisScale(), new UpdateWrapper<DisScale>()
|
|
|
+ .eq("scale_id", id)
|
|
|
+ .eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
+ .set("gmt_modified", now)
|
|
|
+ .set("modifier", person)
|
|
|
+ .set("is_deleted", IsDeleteEnum.Y.getKey()));
|
|
|
}
|
|
|
|
|
|
//TODO 删除映射关系或检查抛异常
|
zhoutg