|
@@ -6,6 +6,7 @@ import cn.hutool.core.date.DatePattern;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
@@ -242,7 +243,10 @@ public class HospGetDataToRuleEngine {
|
|
|
midResult.setId(midIncidentAudit.getId());
|
|
midResult.setId(midIncidentAudit.getId());
|
|
|
midResult.setViolationFlag(sendFlag);
|
|
midResult.setViolationFlag(sendFlag);
|
|
|
if(sendFlag){
|
|
if(sendFlag){
|
|
|
- List<MidIncidentAuditDetail> midIncidentAuditDetailList = midIncidentAuditDetailService.lambdaQuery().eq(MidIncidentAuditDetail::getMidIncidentAuditId, midIncidentAudit.getId()).list();
|
|
|
|
|
|
|
+ QueryWrapper<MidIncidentAuditDetail> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
+ queryWrapper.groupBy("medical_ins_rule_info_code");
|
|
|
|
|
+ List<MidIncidentAuditDetail> midIncidentAuditDetailList = midIncidentAuditDetailService.list(queryWrapper);
|
|
|
|
|
+// List<MidIncidentAuditDetail> midIncidentAuditDetailList = midIncidentAuditDetailService.lambdaQuery().eq(MidIncidentAuditDetail::getMidIncidentAuditId, midIncidentAudit.getId()).list();
|
|
|
List<MidRule> midRuleList = new ArrayList<>();
|
|
List<MidRule> midRuleList = new ArrayList<>();
|
|
|
for(MidIncidentAuditDetail midIncidentAuditDetail : midIncidentAuditDetailList){
|
|
for(MidIncidentAuditDetail midIncidentAuditDetail : midIncidentAuditDetailList){
|
|
|
MidRule midRule = new MidRule();
|
|
MidRule midRule = new MidRule();
|