|
|
@@ -10,11 +10,14 @@ import com.diagbot.dto.QuestionPageDTO;
|
|
|
import com.diagbot.dto.RespDTO;
|
|
|
import com.diagbot.entity.CommonParam;
|
|
|
import com.diagbot.entity.DeptInfo;
|
|
|
+import com.diagbot.entity.DeptVital;
|
|
|
import com.diagbot.entity.ModuleDetail;
|
|
|
import com.diagbot.entity.ModuleInfo;
|
|
|
import com.diagbot.entity.QuestionDetail;
|
|
|
import com.diagbot.entity.QuestionInfo;
|
|
|
import com.diagbot.entity.QuestionMapping;
|
|
|
+import com.diagbot.entity.RetrievalMapping;
|
|
|
+import com.diagbot.entity.VitalOrder;
|
|
|
import com.diagbot.entity.wrapper.QuestionInfoWrapper;
|
|
|
import com.diagbot.entity.wrapper.QuestionMappingWrapper;
|
|
|
import com.diagbot.entity.wrapper.QuestionWrapper;
|
|
|
@@ -81,6 +84,12 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
|
|
|
UserServiceClient userServiceClient;
|
|
|
@Autowired
|
|
|
ModuleInfoFacade moduleInfoFacade;
|
|
|
+ @Autowired
|
|
|
+ VitalOrderFacade vitalOrderFacade;
|
|
|
+ @Autowired
|
|
|
+ DeptVitalFacade deptVitalFacade;
|
|
|
+ @Autowired
|
|
|
+ RetrievalMappingFacade retrievalMappingFacade;
|
|
|
|
|
|
|
|
|
/**
|
|
|
@@ -397,6 +406,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
|
|
|
}
|
|
|
List<String> idList = Arrays.asList(ids.split(","));
|
|
|
StringBuffer errMsg = new StringBuffer();
|
|
|
+ Date now = DateUtil.now();
|
|
|
+ String person = UserUtils.getCurrentPrincipleID();
|
|
|
for (String id : idList) {
|
|
|
// 查询映射关系中是否存在父级
|
|
|
List<QuestionInfo> info = this.getParentQuestion(Long.parseLong(id));
|
|
|
@@ -429,14 +440,34 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
|
|
|
Map paramMap = new HashMap<>();
|
|
|
paramMap.put("delete", IsDeleteEnum.Y.getKey());
|
|
|
paramMap.put("ids", Arrays.asList(ids.split(",")));
|
|
|
- paramMap.put("gmtModified", DateUtil.now());
|
|
|
- paramMap.put("modifier", UserUtils.getCurrentPrincipleID());
|
|
|
+ paramMap.put("gmtModified", now);
|
|
|
+ paramMap.put("modifier", person);
|
|
|
//删除自身
|
|
|
this.deleteByIds(paramMap);
|
|
|
//删除明细
|
|
|
questionDetailFacade.deleteByQuestionIdFac(paramMap);
|
|
|
//删除映射关系
|
|
|
questionMappingFacade.deleteByIdsFac(paramMap);
|
|
|
+ //删除查体模板
|
|
|
+ vitalOrderFacade.update(new VitalOrder(), new UpdateWrapper<VitalOrder>()
|
|
|
+ .eq("question_id", id)
|
|
|
+ .eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
+ .set("gmt_modified", now)
|
|
|
+ .set("modifier", person)
|
|
|
+ .set("is_deleted", IsDeleteEnum.Y.getKey()));
|
|
|
+ deptVitalFacade.update(new DeptVital(), new UpdateWrapper<DeptVital>()
|
|
|
+ .eq("vital_id", id)
|
|
|
+ .eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
+ .set("gmt_modified", now)
|
|
|
+ .set("modifier", person)
|
|
|
+ .set("is_deleted", IsDeleteEnum.Y.getKey()));
|
|
|
+ //删除检索映射
|
|
|
+ retrievalMappingFacade.update(new RetrievalMapping(), new UpdateWrapper<RetrievalMapping>()
|
|
|
+ .eq("question_id", id)
|
|
|
+ .eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
+ .set("gmt_modified", now)
|
|
|
+ .set("modifier", person)
|
|
|
+ .set("is_deleted", IsDeleteEnum.Y.getKey()));
|
|
|
}
|
|
|
return true;
|
|
|
}
|
zhoutg