|
|
@@ -358,7 +358,7 @@ public class MedicalInsRuleProjectServiceImpl extends ServiceImpl<MedicalInsRule
|
|
|
// );
|
|
|
|
|
|
// 根据条件,查询数据库去重。
|
|
|
- List<MedicalInsRuleProject> dbExistsList = this.loadDbExistsList(list, exportRuleTitle);
|
|
|
+ List<MedicalInsRuleProject> dbExistsList = this.loadDbExistsList(list, exportRuleTitle, id);
|
|
|
// 更新列表
|
|
|
List<MedicalInsRuleProject> updateList = new ArrayList<>();
|
|
|
// 新增列表
|
|
|
@@ -445,7 +445,7 @@ public class MedicalInsRuleProjectServiceImpl extends ServiceImpl<MedicalInsRule
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
|
- public List<MedicalInsRuleProject> loadDbExistsList(List<MedicalInsRuleProject> list, ExportRuleTitleDTO exportRuleTitle) {
|
|
|
+ public List<MedicalInsRuleProject> loadDbExistsList(List<MedicalInsRuleProject> list, ExportRuleTitleDTO exportRuleTitle, Integer ruleId) {
|
|
|
// 固定这两个字段,projectCode为必须,correlationProjectCode为可选
|
|
|
if (exportRuleTitle.getSelectedRoles().indexOf(PROJECTCODE) <= -1) {
|
|
|
log.warn("导入时,没有找到字段={}, 本次导入不做导入数据与数据库去重", PROJECTCODE);
|
|
|
@@ -481,6 +481,7 @@ public class MedicalInsRuleProjectServiceImpl extends ServiceImpl<MedicalInsRule
|
|
|
String correlationProjectCodeField = oConvertUtils.camelToUnderline(CORRELATIONPROJECTCODE);
|
|
|
queryWrapper.in(correlationProjectCodeField, correlationProjectCodes);
|
|
|
}
|
|
|
+ queryWrapper.eq("medical_ins_rule_info_id", ruleId);
|
|
|
return this.list(queryWrapper);
|
|
|
}
|
|
|
|