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

mrman-service/src/main/java/com/diagbot/dto/QuestionPageDTO.java

@@ -101,6 +101,11 @@ public class QuestionPageDTO implements Serializable {
      */
     private Integer bold;
 
+    /**
+     * 显示位置(1：靠右显示)
+     */
+    private Integer position;
+
     /**
      * 质控条目id列表
      */

mrman-service/src/main/java/com/diagbot/facade/QcModuleDetailFacade.java

@@ -78,7 +78,7 @@ public class QcModuleDetailFacade extends QcModuleDetailServiceImpl {
             QcModuleDetail qcModuleDetail = new QcModuleDetail();
             BeanUtil.copyProperties(detailVO, qcModuleDetail);
             qcModuleDetail.setOrderNo(i++);
-            qcModuleDetail.setId(moduleId);
+            qcModuleDetail.setModuleId(moduleId);
             qcModuleDetail.setGmtCreate(now);
             qcModuleDetail.setGmtModified(now);
             qcModuleDetail.setCreator(userId);

mrman-service/src/main/java/com/diagbot/facade/QcModuleInfoFacade.java

@@ -25,6 +25,7 @@ import com.diagbot.vo.QuestionIdsVO;
 import com.diagbot.vo.UpdateModuleInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
@@ -77,6 +78,16 @@ public class QcModuleInfoFacade extends QcModuleInfoServiceImpl {
      * @return
      */
     public Boolean saveOrUpdateModuleInfo(AddModuleInfoVO addModulInfoVO) {
+        // 校验
+        int count = this.count(new QueryWrapper<QcModuleInfo>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("mode_id", addModulInfoVO.getModeId())
+                .eq("hospital_id", addModulInfoVO.getHospitalId())
+                .eq("name", addModulInfoVO.getName())
+                .ne("id", addModulInfoVO.getId() == null ? -1 : addModulInfoVO.getId()));
+        if (count > 0) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "相同【医院】【模块】下，模板名称已存在");
+        }
         Long moduleId = null;
         Boolean bac = false;
         if (addModulInfoVO.getId() == null) {
@@ -173,20 +184,4 @@ public class QcModuleInfoFacade extends QcModuleInfoServiceImpl {
         getModuleInfoOneDTO.setModuleDetail(map);
         return getModuleInfoOneDTO;
     }
-
-
-//    /**
-//     * 获取模板信息
-//     *
-//     * @param moduleType
-//     * @param type
-//     * @return
-//     */
-//    public List<ModuleInfo> getModuleInfos(Long moduleType, String type) {
-//        QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
-//        moduleInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-//                .eq("module_type", moduleType)
-//                .eq("type", type);
-//        return this.list(moduleInfoQueryWrapper);
-//    }
 }

mrman-service/src/main/java/com/diagbot/web/QcModuleDetailController.java

@@ -1,20 +0,0 @@
-package com.diagbot.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 模型明细表 前端控制器
- * </p>
- *
- * @author zhoutg
- * @since 2020-04-27
- */
-@Controller
-@RequestMapping("/qcModuleDetail")
-public class QcModuleDetailController {
-
-}