Merge remote-tracking branch 'origin/dev/icssNCD' into dev/icssNCD

icssman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

@@ -428,9 +428,12 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         if(getModuleTypeVO.getRelationId() != null && getModuleTypeVO.getRelationId().intValue() == -1){//如果是-1时返回所有子模板
             dictionaryInfoQueryWrapper.in("val","322","31","32");
         }
-        if(getModuleTypeVO.getModuleType() != null && getModuleTypeVO.getModuleType().intValue() == 2){
+        if(getModuleTypeVO.getModuleType() != null && getModuleTypeVO.getModuleType().intValue() == 2){//为慢病时过滤现病史空模板、主诉模板、现病史空模板子模板
             dictionaryInfoQueryWrapper.notIn("val","1","22","31","322");
         }
+        if(getModuleTypeVO.getModuleType() != null && getModuleTypeVO.getModuleType().intValue() == 0 && getModuleTypeVO.getModuleType().intValue() == 1){//为通用或科室时过滤化验附件诊断
+            dictionaryInfoQueryWrapper.notIn("val","5","6","7");
+        }
         List<DictionaryInfo> dictionaryInfoList = dictionaryFacade.list(dictionaryInfoQueryWrapper);
         List<GetModuleTypeDTO> getModuleTypeDTOS = new ArrayList<>();
         for (DictionaryInfo dictionaryInfo: dictionaryInfoList) {