Merge branch 'dev/icssNCD' of http://192.168.2.236:10080/gaodm/diagbotcloud into dev/icssNCD

icss-service/src/main/java/com/diagbot/dto/ModuleInfoDTO.java

@@ -26,6 +26,7 @@ public class ModuleInfoDTO implements Serializable {
     private Long id; //主键
     private String name;//名称
     private List<ModuleDetailDTO> moduleDetailDTOList = new ArrayList<>(); //模板明细表
+    private Integer type;//模板类型
     private String remark;
 
 }

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

@@ -247,7 +247,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         //获取疾病名称
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
         questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .in("id", deptId);
+                .in("id", disId);
         List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
         Map<Long, QuestionInfo> questionInfoMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getId,questionInfo -> questionInfo));
         //获取模板类型名称