Merge branch 'dev/icss20191121_set' into develop

aipt-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDTO.java

@@ -141,16 +141,4 @@ public class GetTopPatientInfoDTO {
 	@ApiModelProperty(value="门诊号")
 	private String recordId;
 	
-    /**
-     * 模式分类
-     */
-	@ApiModelProperty(value="模式分类")
-    private Integer modeClassify;
-
-    /**
-     * 模式值
-     */
-	@ApiModelProperty(value="模式值")
-    private Integer modeValue;
-	
 }

aipt-service/src/main/java/com/diagbot/web/ConceptDetailController.java

@@ -38,7 +38,7 @@ public class ConceptDetailController {
     @ApiOperation(value = "知识库标准化-获取提示信息[by:zhaops]",
             notes = "name: 标签名称，必填<br>" +
                     "titles: 标题，数组选填<br>" +
-                    "type：标签类型（1-症状，5-化验，6-辅检，7-诊断，8-药品，9-药品大类，10-不良反应，11-药品小类，12-化验公表项，22-指标），单选必填<br>" +
+                    "type：标签类型（1-症状，5-化验，6-辅检，7-诊断，8-药品，9-药品大类，10-不良反应，11-药品小类，12-化验公表项，22-指标，25-手术），单选必填<br>" +
                     "position：1-摘要，2-全文，5-药品说明书，6-不良反应，单选选填")
     @PostMapping("/getConceptDetail")
     @SysLogger("getConceptDetail")
@@ -50,7 +50,7 @@ public class ConceptDetailController {
     @ApiOperation(value = "知识库标准化-批量获取提示信息[by:zhaops]",
             notes = "name: 标签名称，必填<br>" +
                     "titles: 标题，数组选填<br>" +
-                    "type：标签类型（1-症状，5-化验，6-辅检，7-诊断，8-药品，9-药品大类，10-不良反应，11-药品小类，12-化验公表项，22-指标），单选必填<br>" +
+                    "type：标签类型（1-症状，5-化验，6-辅检，7-诊断，8-药品，9-药品大类，10-不良反应，11-药品小类，12-化验公表项，22-指标，25-手术），单选必填<br>" +
                     "position：1-摘要，2-全文，5-药品说明书，6-不良反应，单选选填")
     @PostMapping("/getConceptDetails")
     @SysLogger("getConceptDetails")

data-service/src/main/java/com/diagbot/web/ConceptDetailController.java

@@ -32,7 +32,7 @@ public class ConceptDetailController {
 
     @ApiOperation(value = "获取提示信息[by:zhaops]",
             notes = "name: 标签名称，必填<br>" +
-                    "type：标签类型（1-症状，5-化验，6-辅检，7-诊断，8-药品，9-药品大类，10-不良反应，11-药品小类，12-化验公表项，22-指标），单选必填<br>" +
+                    "type：标签类型（1-症状，5-化验，6-辅检，7-诊断，8-药品，9-药品大类，10-不良反应，11-药品小类，12-化验公表项，22-指标，25-手术），单选必填<br>" +
                     "titles：提示信息标题列表，数组选填<br>" +
                     "position：1-摘要，2-全文，5-药品说明书，6-不良反应，单选选填")
     @PostMapping("/getConceptDetail")
@@ -45,7 +45,7 @@ public class ConceptDetailController {
     @ApiOperation(value = "批量获取提示信息[by:zhaops]",
             notes = "conceptIntorduces:数组，必填<br>" +
                     "name: 标签名称，必填<br>" +
-                    "type：标签类型（1-症状，5-化验，6-辅检，7-诊断，8-药品，9-药品大类，10-不良反应，11-药品小类，12-化验公表项，22-指标），单选必填<br>" +
+                    "type：标签类型（1-症状，5-化验，6-辅检，7-诊断，8-药品，9-药品大类，10-不良反应，11-药品小类，12-化验公表项，22-指标，25-手术），单选必填<br>" +
                     "titles：提示信息标题列表，数组选填<br>" +
                     "position：1-摘要，2-全文，5-药品说明书，6-不良反应，单选选填")
     @PostMapping("/getConceptDetails")

docs/023.20191122ICSS标签支持是否显示默认选中/init_icss.sql

@@ -0,0 +1,12 @@
+use `sys-icss`;
+
+ALTER TABLE `icss_question_info`
+ADD COLUMN `sel_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '开启默认选中标记(0：不开启，1：开启)' AFTER `spec_flag`;
+
+INSERT INTO `icss_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('107', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '全部', '0', '2', '1', '静态知识检索类型');
+INSERT INTO `icss_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('108', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '症状', '1', '2', '30', '静态知识检索类型');
+INSERT INTO `icss_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('109', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '诊断', '18', '2', '10', '静态知识检索类型');
+INSERT INTO `icss_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('110', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '化验', '12', '2', '40', '静态知识检索类型');
+INSERT INTO `icss_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('111', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '辅检', '16', '2', '50', '静态知识检索类型');
+INSERT INTO `icss_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('112', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '药品', '10', '2', '20', '静态知识检索类型');
+INSERT INTO `icss_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('113', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '手术', '25', '2', '60', '静态知识检索类型');

icss-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -245,4 +245,13 @@ public interface AiptServiceClient {
 
     @PostMapping("/lisMapping/getLisMappingByQuestion")
     RespDTO<Map<String, Map<String, String>>> getLisMappingByQuestion(GetLisMappingVO getLisMappingVO);
+
+    /**
+     * 批量获取提示信息
+     *
+     * @param conceptIntroduceVOList
+     * @return
+     */
+    @PostMapping(value = "/conceptDetail/getConceptDetails")
+    RespDTO<List<ConceptIntroduceDTO>> getConceptDetails(@Valid @RequestBody List<ConceptIntroduceVO> conceptIntroduceVOList);
 }

icss-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -307,7 +307,7 @@ public class AiptServiceHystrix implements AiptServiceClient {
      * 获取版本信息
      */
     @Override
-    public RespDTO<VersionWrapperDTO> getVersionInfoAlls(VersionVO versionVO){
+    public RespDTO<VersionWrapperDTO> getVersionInfoAlls(VersionVO versionVO) {
         log.error("【hystrix】调用{}异常", "getVersionInfoAlls");
         return null;
     }
@@ -317,4 +317,16 @@ public class AiptServiceHystrix implements AiptServiceClient {
         log.error("【hystrix】调用{}异常", "getLisMappingByQuestion");
         return null;
     }
+
+    /**
+     * 批量获取提示信息
+     *
+     * @param conceptIntroduceVOList
+     * @return
+     */
+    @Override
+    public RespDTO<List<ConceptIntroduceDTO>> getConceptDetails(@Valid @RequestBody List<ConceptIntroduceVO> conceptIntroduceVOList) {
+        log.error("【hystrix】调用{}异常", "getConceptDetails");
+        return null;
+    }
 }

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

@@ -141,16 +141,4 @@ public class GetTopPatientInfoDTO {
 	@ApiModelProperty(value="门诊号")
 	private String recordId;
 	
-    /**
-     * 模式分类
-     */
-	@ApiModelProperty(value="模式分类")
-    private Integer modeClassify;
-
-    /**
-     * 模式值
-     */
-	@ApiModelProperty(value="模式值")
-    private Integer modeValue;
-	
 }

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

@@ -43,6 +43,7 @@ public class QuestionDTO {
     private String uniqueName; //隐藏名称
     private String formulaCode;     //公式编码
     private Integer specFlag;//特殊标记（0：没有标记，1：主诉高亮，2：诱因记录）
+    private Integer selFlag; // 开启默认选中标记(0：不开启，1：开启)
     private String remark;//备注
 
 }

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

@@ -0,0 +1,88 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * icss字典表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2018-12-25
+ */
+@TableName("icss_dictionary_info")
+@Getter
+@Setter
+public class DictionaryInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 分组（值自定义）
+     */
+    private Long groupType;
+
+    /**
+     * 内容
+     */
+    private String name;
+
+    /**
+     * 值
+     */
+    private String val;
+
+    /**
+     * 返回类型（0: 都返回，1：后台维护返回 2：icss界面返回）
+     */
+    private Integer returnType;
+
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

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

@@ -135,6 +135,11 @@ public class QuestionInfo implements Serializable {
      */
     private Integer specFlag;
 
+    /**
+     * 开启默认选中标记(0：不开启，1：开启)
+     */
+    private Integer selFlag;
+
     /**
      * 备注
      */

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

@@ -8,6 +8,8 @@ import com.diagbot.vo.ConceptIntroduceVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Description:提示信息业务层
  * @Author:zhaops
@@ -29,4 +31,16 @@ public class ConceptDetailFacade {
         RespDTOUtil.respNGDeal(res, "获取提示信息失败");
         return res.data;
     }
+
+    /**
+     * 批量获取提示信息
+     *
+     * @param conceptIntroduceVOList
+     * @return
+     */
+    public List<ConceptIntroduceDTO> getConceptDetails(List<ConceptIntroduceVO> conceptIntroduceVOList) {
+        RespDTO<List<ConceptIntroduceDTO>> res = aiptServiceClient.getConceptDetails(conceptIntroduceVOList);
+        RespDTOUtil.respNGDeal(res, "获取静态知识失败");
+        return res.data;
+    }
 }

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

@@ -0,0 +1,34 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.DictionaryInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.DictionaryInfoServiceImpl;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.ListUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:zhoutg
+ * @time: 2018/11/23 11:37
+ */
+@Component
+public class DictionaryFacade extends DictionaryInfoServiceImpl {
+
+    /**
+     * 返回字典信息
+     *
+     * @return
+     */
+    public Map<Long, List<DictionaryInfo>> getList() {
+        List<DictionaryInfo> list = this.list(new QueryWrapper<DictionaryInfo>()
+                .in("return_type", ListUtil.arrayToList(new Long[] { 0L, 2L }))
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .orderByAsc("group_type", "order_no"));
+        return EntityUtil.makeEntityListMap(list, "groupType");
+    }
+}

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

@@ -1,82 +1,85 @@
-package com.diagbot.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.diagbot.dto.DoctorPageModeDTO;
-import com.diagbot.entity.DoctorPageMode;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.DoctorPageModeServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.vo.DoctorIdVO;
-import com.diagbot.vo.DoctorPageModeVO;
-import org.springframework.stereotype.Component;
-
-import javax.validation.Valid;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author wangfeng
- * @Description: 医生页面模式设置
- * @date 2018年11月20日 下午2:56:01
- */
-@Component
-public class DoctorPageModeFacade extends DoctorPageModeServiceImpl {
-
-    /**
-     * 保存医生页面结构设置信息
-     *
-     * @param doctorPageModeVO
-     * @return
-     */
-    public boolean saveDoctorPageMode(DoctorPageModeVO doctorPageModeVO) {
-        QueryWrapper<DoctorPageMode> doctorPageModeWrapper = new QueryWrapper<>();
-        Map<String, Object> mapAll = new HashMap<>();
-        mapAll.put("doctor_id", doctorPageModeVO.getDoctorId());
-        mapAll.put("mode_classify", doctorPageModeVO.getModeClassify());
-        mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
-        doctorPageModeWrapper.allEq(mapAll);
-        DoctorPageMode datas = getOne(doctorPageModeWrapper, false);
-        boolean res = false;
-        if (datas != null) {
-            UpdateWrapper<DoctorPageMode> doctorPageModeUpdate = new UpdateWrapper<>();
-            doctorPageModeUpdate.eq("id", datas.getId())
-                    .set("mode_classify", doctorPageModeVO.getModeClassify())
-                    .set("mode_value", doctorPageModeVO.getModeValue())
-                    .set("modifier", doctorPageModeVO.getDoctorId().toString())
-                    .set("gmt_modified", DateUtil.now());
-            res = update(new DoctorPageMode(), doctorPageModeUpdate);
-            //throw new CommonException(CommonErrorCode.NOT_EXISTS, "该模板名已存在");
-        } else {
-            DoctorPageMode doctorPageMode = new DoctorPageMode();
-            doctorPageMode.setDoctorId(doctorPageModeVO.getDoctorId());
-            doctorPageMode.setModeClassify(doctorPageModeVO.getModeClassify());
-            doctorPageMode.setModeValue(doctorPageModeVO.getModeValue());
-            doctorPageMode.setCreator(doctorPageModeVO.getDoctorId().toString());
-            doctorPageMode.setGmtCreate(DateUtil.now());
-            res = save(doctorPageMode);
-        }
-
-        return res;
-    }
-
-    /**
-     * 获取医生页面结构设置信息
-     *
-     * @param doctorIdVO
-     * @return
-     */
-    public List<DoctorPageModeDTO> getDoctorPageMode(@Valid DoctorIdVO doctorIdVO) {
-        QueryWrapper<DoctorPageMode> doctorPageModeWrapper = new QueryWrapper<>();
-        Map<String, Object> mapAll = new HashMap<>();
-        mapAll.put("doctor_id", doctorIdVO.getDoctorId());
-        mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
-        doctorPageModeWrapper.allEq(mapAll);
-        List<DoctorPageMode> doctorPageModeData = list(doctorPageModeWrapper);
-        List<DoctorPageModeDTO> data = BeanUtil.listCopyTo(doctorPageModeData, DoctorPageModeDTO.class);
-        return data;
-    }
-
-}
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.DoctorPageModeDTO;
+import com.diagbot.entity.DoctorPageMode;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.DoctorPageModeServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.DoctorIdVO;
+import com.diagbot.vo.DoctorPageModeAllVO;
+import com.diagbot.vo.DoctorPageModeVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.swing.text.Utilities;
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangfeng
+ * @Description: 医生页面模式设置
+ * @date 2018年11月20日 下午2:56:01
+ */
+@Component
+public class DoctorPageModeFacade extends DoctorPageModeServiceImpl {
+
+    @Autowired
+    DoctorPageModeServiceImpl doctorPageModeServiceImpl;
+    /**
+     * 保存医生页面结构设置信息
+     *
+     * @param doctorPageModeAllVO
+     * @return
+     */
+    public boolean saveDoctorPageMode(DoctorPageModeAllVO doctorPageModeAllVO) {
+        boolean res = false;
+        if(ListUtil.isNotEmpty(doctorPageModeAllVO.getDoctorPageMode())) {
+            QueryWrapper<DoctorPageMode> doctorPageModeWrapper = new QueryWrapper<>();
+            doctorPageModeWrapper.eq("doctor_id", doctorPageModeAllVO.getDoctorId())
+                    .eq("is_deleted", IsDeleteEnum.N.getKey());
+            res = remove(doctorPageModeWrapper);
+            List<DoctorPageMode> doctorData = new ArrayList<DoctorPageMode>();
+            Date dateTime = DateUtil.now();
+            for (DoctorPageModeVO doctorPageModeData : doctorPageModeAllVO.getDoctorPageMode()) {
+                DoctorPageMode data = new DoctorPageMode();
+                data.setCreator(doctorPageModeAllVO.getDoctorId().toString());
+                data.setGmtCreate(dateTime);
+                data.setGmtModified(dateTime);
+                data.setModifier(doctorPageModeAllVO.getDoctorId().toString());
+                data.setModeClassify(doctorPageModeData.getModeClassify());
+                data.setDoctorId(doctorPageModeAllVO.getDoctorId());
+                data.setModeValue(doctorPageModeData.getModeValue());
+                doctorData.add(data);
+            }
+            res = doctorPageModeServiceImpl.saveBatch(doctorData);
+        }
+        return res;
+    }
+
+    /**
+     * 获取医生页面结构设置信息
+     *
+     * @param doctorIdVO
+     * @return
+     */
+    public List<DoctorPageModeDTO> getDoctorPageMode(@Valid DoctorIdVO doctorIdVO) {
+        QueryWrapper<DoctorPageMode> doctorPageModeWrapper = new QueryWrapper<>();
+        Map<String, Object> mapAll = new HashMap<>();
+        mapAll.put("doctor_id", doctorIdVO.getDoctorId());
+        mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
+        doctorPageModeWrapper.allEq(mapAll);
+        List<DoctorPageMode> doctorPageModeData = list(doctorPageModeWrapper);
+        List<DoctorPageModeDTO> data = BeanUtil.listCopyTo(doctorPageModeData, DoctorPageModeDTO.class);
+        return data;
+    }
+
+}

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

@@ -51,18 +51,7 @@ public class PatientInfoFacade {
     public GetTopPatientInfoDTO getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
         RespDTO<GetTopPatientInfoDTO> respDTO = aiptServiceClient.getTopPatientInfo(getTopPatientInfoVO);
         RespDTOUtil.respNGDealCover(respDTO, "获取页面顶部病人医生科室信息失败");
-
-        GetTopPatientInfoDTO getTopPatientInfoDTO = respDTO.data;
-
-        QueryWrapper<DoctorPageMode> doctorPageModeQe = new QueryWrapper<>();
-        doctorPageModeQe.eq("is_deleted", IsDeleteEnum.N.getKey());
-        doctorPageModeQe.eq("doctor_id", getTopPatientInfoDTO.getDoctorId());
-        DoctorPageMode doctorPageMode = doctorPageModeFacade.getOne(doctorPageModeQe, false);
-        if (doctorPageMode != null) {
-            getTopPatientInfoDTO.setModeClassify(doctorPageMode.getModeClassify());
-            getTopPatientInfoDTO.setModeValue(doctorPageMode.getModeValue());
-        }
-        return getTopPatientInfoDTO;
+        return respDTO.data;
     }
 
 }

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

@@ -174,12 +174,13 @@ public class RetrievalFacade {
         if (null == types) {
             types = new ArrayList<>();
         }
-        if (ListUtil.isEmpty(types)) {
+        if (ListUtil.isEmpty(types) || types.contains(0)) { // 空或者0，搜索全部
             // 添加标签类型
             typeList.add(ConceptTypeEnum.Symptom.getKey());
             typeList.add(ConceptTypeEnum.Lis.getKey());
 
             // 添加词库搜索类型
+            types.clear();
             types.add(StaticSearchTypeEnum.DIAGNOSIS.getKey());
             types.add(StaticSearchTypeEnum.DRUGS.getKey());
             types.add(StaticSearchTypeEnum.SYMPTOM.getKey());

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

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.DictionaryInfo;
+
+/**
+ * <p>
+ * icss字典表 Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2018-12-25
+ */
+public interface DictionaryInfoMapper extends BaseMapper<DictionaryInfo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.DictionaryInfo;
+
+/**
+ * <p>
+ * icss字典表 服务类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2018-12-25
+ */
+public interface DictionaryInfoService extends IService<DictionaryInfo> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.entity.DictionaryInfo;
+import com.diagbot.mapper.DictionaryInfoMapper;
+import com.diagbot.service.DictionaryInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * icss字典表 服务实现类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2018-12-25
+ */
+@Service
+public class DictionaryInfoServiceImpl extends ServiceImpl<DictionaryInfoMapper, DictionaryInfo> implements DictionaryInfoService {
+
+}

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

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/10/31 16:45
+ */
+@Getter
+@Setter
+public class ConceptIntorducesVO {
+    private List<ConceptIntroduceVO> conceptIntorduces;
+}

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

@@ -0,0 +1,25 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2019-11-21 16:48
+ */
+@Setter
+@Getter
+public class DoctorPageModeAllVO {
+
+    /**
+     * 医生id
+     */
+    @NotNull(message = "请输入医生id")
+    private Long doctorId;
+
+    private List<DoctorPageModeVO> doctorPageMode;
+}

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

@@ -1,33 +1,29 @@
-package com.diagbot.vo;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月20日 下午3:15:26
- */
-@Setter
-@Getter
-public class DoctorPageModeVO {
-	/**
-     * 医生id
-     */
-	@NotNull(message = "请输入医生id")
-    private Long doctorId;
-    /**
-     * 模式分类
-     */
-    private Integer modeClassify;
-
-    /**
-     * 模式值
-     */
-    private Integer modeValue;
-
-
-}
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月20日 下午3:15:26
+ */
+@Setter
+@Getter
+public class DoctorPageModeVO {
+
+    /**
+     * 模式分类
+     */
+    private Integer modeClassify;
+
+    /**
+     * 模式值
+     */
+    private Integer modeValue;
+
+
+}

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

@@ -2,6 +2,7 @@ package com.diagbot.vo;
 
 import java.util.List;
 
+import com.diagbot.dto.ConceptIntroduceDTO;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -68,6 +69,10 @@ public class SaveInquiryToHisVO {
 	 * 问诊明细
 	 */
     private List<SaveInquiryToHisDetailVO> detailList;
-    
+
+    /**
+     * 一般治疗
+     */
+    private List<ConceptIntroduceDTO> conceptIntroduceDTO;
    
 }

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

@@ -7,6 +7,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
+import com.diagbot.dto.ConceptIntroduceDTO;
 import org.hibernate.validator.constraints.Range;
 
 import io.swagger.annotations.ApiModel;
@@ -122,5 +123,11 @@ public class SaveInquiryVO {
     @Valid
     @ApiModelProperty(value="指标值明细")
     private List<IndexDataVO> IndexData;
+
+    /**
+     * 一般治疗
+     */
+    @ApiModelProperty(value="治疗方案")
+    private List<ConceptIntroduceDTO> conceptIntroduceDTO;
    
 }

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

@@ -4,6 +4,7 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.ConceptIntroduceDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ConceptDetailFacade;
+import com.diagbot.vo.ConceptIntorducesVO;
 import com.diagbot.vo.ConceptIntroduceVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -33,7 +35,7 @@ public class ConceptDetailController {
 
     @ApiOperation(value = "知识库标准化-获取提示信息[by:zhaops]",
             notes = "name: 标签名称，必填<br>" +
-                    "type：标签类型（1-症状，5-化验，6-辅检，7-诊断，8-药品，9-药品大类，10-不良反应，11-药品小类，12-化验公表项，22-指标），单选必填<br>" +
+                    "type：标签类型（1-症状，5-化验，6-辅检，7-诊断，8-药品，9-药品大类，10-不良反应，11-药品小类，12-化验公表项，22-指标，25-手术），单选必填<br>" +
                     "position：1-摘要，2-全文，5-药品说明书，6-不良反应，单选选填")
     @PostMapping("/getConceptDetail")
     @SysLogger("getConceptDetail")
@@ -41,4 +43,17 @@ public class ConceptDetailController {
         ConceptIntroduceDTO data = conceptDetailFacade.getConceptDetail(conceptIntroduceVO);
         return RespDTO.onSuc(data);
     }
+
+    @ApiOperation(value = "批量获取提示信息[by:zhaops]",
+            notes = "conceptIntorduces:数组，必填<br>" +
+                    "name: 标签名称，必填<br>" +
+                    "type：标签类型（1-症状，5-化验，6-辅检，7-诊断，8-药品，9-药品大类，10-不良反应，11-药品小类，12-化验公表项，22-指标，25-手术），单选必填<br>" +
+                    "titles：提示信息标题列表，数组选填<br>" +
+                    "position：1-摘要，2-全文，3-一般治疗，4-手术治疗，5-药品说明书，6-不良反应，单选选填")
+    @PostMapping("/getConceptDetails")
+    @SysLogger("getConceptDetails")
+    public RespDTO<List<ConceptIntroduceDTO>> getConceptDetails(@Valid @RequestBody ConceptIntorducesVO conceptIntorducesVO) {
+        List<ConceptIntroduceDTO> data = conceptDetailFacade.getConceptDetails(conceptIntorducesVO.getConceptIntorduces());
+        return RespDTO.onSuc(data);
+    }
 }

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

@@ -0,0 +1,45 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.DictionaryInfo;
+import com.diagbot.facade.DictionaryFacade;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * icss字典表 前端控制器
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2018-12-25
+ */
+@RequestMapping("/dictionaryInfo")
+@RestController
+@SuppressWarnings("unchecked")
+@Api(value = "字典信息", tags = { "字典信息" })
+public class DictionaryInfoController {
+
+
+    @Autowired
+    DictionaryFacade dictionaryFacade;
+
+    @ApiOperation(value = "返回字典信息[by:zhoutg]",
+            notes = "")
+    @PostMapping("/getList")
+    @SysLogger("getList")
+    @Transactional
+    public RespDTO<Map<Long, List<DictionaryInfo>>> getList() {
+        Map<Long, List<DictionaryInfo>> data = dictionaryFacade.getList();
+        return RespDTO.onSuc(data);
+    }
+}

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

@@ -5,6 +5,7 @@ import com.diagbot.dto.DoctorPageModeDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.DoctorPageModeFacade;
 import com.diagbot.vo.DoctorIdVO;
+import com.diagbot.vo.DoctorPageModeAllVO;
 import com.diagbot.vo.DoctorPageModeVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -46,12 +47,16 @@ public class DoctorPageModeController {
     @PostMapping("/saveDoctorPageModes")
     @SysLogger("saveDoctorPageModes")
     @Transactional
-    public RespDTO<Boolean> saveDoctorPageModes(@Valid @RequestBody DoctorPageModeVO doctorPageModeVO) {
-        boolean res = doctorPageModeFacade.saveDoctorPageMode(doctorPageModeVO);
+    public RespDTO<Boolean> saveDoctorPageModes(@Valid @RequestBody DoctorPageModeAllVO doctorPageModeAllVO) {
+        boolean res = doctorPageModeFacade.saveDoctorPageMode(doctorPageModeAllVO);
         return RespDTO.onSuc(res);
     }
 
-    @ApiOperation(value = "获取医生页面结构设置信息[by:wangfeng]", notes = "获取医生页面结构设置信息")
+    @ApiOperation(value = "获取医生页面结构设置信息[by:wangfeng]", notes = "获取医生页面结构设置信息</br>" +
+            "添加四个配置：1：现病史是否默认选择（0不选择）</br>" +
+            "2：其它史是否默认选择（0不选择）</br>" +
+            "3：字体方案（0标准，1较大）</br>" +
+            "4：颜色方案（0黑，1灰）")
     @PostMapping("/getDoctorPageModes")
     @SysLogger("getDoctorPageModes")
     public RespDTO<List<DoctorPageModeDTO>> getDoctorPageModes(@Valid @RequestBody DoctorIdVO doctorIdVO) {

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

@@ -0,0 +1,21 @@
+<?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.DictionaryInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.DictionaryInfo">
+        <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="group_type" property="groupType" />
+        <result column="name" property="name" />
+        <result column="val" property="val" />
+        <result column="return_type" property="returnType" />
+        <result column="order_no" property="orderNo" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

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

@@ -25,6 +25,8 @@
         <result column="show_info" property="showInfo" />
         <result column="joint" property="joint" />
         <result column="formula_code" property="formulaCode" />
+        <result column="spec_flag" property="specFlag" />
+        <result column="sel_flag" property="selFlag" />
         <result column="remark" property="remark" />
     </resultMap>
 

icssman-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -23,6 +23,10 @@ public class MybatisPlusConfigurer {
     @Bean
     public PaginationInterceptor paginationInterceptor() {
         PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+        // 设置请求的页面大于最大页后操作,true调回到首页,false继续请求,默认false
+        //paginationInterceptor.setOverflow(false);
+        // 设置最大单页限制数量,默认500条,-1不受限制
+        //paginationInterceptor.setLimit(500L);
         return paginationInterceptor;
     }
 

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

@@ -44,6 +44,7 @@ public class QuestionDTO {
     private List<QuestionDTO> questionMapping = new ArrayList<>();     //下级标签
     private Integer disType;//诊断类型
     private Integer specFlag;//特殊标记（0：没有标记，1：主诉高亮，2：诱因记录）
+    private Integer selFlag; // 开启默认选中标记(0：不开启，1：开启)
 //    private List<ScaleContentDTO> scale = new ArrayList<>();
     private String remark;//备注
 }

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

@@ -164,6 +164,11 @@ public class QuestionPageDTO implements Serializable {
      */
     private Integer specFlag;
 
+    /**
+     * 开启默认选中标记(0：不开启，1：开启)
+     */
+    private Integer selFlag;
+
     /**
      * 备注
      */

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

@@ -165,6 +165,11 @@ public class QuestionInfo implements Serializable {
      */
     private Integer specFlag;
 
+    /**
+     * 开启默认选中标记(0：不开启，1：开启)
+     */
+    private Integer selFlag;
+
     /**
      * 备注
      */

icssman-service/src/main/java/com/diagbot/entity/wrapper/QuestionWrapper.java

@@ -42,7 +42,8 @@ public class QuestionWrapper implements Serializable {
     private Integer showInfo; //是否显示i
     private String joint;     //标签连接符
     private String formulaCode; //公式编码
-    private Integer specFlag;//特殊标记（0：没有标记，1：主诉高亮，2：诱因记录）
+    private Integer specFlag; //特殊标记（0：没有标记，1：主诉高亮，2：诱因记录）
+    private Integer selFlag; //开启默认选中标记(0：不开启，1：开启)
     private String remark; //备注
     private List<QuestionDetail> questionDetails = new ArrayList<>(); //明细
     private List<QuestionMappingWrapper> questionMappings = new ArrayList<>(); //映射关系

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

@@ -30,6 +30,8 @@
         <result column="show_info" property="showInfo" />
         <result column="joint" property="joint" />
         <result column="formula_code" property="formulaCode" />
+        <result column="spec_flag" property="specFlag" />
+        <result column="sel_flag" property="selFlag" />
         <result column="remark" property="remark" />
     </resultMap>
 

ltapi-service/src/main/java/com/diagbot/web/ConceptDetailController.java

@@ -33,7 +33,7 @@ public class ConceptDetailController {
 
     @ApiOperation(value = "获取提示信息[by:zhaops]",
             notes = "name: 标签名称，必填<br>" +
-                    "type：标签类型（1-症状，5-化验，6-辅检，7-诊断，8-药品，9-药品大类，10-不良反应，11-药品小类，12-化验公表项，22-指标），单选必填<br>" +
+                    "type：标签类型（1-症状，5-化验，6-辅检，7-诊断，8-药品，9-药品大类，10-不良反应，11-药品小类，12-化验公表项，22-指标，25-手术），单选必填<br>" +
                     "titles：提示信息标题列表，数组选填<br>" +
                     "position：1-摘要，2-全文，5-药品说明书，6-不良反应，单选选填")
     @PostMapping("/getConceptDetail")

prec-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDTO.java

@@ -140,17 +140,5 @@ public class GetTopPatientInfoDTO {
      */
 	@ApiModelProperty(value="门诊号")
 	private String recordId;
-	
-//    /**
-//     * 模式分类
-//     */
-//	@ApiModelProperty(value="模式分类")
-//    private Integer modeClassify;
-//
-//    /**
-//     * 模式值
-//     */
-//	@ApiModelProperty(value="模式值")
-//    private Integer modeValue;
-	
+
 }

tran-service/src/main/java/com/diagbot/dto/ConceptDetailDTO.java

@@ -0,0 +1,38 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:提示信息明细
+ * @Author:zhaops
+ * @time: 2019/5/6 16:33
+ */
+@Getter
+@Setter
+public class ConceptDetailDTO {
+    /**
+     * 提示明细标题
+     */
+    private String title;
+
+    /**
+     * 提示明细内容
+     */
+    private String content;
+
+    /**
+     * 纯文本
+     */
+    private String text;
+
+    /**
+     * 是否诊断依据（1-是，0-否）
+     */
+    private Integer isReason;
+
+    /**
+     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示，5-药品说明书，6-不良反应，7-症状描述信息(智能分诊)
+     */
+    private String position;
+}

tran-service/src/main/java/com/diagbot/dto/ConceptIntroduceDTO.java

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:提示信息返回
+ * @Author:zhaops
+ * @time: 2019/5/6 16:32
+ */
+@Getter
+@Setter
+public class ConceptIntroduceDTO {
+    private Long conceptId;
+    private String name;
+    private List<ConceptDetailDTO> details;
+}

tran-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDTO.java

@@ -143,16 +143,4 @@ public class GetTopPatientInfoDTO {
 	@ApiModelProperty(value="门诊号")
 	private String recordId;
 	
-    /**
-     * 模式分类
-     */
-	@ApiModelProperty(value="模式分类")
-    private Integer modeClassify;
-
-    /**
-     * 模式值
-     */
-	@ApiModelProperty(value="模式值")
-    private Integer modeValue;
-	
 }

tran-service/src/main/java/com/diagbot/vo/SaveInquiryToHisVO.java

@@ -2,6 +2,7 @@ package com.diagbot.vo;
 
 import java.util.List;
 
+import com.diagbot.dto.ConceptIntroduceDTO;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -68,6 +69,10 @@ public class SaveInquiryToHisVO {
 	 * 问诊明细
 	 */
     private List<SaveInquiryToHisDetailVO> detailList;
-    
-   
+
+    /**
+     * 一般治疗
+     */
+    private List<ConceptIntroduceDTO> conceptIntroduceDTO;
+
 }