Merge branch 'dev/nurseRule20220329' into debug

src/main/java/com/diagbot/dto/IndicationDTO.java

@@ -22,6 +22,8 @@ public class IndicationDTO {
     private List<BillMsg> highRiskList = new ArrayList<>();
     // 其他提醒
     private List<BillMsg> otherList = new ArrayList<>();
+    // 护理提醒
+    private List<BillMsg> nurseList = new ArrayList<>();
     // 记录调试信息
     private Map<String, Object> debug = new LinkedHashMap<>();
 }

src/main/java/com/diagbot/facade/KlConceptStaticFacade.java

@@ -17,6 +17,7 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ChangeStatusVO;
 import com.diagbot.vo.IdVO;
@@ -88,7 +89,8 @@ public class KlConceptStaticFacade {
      */
     public StaticKnowledgeDTO getStaticKnowledge(StaticKnowledgeVO staticKnowledgeVO) {
         ScaleStaticAllVO scaleStaticAllVO = new ScaleStaticAllVO();
-        if (staticKnowledgeVO.getType() == 8) {
+        if (staticKnowledgeVO.getType() == 8
+                && StringUtil.isNotBlank(staticKnowledgeVO.getMrId())) {
             PushJoinVO mr = mrFacade.getMr(staticKnowledgeVO.getMrId());
             if (null != mr) {
                 SearchData searchData = new SearchData();