|
@@ -115,6 +115,7 @@ public class XiangMuLuRuService {
|
|
|
return ResultVoUtil.success(feeResult);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
public QueryWrapper<?> getQueryWrapper(XmlrQueryFee params) {
|
|
|
QueryWrapper<?> qw = new QueryWrapper<>();
|
|
|
String usCode = TokenUtil.getInstance().getTokenUserId();
|
|
@@ -160,11 +161,8 @@ public class XiangMuLuRuService {
|
|
|
qw.ne("isnull(nullif(rtrim(a.serial), ''), '00')", "00");
|
|
|
}
|
|
|
|
|
|
- if (params.getMedicalTechnology()) {
|
|
|
- if (!publicServer.needRule(1)) {
|
|
|
- Set<String> childDeptByUserCode = publicServer.getChildDeptByUserCode(usCode);
|
|
|
- qw.in("exec_unit", childDeptByUserCode);
|
|
|
- }
|
|
|
+ if (StrUtil.isNotBlank(params.getExecDept())) {
|
|
|
+ qw.eq("exec_unit", params.getExecDept());
|
|
|
}
|
|
|
|
|
|
if (params.getRefundSymbol() == 0) {
|