Merge remote-tracking branch 'origin/dev/icss' into debug

icss-service/src/main/java/com/diagbot/facade/DeptInfoFacade.java

@@ -24,7 +24,7 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
      * @return
      */
     public List<DeptInfoDTO> getDeptInfo(DeptInfoVO deptInfoVO) {
-        List<DeptInfoDTO> deptInfoDTOList = this.getDeptInfos(deptInfoVO.getDeptCode(),deptInfoVO.getHosptialCode());
+        List<DeptInfoDTO> deptInfoDTOList = this.getDeptInfos(deptInfoVO.getDeptCode(),deptInfoVO.getHospitalCode());
         if(ListUtil.isEmpty(deptInfoDTOList)){
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
                     "获取科室信息失败");

icss-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -151,7 +151,12 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 		if(hisInquirysVO.getEndDate()!=null){
 			queryWrapper.le("gmt_create", hisInquirysVO.getEndDate());
 		}
-		queryWrapper.orderByDesc("gmt_create");
+		if(hisInquirysVO.getOrderType()==1){
+			queryWrapper.orderByDesc("gmt_create");
+		}else if(hisInquirysVO.getOrderType()==2){
+			queryWrapper.orderByAsc("gmt_create");
+		}
+		
 		List<InquiryInfo> inquiryInfoList = this.list(queryWrapper);
 
 		List<HisInquiryDTO> hisInquiryDTOList = BeanUtil.listCopyTo(inquiryInfoList, HisInquiryDTO.class);

icss-service/src/main/java/com/diagbot/facade/IntroduceInfoFacade.java

@@ -106,7 +106,8 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
 
         QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper = new QueryWrapper<>();
         introduceDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("introduce_id", introduceInfo.getId());
+                eq("introduce_id", introduceInfo.getId()).
+                orderByAsc("order_no");
         List<IntroduceDetail> introduceDetailList = introduceDetailFacade.list(introduceDetailQueryWrapper);
         introduceDTO.setIntroduceDetailList(introduceDetailList);
         return introduceDTO;

icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -92,6 +92,7 @@ public class PushFacade {
 
     /**
      * 推理接口
+     *
      * @param pushVO
      * @param mode
      * @return
@@ -170,7 +171,10 @@ public class PushFacade {
                 questionVO.setAge(pushVO.getAge());
                 questionVO.setSexType(pushVO.getSex());
                 questionVO.setId(questionMap.get(entry.getKey()).getId());
-                entry.setValue(questionFacade.getById(questionVO));
+                QuestionDTO questionDTO = questionFacade.getById(questionVO);
+                if (questionDTO.getSubType().equals(0)) {
+                    entry.setValue(questionDTO);
+                }
             }
         }
         return map;

icss-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -1,5 +1,6 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.QuestionDTO;
 import com.diagbot.entity.QuestionDetail;
 import com.diagbot.entity.QuestionInfo;
@@ -124,4 +125,17 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         }
         return data;
     }
+
+    /**
+     * 根据标签名获取标签信息
+     * @param questionInfo
+     * @return
+     */
+    public QuestionInfo getQuestionInfos(QuestionInfo questionInfo){
+        QueryWrapper<QuestionInfo> queryWrapper = new QueryWrapper<QuestionInfo>();
+        queryWrapper.eq("is_deleted", "N");
+        queryWrapper.eq("type", 1);
+        queryWrapper.eq("name",questionInfo.getName());
+        return this.getOne(queryWrapper);
+    }
 }

icss-service/src/main/java/com/diagbot/facade/TemplateInfoFacade.java

@@ -14,6 +14,7 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.TemplateInfoServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.GsonUtil;
+import com.diagbot.util.UserUtils;
 import com.diagbot.vo.TemplateInfoRevampVO;
 import com.diagbot.vo.TemplateInfoVO;
 import com.diagbot.vo.TemplateInfosIdVO;
@@ -137,7 +138,9 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
 		UpdateWrapper<TemplateInfo> templateInfoNew = new UpdateWrapper<>();
 		templateInfoNew.in("id", splitIds)
 		               .eq("is_deleted", IsDeleteEnum.N.getKey())
-		               .set("is_deleted",IsDeleteEnum.Y.getKey());
+		               .set("is_deleted",IsDeleteEnum.Y.getKey())
+		               .set("modifier",UserUtils.getCurrentPrincipleID())
+		               .set("gmt_modified",DateUtil.now());
 		boolean res = update(new TemplateInfo(), templateInfoNew);
 		
 		return res;

icss-service/src/main/java/com/diagbot/mapper/ModuleQuestionMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.ModuleQuestion;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 模型标签映射表 Mapper 接口
- * </p>
- *
- * @author zhoutg
- * @since 2018-11-15
- */
-public interface ModuleQuestionMapper extends BaseMapper<ModuleQuestion> {
-
-}

icss-service/src/main/java/com/diagbot/service/ModuleQuestionService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.diagbot.entity.ModuleQuestion;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 模型标签映射表 服务类
- * </p>
- *
- * @author zhoutg
- * @since 2018-11-15
- */
-public interface ModuleQuestionService extends IService<ModuleQuestion> {
-
-}

icss-service/src/main/java/com/diagbot/service/impl/ModuleQuestionServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.diagbot.entity.ModuleQuestion;
-import com.diagbot.mapper.ModuleQuestionMapper;
-import com.diagbot.service.ModuleQuestionService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 模型标签映射表 服务实现类
- * </p>
- *
- * @author zhoutg
- * @since 2018-11-15
- */
-@Service
-public class ModuleQuestionServiceImpl extends ServiceImpl<ModuleQuestionMapper, ModuleQuestion> implements ModuleQuestionService {
-
-}

icss-service/src/main/java/com/diagbot/vo/DeptInfoVO.java

@@ -16,5 +16,5 @@ public class DeptInfoVO {
     @NotNull(message = "请输入科室编码")
     private String deptCode;
     @NotNull(message = "请输入医院编码")
-    private String hosptialCode;
+    private String hospitalCode;
 }

icss-service/src/main/java/com/diagbot/vo/HisInquirysVO.java

@@ -73,5 +73,11 @@ public class HisInquirysVO {
 	@ApiModelProperty(value="结束时间，格式为：2018-11-28 17:25:30")
 	@DateTimeFormat(pattern="yyyy-MM-dd hh:mm:ss")
 	private Date endDate;
+	
+	/**
+	 * 排序类型：1、时间降序；2、时间升序； 
+	 */
+	@ApiModelProperty(value="排序类型：1、时间降序；2、时间升序；")
+	private Integer orderType=1;
 	   
 }

icss-service/src/main/java/com/diagbot/web/QuestionInfoController.java

@@ -3,6 +3,7 @@ package com.diagbot.web;
 
 import com.diagbot.dto.QuestionDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.QuestionInfo;
 import com.diagbot.facade.QuestionFacade;
 import com.diagbot.vo.QuestionIdsVO;
 import com.diagbot.vo.QuestionVO;
@@ -54,4 +55,15 @@ public class QuestionInfoController {
         return RespDTO.onSuc(data);
     }
 
+
+    /**
+     * 获取疾病标签信息，远程调用[by:wangyu]
+     * @param questionInfo
+     * @return
+     */
+    @PostMapping("/getQuestionInfos")
+    public RespDTO<QuestionInfo> getQuestionInfos(@RequestBody QuestionInfo questionInfo){
+        QuestionInfo data = questionFacade.getQuestionInfos(questionInfo);
+        return RespDTO.onSuc(data);
+    }
 }

icssman-service/src/main/java/com/diagbot/client/IcssServiceClient.java

@@ -0,0 +1,26 @@
+package com.diagbot.client;
+
+import com.diagbot.client.hystrix.IcssServiceHystrix;
+import com.diagbot.dto.DeptInfoDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.QuestionInfo;
+import com.diagbot.vo.DeptInfoVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/12/3 17:46
+ */
+@FeignClient(value = "icss-service", fallback = IcssServiceHystrix.class)
+public interface IcssServiceClient {
+    @PostMapping("/deptInfo/getDeptInfo")
+    RespDTO<List<DeptInfoDTO>> getDeptInfo(@RequestBody DeptInfoVO deptInfoVO);
+
+    @PostMapping("/questionInfo/getQuestionInfos")
+    RespDTO<QuestionInfo> getQuestionInfos(@RequestBody QuestionInfo questionInfo);
+}

icssman-service/src/main/java/com/diagbot/client/hystrix/IcssServiceHystrix.java

@@ -0,0 +1,33 @@
+package com.diagbot.client.hystrix;
+
+import com.diagbot.client.IcssServiceClient;
+import com.diagbot.dto.DeptInfoDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.QuestionInfo;
+import com.diagbot.vo.DeptInfoVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+
+/**
+ * @Description: 调用Icss服务
+ * @author: gaodm
+ * @time: 2018/8/6 9:52
+ */
+@Component
+@Slf4j
+public class IcssServiceHystrix implements IcssServiceClient {
+    @Override
+    public RespDTO<List<DeptInfoDTO>> getDeptInfo(DeptInfoVO deptInfoVO) {
+        log.error("【hystrix】调用{}异常", "getDeptInfo");
+        return null;
+    }
+
+    @Override
+    public RespDTO<QuestionInfo> getQuestionInfos(QuestionInfo questionInfo) {
+        log.error("【hystrix】调用{}异常", "getQuestionInfos");
+        return null;
+    }
+}

icssman-service/src/main/java/com/diagbot/dto/DeptInfoDTO.java

@@ -0,0 +1,11 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.DeptInfo;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/11/19 18:56
+ */
+public class DeptInfoDTO extends DeptInfo {
+}

icss-service/src/main/java/com/diagbot/entity/ModuleQuestion.java

@@ -11,16 +11,16 @@ import java.util.Date;
 
 /**
  * <p>
- * 模型标签映射表
+ * 模型表
  * </p>
  *
  * @author zhoutg
- * @since 2018-11-15
+ * @since 2018-12-05
  */
+@TableName("icss_module_info")
 @Getter
 @Setter
-@TableName("icss_module_question")
-public class ModuleQuestion implements Serializable {
+public class ModuleInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -56,35 +56,10 @@ public class ModuleQuestion implements Serializable {
     private String modifier;
 
     /**
-     * 模型id
-     */
-    private Long moduleId;
-
-    /**
-     * question_id
-     */
-    private Long questionId;
-
-    /**
-     * 显示内容
+     * 名称
      */
     private String name;
 
-    /**
-     * 前置内容
-     */
-    private String prefix;
-
-    /**
-     * 后置内容
-     */
-    private String suffix;
-
-    /**
-     * 排序号
-     */
-    private Integer orderNo;
-
     /**
      * 备注
      */

icssman-service/src/main/java/com/diagbot/entity/QuestionUsual.java

@@ -1,10 +1,11 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -33,12 +34,12 @@ public class QuestionUsual implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -91,18 +92,18 @@ public class QuestionUsual implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

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

@@ -1,6 +1,11 @@
 package com.diagbot.facade;
 
+import com.diagbot.entity.DeptInfo;
 import com.diagbot.service.impl.DeptInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.AddDeptInfoVO;
 import org.springframework.stereotype.Component;
 
 /**
@@ -10,4 +15,18 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class DeptInfoFacade extends DeptInfoServiceImpl {
+
+    /**
+     * 添加科室信息（本地）
+     * @param addDeptInfoVO
+     * @return
+     */
+    public Boolean addDeptInfo(AddDeptInfoVO addDeptInfoVO) {
+        DeptInfo deptInfo =new DeptInfo();
+        BeanUtil.copyProperties(addDeptInfoVO,deptInfo);
+        deptInfo.setCreator(UserUtils.getCurrentPrincipleID());
+        deptInfo.setGmtCreate(DateUtil.now());
+        Boolean flag = this.save(deptInfo);
+        return flag;
+    }
 }

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

@@ -22,4 +22,16 @@ public class ModuleDetailFacade extends ModuleDetailServiceImpl {
     public void deleteByQuestionIdFac(Map map) {
         this.deleteByQuestionIds(map);
     }
+
+
+
+    /**
+     * 根据moduleId删除明细
+     *
+     * @param map
+     * @return
+     */
+    public void deleteByModuleIdFac(Map map) {
+        this.deleteByModuleIds(map);
+    }
 }

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

@@ -0,0 +1,50 @@
+package com.diagbot.facade;
+
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.ModuleInfoServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.util.UserUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:zhoutg
+ * @time: 2018/11/23 11:37
+ */
+@Component
+public class ModuleInfoFacade extends ModuleInfoServiceImpl {
+
+
+    @Autowired
+    ModuleDetailFacade moduleDetailFacade;
+
+    /**
+     * 根据id删除标签模板
+     *
+     * @param ids
+     * @return
+     */
+    public Boolean deleteByIdsFac(String ids) {
+        if(StringUtil.isEmpty(ids)) {
+            return true;
+        }
+        Map paramMap = new HashMap<>();
+        paramMap.put("delete", IsDeleteEnum.Y.getKey());
+        paramMap.put("ids", Arrays.asList(ids.split(",")));
+        paramMap.put("gmtModified", DateUtil.now());
+        paramMap.put("modifier", UserUtils.getCurrentPrincipleID());
+
+        //删除模板
+        this.deleteByIds(paramMap);
+
+        //删除明细表
+        moduleDetailFacade.deleteByModuleIdFac(paramMap);
+        return true;
+    }
+}

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

@@ -6,6 +6,7 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.QuestionInfoServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.StringUtil;
+import com.diagbot.util.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -45,8 +46,7 @@ public class QuestionInfoFacade extends QuestionInfoServiceImpl {
         paramMap.put("delete", IsDeleteEnum.Y.getKey());
         paramMap.put("ids", Arrays.asList(ids.split(",")));
         paramMap.put("gmtModified", DateUtil.now());
-        //TODO 获取当前修改人
-        paramMap.put("modifier", "modifier"); //修改人
+        paramMap.put("modifier", UserUtils.getCurrentPrincipleID());
 
         //删除自身
         this.deleteByIds(paramMap);

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

@@ -0,0 +1,97 @@
+package com.diagbot.facade;
+
+import com.diagbot.client.IcssServiceClient;
+import com.diagbot.dto.DeptInfoDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.QuestionInfo;
+import com.diagbot.entity.QuestionUsual;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.QuestionUsualServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.DeptInfoVO;
+import com.diagbot.vo.QuestionUsualVO;
+import com.diagbot.vo.UpdateQuetionUsualVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/12/3 17:06
+ */
+@Component
+public class QuestionUsualFacade extends QuestionUsualServiceImpl {
+    @Autowired
+    private IcssServiceClient icssServiceClient ;
+
+    /**
+     * 添加常用标签
+     * @param questionUsualVO
+     * @return
+     */
+    public Boolean addQuestionUsual(QuestionUsualVO questionUsualVO) {
+        DeptInfoVO deptInfoVO =new DeptInfoVO();
+        QuestionInfo questionInfo =new QuestionInfo();
+        BeanUtil.copyProperties(questionUsualVO,deptInfoVO);
+        RespDTO<List<DeptInfoDTO>> listRespDTO = icssServiceClient.getDeptInfo(deptInfoVO);
+        if (listRespDTO == null || !"0".equals(listRespDTO.code)) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR,
+                    "获取科室信息失败");
+        }
+        questionInfo.setName(questionUsualVO.getQuestionName());
+        RespDTO<QuestionInfo> questionInfoRespDTO = icssServiceClient.getQuestionInfos(questionInfo);
+        if (questionInfoRespDTO == null || !"0".equals(questionInfoRespDTO.code)) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR,
+                    "获取标签信息失败");
+        }
+        QuestionUsual questionUsual = new QuestionUsual();
+        questionUsual.setCreator(UserUtils.getCurrentPrincipleID());
+        questionUsual.setGmtCreate(DateUtil.now());
+        questionUsual.setQuestionId(questionInfoRespDTO.data.getId());
+        questionUsual.setDeptId(listRespDTO.data.get(0).getId());
+        Boolean flag = this.save(questionUsual);
+        if(!flag){
+            throw new CommonException(CommonErrorCode.FAIL,
+                    "常用症状添加失败");
+        }
+        return flag;
+    }
+
+    /**
+     * 修改常用标签
+     * @param updateQuetionUsualVO
+     * @return
+     */
+    public Boolean updateQuestionUsual(UpdateQuetionUsualVO updateQuetionUsualVO){
+        QuestionUsual questionUsual =new QuestionUsual();
+        BeanUtil.copyProperties(updateQuetionUsualVO,questionUsual);
+        questionUsual.setGmtModified(DateUtil.now());
+        questionUsual.setModifier(UserUtils.getCurrentPrincipleID());
+        Boolean flag = this.updateById(questionUsual);
+        if(!flag){
+            throw new CommonException(CommonErrorCode.FAIL,
+                    "常用症状修改失败");
+        }
+        return flag;
+    }
+
+    public Boolean deleteQuestionUsual(UpdateQuetionUsualVO updateQuetionUsualVO){
+        QuestionUsual questionUsual =new QuestionUsual();
+        BeanUtil.copyProperties(updateQuetionUsualVO,questionUsual);
+        questionUsual.setIsDeleted(IsDeleteEnum.Y.getKey());
+        questionUsual.setGmtModified(DateUtil.now());
+        questionUsual.setModifier(UserUtils.getCurrentPrincipleID());
+        Boolean flag = this.updateById(questionUsual);
+        if(!flag){
+            throw new CommonException(CommonErrorCode.FAIL,
+                    "常用症状删除失败");
+        }
+        return flag;
+    }
+}

icssman-service/src/main/java/com/diagbot/mapper/ModuleDetailMapper.java

@@ -16,4 +16,6 @@ import java.util.Map;
 public interface ModuleDetailMapper extends BaseMapper<ModuleDetail> {
 
     public void deleteByQuestionIds(Map map);
+
+    public void deleteByModuleIds(Map map);
 }

icssman-service/src/main/java/com/diagbot/mapper/ModuleInfoMapper.java

@@ -0,0 +1,19 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.ModuleInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 模型表 Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2018-12-05
+ */
+public interface ModuleInfoMapper extends BaseMapper<ModuleInfo> {
+
+    public void deleteByIds(Map map);
+}

icssman-service/src/main/java/com/diagbot/service/ModuleDetailService.java

@@ -22,4 +22,13 @@ public interface ModuleDetailService extends IService<ModuleDetail> {
      * @return
      */
     public void deleteByQuestionIds(Map map);
+
+
+    /**
+     * 根据id删除标签模板
+     *
+     * @param map
+     * @return
+     */
+    public void deleteByModuleIds(Map map);
 }

icssman-service/src/main/java/com/diagbot/service/ModuleInfoService.java

@@ -0,0 +1,25 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.ModuleInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 模型表 服务类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2018-12-05
+ */
+public interface ModuleInfoService extends IService<ModuleInfo> {
+
+    /**
+     * 根据id删除标签模板
+     *
+     * @param map
+     * @return
+     */
+    public void deleteByIds(Map map);
+}

icssman-service/src/main/java/com/diagbot/service/impl/ModuleDetailServiceImpl.java

@@ -23,4 +23,9 @@ public class ModuleDetailServiceImpl extends ServiceImpl<ModuleDetailMapper, Mod
     public void deleteByQuestionIds(Map map) {
         baseMapper.deleteByQuestionIds(map);
     }
+
+    @Override
+    public void deleteByModuleIds(Map map) {
+        baseMapper.deleteByModuleIds(map);
+    }
 }

icssman-service/src/main/java/com/diagbot/service/impl/ModuleInfoServiceImpl.java

@@ -0,0 +1,26 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.ModuleInfo;
+import com.diagbot.mapper.ModuleInfoMapper;
+import com.diagbot.service.ModuleInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 模型表 服务实现类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2018-12-05
+ */
+@Service
+public class ModuleInfoServiceImpl extends ServiceImpl<ModuleInfoMapper, ModuleInfo> implements ModuleInfoService {
+
+    @Override
+    public void deleteByIds(Map map) {
+        baseMapper.deleteByIds(map);
+    }
+}

icssman-service/src/main/java/com/diagbot/vo/AddDeptInfoVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/12/5 13:17
+ */
+@Getter
+@Setter
+public class AddDeptInfoVO {
+    @NotNull(message = "请输入科室名称")
+    private String name;
+}

icssman-service/src/main/java/com/diagbot/vo/DeptInfoVO.java

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/11/19 18:58
+ */
+@Getter
+@Setter
+public class DeptInfoVO {
+    @NotNull(message = "请输入科室编码")
+    private String deptCode;
+    @NotNull(message = "请输入医院编码")
+    private String hospitalCode;
+}

icssman-service/src/main/java/com/diagbot/vo/QuestionUsualVO.java

@@ -0,0 +1,22 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/12/3 17:07
+ */
+@Getter
+@Setter
+public class QuestionUsualVO {
+    @NotNull(message = "请输入医院编号")
+    private String hospitalCode;
+    @NotNull(message = "请输入科室编号")
+    private String deptCode;
+    @NotNull(message = "请输入症状名称")
+    private String questionName;
+}

icssman-service/src/main/java/com/diagbot/vo/UpdateQuetionUsualVO.java

@@ -0,0 +1,21 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/12/4 15:08
+ */
+@Getter
+@Setter
+public class UpdateQuetionUsualVO {
+    @NotNull(message = "请输入id")
+    private Long id;
+
+    private Long orderNo;
+
+}

icssman-service/src/main/java/com/diagbot/web/DeptInfoController.java

@@ -1,7 +1,16 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.DeptInfoFacade;
+import com.diagbot.vo.AddDeptInfoVO;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -16,7 +25,19 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/deptInfo")
 @SuppressWarnings("unchecked")
-@Api(value = "科室相关API", tags = { "科室相关API" })
+@Api(value = "科室维护相关API", tags = { "科室相关维护API" })
 public class DeptInfoController {
 
+    @Autowired
+    private DeptInfoFacade deptInfoFacade;
+
+    @ApiOperation(value = "科室维护——添加（本地科室）[by:wangyu]",
+            notes = "name: 科室编号,必填<br>")
+    @PostMapping("/addDeptInfo")
+    @SysLogger("addDeptInfo")
+    @Transactional
+    public RespDTO<Boolean> addDeptInfo(@RequestBody AddDeptInfoVO addDeptInfoVO) {
+        Boolean data = deptInfoFacade.addDeptInfo(addDeptInfoVO);
+        return RespDTO.onSuc(data);
+    }
 }

icssman-service/src/main/java/com/diagbot/web/IntroduceDetailController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -39,4 +40,22 @@ public class IntroduceDetailController {
         List<IntroduceDetail> data = introduceDetailFacade.getByIntroduceId(introduceId);
         return RespDTO.onSuc(data);
     }
+
+    @ApiOperation(value = "删除单条提示信息明细[by:zhaops]",
+            notes = "id: id,必填")
+    @PostMapping("/deleteRecord")
+    @SysLogger("deleteRecord")
+    public RespDTO<Boolean> deleteRecord(@RequestParam Long id) {
+        Boolean data = introduceDetailFacade.removeById(id);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "批量删除提示信息明细[by:zhaops]",
+            notes = "ids: ids,必填")
+    @PostMapping("/deleteRecords")
+    @SysLogger("deleteRecords")
+    public RespDTO<Boolean> deleteRecords(@RequestParam Long[] ids) {
+        Boolean data = introduceDetailFacade.removeByIds(Arrays.asList(ids));
+        return RespDTO.onSuc(data);
+    }
 }

icssman-service/src/main/java/com/diagbot/web/ModuleInfoController.java

@@ -0,0 +1,49 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.ModuleInfoFacade;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 模型表 前端控制器
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2018-12-05
+ */
+@RestController
+@RequestMapping("/moduleInfo")
+@Api(value = "标签模板相关API", tags = { "标签模板相关API" })
+public class ModuleInfoController {
+
+
+    @Autowired
+    ModuleInfoFacade moduleInfoFacade;
+
+    @ApiOperation(value = "标签模板新增或更新[by:zhoutg]",
+            notes = "")
+    @PostMapping("/saveOrUpdate")
+    @SysLogger("saveOrUpdate")
+    public RespDTO<Boolean> saveOrUpdate() {
+
+        return RespDTO.onSuc(true);
+    }
+
+
+    @ApiOperation(value = "标签模板删除[by:zhoutg]",
+            notes = "")
+    @PostMapping("/delete")
+    @SysLogger("delete")
+    public RespDTO<Boolean> delete(String ids) {
+        moduleInfoFacade.deleteByIdsFac(ids);
+        return RespDTO.onSuc(true);
+    }
+}

icssman-service/src/main/java/com/diagbot/web/QuestionInfoController.java

@@ -22,12 +22,11 @@ import java.util.List;
  * 标签基础表 前端控制器
  * </p>
  *
- * @author zhaops
+ * @author zhoutg
  * @since 2018-11-23
  */
 @RestController
 @RequestMapping("/questionInfo")
-@SuppressWarnings("unchecked")
 @Api(value = "标签相关API——数据谨慎操作", tags = { "标签相关API——数据谨慎操作" })
 public class QuestionInfoController {
 

icssman-service/src/main/java/com/diagbot/web/QuestionUsualController.java

@@ -1,7 +1,17 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.QuestionUsualFacade;
+import com.diagbot.vo.QuestionUsualVO;
+import com.diagbot.vo.UpdateQuetionUsualVO;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -19,4 +29,40 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(value = "常用标签维护相关API", tags = { "常用标签维护相关API" })
 public class QuestionUsualController {
 
+    @Autowired
+    private QuestionUsualFacade questionUsualFacade;
+
+    @ApiOperation(value = "常用标签维护——添加[by:wangyu]",
+            notes = "deptCode: 科室编号,必填<br>" +
+                    "hospitalCode: 医院编号，必填<br>" +
+                    "questionName: 症状名称，必填")
+    @PostMapping("/addQuestionUsual")
+    @SysLogger("addQuestionUsual")
+    @Transactional
+    public RespDTO<Boolean> addQuestionUsual(@RequestBody QuestionUsualVO questionUsualVO) {
+        Boolean data = questionUsualFacade.addQuestionUsual(questionUsualVO);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "常用标签维护——修改[by:wangyu]",
+            notes = "id: 常用标签id,必填<br>" +
+                    "orderNo: 排序号<br>" +
+                    "")
+    @PostMapping("/updateQuestionUsual")
+    @SysLogger("updateQuestionUsual")
+    @Transactional
+    public RespDTO<Boolean> updateQuestionUsual(@RequestBody UpdateQuetionUsualVO updateQuetionUsualVO) {
+        Boolean data = questionUsualFacade.updateQuestionUsual(updateQuetionUsualVO);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "常用标签维护——删除[by:wangyu]",
+            notes = "id: 常用标签id,必填<br>")
+    @PostMapping("/deleteQuestionUsual")
+    @SysLogger("deleteQuestionUsual")
+    @Transactional
+    public RespDTO<Boolean> deleteQuestionUsual(@RequestBody UpdateQuetionUsualVO updateQuetionUsualVO) {
+        Boolean data = questionUsualFacade.deleteQuestionUsual(updateQuetionUsualVO);
+        return RespDTO.onSuc(data);
+    }
 }

icssman-service/src/main/resources/mapper/ModuleDetailMapper.xml

@@ -27,4 +27,15 @@
             #{id}
         </foreach>
     </delete>
+
+
+    <delete id="deleteByModuleIds" parameterType="java.util.Map">
+        update `icss_module_detail`
+        set gmt_modified = #{gmtModified}, modifier = #{modifier}, is_deleted = #{delete}
+        where is_deleted = 'N'
+        and module_id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")" >
+            #{id}
+        </foreach>
+    </delete>
 </mapper>

icss-service/src/main/resources/mapper/ModuleQuestionMapper.xml

@@ -1,22 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.ModuleQuestionMapper">
+<mapper namespace="com.diagbot.mapper.ModuleInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.ModuleQuestion">
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.ModuleInfo">
         <id column="id" property="id" />
         <result column="is_deleted" property="isDeleted" />
         <result column="gmt_create" property="gmtCreate" />
         <result column="gmt_modified" property="gmtModified" />
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
-        <result column="module_id" property="moduleId" />
-        <result column="question_id" property="questionId" />
         <result column="name" property="name" />
-        <result column="prefix" property="prefix" />
-        <result column="suffix" property="suffix" />
-        <result column="order_no" property="orderNo" />
         <result column="remark" property="remark" />
     </resultMap>
 
+
+    <delete id="deleteByIds" parameterType="java.util.Map">
+        update `icss_module_info`
+        set gmt_modified = #{gmtModified}, modifier = #{modifier}, is_deleted = #{delete}
+        where is_deleted = 'N'
+        and id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")" >
+            #{id}
+        </foreach>
+    </delete>
 </mapper>

icssman-service/src/main/resources/mapper/QuestionInfoMapper.xml

@@ -76,7 +76,5 @@
         <if test="type != null and type != ''">
             and type = #{type}
         </if>
-
-
     </select>
 </mapper>

icssman-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -27,13 +27,13 @@ public class CodeGeneration {
 
         // 全局配置
         GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir("E://code//biservice");
+        gc.setOutputDir("E://code");
         gc.setFileOverride(true);
         gc.setActiveRecord(false);// 不需要ActiveRecord特性的请改为false
         gc.setEnableCache(false);// XML 二级缓存
         gc.setBaseResultMap(true);// XML ResultMap
         gc.setBaseColumnList(false);// XML columList
-        gc.setAuthor("gaodm");// 作者
+        gc.setAuthor("zhoutg");// 作者
 
         // 自定义文件命名，注意 %s 会自动填充表实体属性！
         gc.setControllerName("%sController");
@@ -48,15 +48,15 @@ public class CodeGeneration {
         dsc.setDbType(DbType.MYSQL);
         dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("root");
-        dsc.setUrl("jdbc:mysql://127.0.0.1:3306/sys-log?useUnicode=true&characterEncoding=utf-8");
+        dsc.setPassword("lantone");
+        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-icss?useUnicode=true&characterEncoding=utf-8");
         mpg.setDataSource(dsc);
 
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
-//        strategy.setTablePrefix(new String[] { "sys_" });// 此处可以修改为您的表前缀
+        strategy.setTablePrefix(new String[] { "icss_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "sys_log" }); // 需要生成的表
+        strategy.setInclude(new String[] { "icss_module_detail" }); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);