Browse Source

根据模块获取模板

zhoutg 5 years ago
parent
commit
6ff63b22f6

+ 0 - 2
src/main/java/com/diagbot/dto/GetModuleInfoOneDTO.java

@@ -26,6 +26,4 @@ public class GetModuleInfoOneDTO {
     private String modeName;
     //模板明细
     private Map<Integer, List<QcModuleDetailDTO>> moduleDetail;
-    //备注
-    private String remark;
 }

+ 1 - 1
src/main/java/com/diagbot/dto/QuestionDTO.java

@@ -29,5 +29,5 @@ public class QuestionDTO {
     private Integer position; //显示位置(1:靠右显示)
     private String casesEntryIds;//质控条目id列表
     private List<QuestionDTO> questionMapping = new ArrayList<>();     //下级标签
-    private String remark;//备注
+//    private String remark;//备注
 }

+ 1 - 1
src/main/java/com/diagbot/facade/QcModuleInfoFacade.java

@@ -85,7 +85,7 @@ public class QcModuleInfoFacade extends QcModuleInfoServiceImpl {
         Map<Long, GetModuleInfoOneDTO> res = new LinkedHashMap<>();
         List<QcModuleInfo> qcModuleInfoList = this.list(new QueryWrapper<QcModuleInfo>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("mode_id", getModuleMapVO.getModeId())
+                .eq(getModuleMapVO.getModeId() != null, "mode_id", getModuleMapVO.getModeId())
                 .eq("hospital_id", getModuleMapVO.getHospitalId())
         );
         List<Long> ids = qcModuleInfoList.stream().map(r -> r.getId()).collect(Collectors.toList());