服务指令bug

nursing-unit-api/src/main/java/com/nu/modules/common/NuCommonApi.java

@@ -32,6 +32,11 @@ public class NuCommonApi {
         return Result.ok(sysBaseAPI.getOrgInfo(orgCode));
     }
 
+    //获取标准指令库信息
+    @GetMapping("/getDMOrgInfo")
+    public Result<JSONObject> getDMOrgInfo(){
+        return Result.ok(sysBaseAPI.getDMOrgInfo());
+    }
 
     /**
      * 根据父id查询对应省、市、区/县 列表

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/controller/CanAddDirectiveController.java

@@ -10,6 +10,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
@@ -74,7 +76,9 @@ public class CanAddDirectiveController extends JeecgController<CanAddDirective,
         // 自定义多选的查询规则为：LIKE_WITH_OR
         customeRuleMap.put("orgCode", QueryRuleEnum.LIKE_WITH_OR);
         QueryWrapper<CanAddDirective> queryWrapper = QueryGenerator.initQueryWrapper(canAddDirective, req.getParameterMap(), customeRuleMap);
+        if (StringUtils.isNotBlank(canAddDirective.getExistDirectiveIds())) {
             queryWrapper.notIn("directive_id", canAddDirective.getExistDirectiveIds().split(","));
+        }
         Page<CanAddDirective> page = new Page<CanAddDirective>(pageNo, pageSize);
         IPage<CanAddDirective> pageList = canAddDirectiveService.page(page, queryWrapper);
         return Result.OK(pageList);

nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java

@@ -627,6 +627,8 @@ public interface ISysBaseAPI extends CommonAPI {
 
     JSONObject getOrgInfo(String orgCode);
 
+    JSONObject getDMOrgInfo();
+
     JSONObject getDeptInfo();
 
     String addOrg(SysDepartEntity sysDepart);

nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java

@@ -1904,6 +1904,20 @@ public class SysBaseApiImpl implements ISysBaseAPI {
         return queryOrgInfo(orgCode);
     }
 
+    @Override
+    public JSONObject getDMOrgInfo() {
+        QueryWrapper<SysDepart> qw = new QueryWrapper<>();
+        qw.eq("iz_directive_main", "0");//标准指令库
+        qw.eq("org_category", "1");//机构类型
+        qw.eq("del_flag", "0");//未删除数据
+        SysDepart sysDepart = sysDepartService.getOne(qw);
+        if (sysDepart != null) {
+            return (JSONObject) JSONObject.toJSON(sysDepart);
+        } else {
+            return null;
+        }
+    }
+
     @Override
     public JSONObject getDeptInfo() {
         Map<String,Object> map = Maps.newHashMap();