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

aipt-service/src/main/java/com/diagbot/client/TranServiceClient.java

@@ -12,7 +12,7 @@ import com.diagbot.client.hystrix.TranServiceHystrix;
 import com.diagbot.dto.GetDiseaseIcdDTO;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.HospitalDeptInfoDTO;
-import com.diagbot.dto.HospitalDeptInfoVO;
+import com.diagbot.vo.HospitalDeptInfoVO;
 import com.diagbot.dto.IndexDataDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.vo.GetDiseaseIcdVO;

aipt-service/src/main/java/com/diagbot/client/hystrix/TranServiceHystrix.java

@@ -13,7 +13,7 @@ import com.diagbot.client.bean.HosCodeVO;
 import com.diagbot.dto.GetDiseaseIcdDTO;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.HospitalDeptInfoDTO;
-import com.diagbot.dto.HospitalDeptInfoVO;
+import com.diagbot.vo.HospitalDeptInfoVO;
 import com.diagbot.dto.IndexDataDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.vo.GetDiseaseIcdVO;

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.dto.HospitalDeptInfoDTO;
-import com.diagbot.dto.HospitalDeptInfoVO;
+import com.diagbot.vo.HospitalDeptInfoVO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.Concept;
 import com.diagbot.enums.IsDeleteEnum;

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

@@ -1,4 +1,4 @@
-package com.diagbot.dto;
+package com.diagbot.vo;
 
 import lombok.Getter;
 import lombok.Setter;

aipt-service/src/main/java/com/diagbot/vo/SearchVo.java

@@ -1,6 +1,7 @@
 package com.diagbot.vo;
 
 import com.diagbot.dto.LisResult;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -14,13 +15,15 @@ import java.util.List;
 @Getter
 @Setter
 public class SearchVo {
-    private int length;
+    @ApiModelProperty(hidden = true)
+    private int length = 10;
+    //外部系统编码 用于返回映射数据，如果sysCode为空或null，则返回kl_standard_info标准名称
+    @ApiModelProperty(hidden = true)
+    private String sysCode = "1";
     private int age;
     private String sex;
     //特征类别
     private String featureType;
-    //外部系统编码 用于返回映射数据，如果sysCode为空或null，则返回kl_standard_info标准名称
-    private String sysCode;
     private String symptom;
     private String past;
     private String other;

config-server/src/main/resources/shared/gateway-service-dev.yml

@@ -112,5 +112,5 @@ server:
   port: 5050
 
 lantone:
-  product: triage,143;icsstt,2
+  product: triagett,143;icsstt,2
 

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

@@ -23,6 +23,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/calc")
 @Api(value = "计算相关API", tags = { "数据服务模式-计算相关API" })
+@SuppressWarnings("unchecked")
 public class CalculateController {
     @Autowired
     CalculateFacade calculateFacade;

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

@@ -23,6 +23,7 @@ import javax.validation.Valid;
 @RestController
 @RequestMapping("/conceptDetail")
 @Api(value = "提示信息相关API", tags = { "数据服务模式-提示信息相关API" })
+@SuppressWarnings("unchecked")
 public class ConceptDetailController {
     @Autowired
     private ConceptDetailFacade conceptDetailFacade;

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

@@ -22,14 +22,14 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/disclaimerInformation")
-@Api(value = "免责申明详情API[by:wangfeng]", tags = { "知识库标准化-免责申明详情API" })
+@Api(value = "免责申明详情API[by:wangfeng]", tags = { "数据服务模式-免责申明详情API" })
 @SuppressWarnings("unchecked")
 public class DisclaimerInformationController {
 
     @Autowired
     DisclaimerInformationFacade disclaimerInformationFacade;
 
-    @ApiOperation(value = "知识库标准化-获取免责申明详情[by:wangfeng]", notes = "获取免责申明详情")
+    @ApiOperation(value = "获取免责申明详情[by:wangfeng]", notes = "获取免责申明详情")
     @PostMapping("/getDisclaimerInformations")
     @SysLogger("getDisclaimerInformations")
     public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations() {

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

@@ -24,6 +24,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/push")
 @Api(value = "推理相关API", tags = { "数据服务模式-推理相关API" })
+@SuppressWarnings("unchecked")
 public class PushController {
     @Autowired
     PushFacade pushFacade;

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

@@ -24,13 +24,13 @@ public class IndexConfigFacade {
     /**
      * 根据疾病Id获取指标配置
      *
-     * @param diseaseId 疾病标签id
+     * @param indexConfigdiseaseNameVO 疾病名称
      * @return
      */
-    public RespDTO<List<IndexConfigDTO>> getindexConfig(IndexConfigdiseaseNameVO indexConfigdiseaseNameVO) {
+    public List<IndexConfigDTO> getindexConfig(IndexConfigdiseaseNameVO indexConfigdiseaseNameVO) {
     	RespDTO<List<IndexConfigDTO>> indexConfigList = aiptServiceClient.getindexConfigs(indexConfigdiseaseNameVO);
     	RespDTOUtil.respNGDeal(indexConfigList, "获取指标配置数据失败！");
-        return indexConfigList;
+        return indexConfigList.data;
     }
 
 

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

@@ -1,11 +1,13 @@
 package com.diagbot.facade;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
+import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.IndexConfigAndDataDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.IndexDataFindVO;
 import com.diagbot.vo.IndexDataSaveVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 /**
  * @author wangfeng
@@ -16,7 +18,7 @@ import com.diagbot.vo.IndexDataSaveVO;
 public class IndexDataFacade {
 
     @Autowired
-    private IndexConfigFacade indexConfigFacade;
+    AiptServiceClient aiptServiceClient;
 
     /**
      * 根据疾病id和用户id，开始时间和结束时间 查询用户指标数据
@@ -25,44 +27,9 @@ public class IndexDataFacade {
      * @return
      */
     public IndexConfigAndDataDTO getIndexDataAll(IndexDataFindVO indexDataFindVO) {
-
-      /*  Map<String, Object> indexDataMap = new HashMap<>();
-        indexDataMap.put("diseaseId", indexDataFindVO.getDiseaseId());
-        indexDataMap.put("patientId", indexDataFindVO.getPatientId());
-        indexDataMap.put("startTime", indexDataFindVO.getStartTime());
-        indexDataMap.put("endTime", indexDataFindVO.getEndTime());
-        //获取慢病指标数据
-        List<IndexDataDTO> data = this.getIndexDataAll(indexDataMap);
-        List<ItemIndexDTO> list = new ArrayList<ItemIndexDTO>();
-        // 根据公表名分组
-        Map<String, List<IndexDataDTO>> dataMap = data.stream()
-                .collect(Collectors.groupingBy(IndexDataDTO::getIndexUnique));
-
-        for (String key : dataMap.keySet()) {
-            ItemIndexDTO itemIndexDTO = new ItemIndexDTO();
-            itemIndexDTO.setItemName(key);
-            List<String> indexUnits = new ArrayList<String>();
-            List<String> indexValues = new ArrayList<String>();
-            List<Integer> isAbnormals = new ArrayList<Integer>();
-            List<Date> creatTimes = new ArrayList<Date>();
-            List<IndexDataDTO> indexDatas = dataMap.get(key);
-            for (IndexDataDTO indexDataDTO : indexDatas) {
-                indexUnits.add(indexDataDTO.getIndexUnit());
-                indexValues.add(indexDataDTO.getIndexValue());
-                isAbnormals.add(indexDataDTO.getIsAbnormal());
-                creatTimes.add(indexDataDTO.getCreatTime());
-            }
-            itemIndexDTO.setIndexUnit(indexUnits);
-            itemIndexDTO.setIndexValue(indexValues);
-            itemIndexDTO.setIsAbnormal(isAbnormals);
-            itemIndexDTO.setCreatTime(creatTimes);
-            list.add(itemIndexDTO);
-
-        }
-        IndexConfigAndDataDTO indexsData = new IndexConfigAndDataDTO();
-        indexsData.setIndexConfigData(indexConfigFacade.getindexConfig(indexDataFindVO.getDiseaseId()));
-        indexsData.setItemIndexData(list);*/
-        return null;
+        RespDTO<IndexConfigAndDataDTO> dataList = aiptServiceClient.getIndexDatas(indexDataFindVO);
+        RespDTOUtil.respNGDeal(dataList, dataList.msg);
+        return dataList.data;
     }
 
     /**
@@ -71,54 +38,9 @@ public class IndexDataFacade {
      * @param indexDataSaveVO
      * @return
      */
-    public boolean saveIndexDatas(IndexDataSaveVO indexDataSaveVO) {
-      /*  boolean res = false;
-        if (null != indexDataSaveVO && ListUtil.isNotEmpty(indexDataSaveVO.getIndexData())) {
-        	IndexConfigdiseaseNameVO IndexConfigdiseaseNameVO = new IndexConfigdiseaseNameVO();
-            //获取所有需要记录的指标项
-           List<IndexConfigDTO> data = indexConfigFacade.getindexConfig(IndexConfigdiseaseNameVO);
-            List<String> indexUniquelist
-                    = data.stream().map(i -> i.getIndexUnique()).collect(Collectors.toList());
-
-            // 先查询该用户相同就诊号所保留的数据，将其删除
-            UpdateWrapper<IndexData> IndexDataUpdate = new UpdateWrapper<>();
-            Map<String, Object> mapAll = new HashMap<>();
-            mapAll.put("inquiry_code", indexDataSaveVO.getInquiryCode());
-            mapAll.put("patient_id", indexDataSaveVO.getPatientId());
-            IndexDataUpdate.allEq(mapAll).eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .set("is_deleted", IsDeleteEnum.Y.getKey())
-                    // .set("modifier",UserUtils.getCurrentPrincipleID())
-                    .set("gmt_modified", DateUtil.now());
-            res = update(new IndexData(), IndexDataUpdate);
-
-            // 遍历数据进行保存
-            List<IndexData> IndexDataList = new ArrayList<IndexData>();
-            List<IndexDataVO> indexDatas = indexDataSaveVO.getIndexData();
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            for (IndexDataVO indexDataNew : indexDatas) {
-                if (indexUniquelist.contains(indexDataNew.getIndexUnique())) {
-                    IndexData indexData = new IndexData();
-                    indexData.setCreator(indexDataSaveVO.getDoctorId().toString());
-                    indexData.setGmtCreate(DateUtil.now());
-                    indexData.setIndexUnique(indexDataNew.getIndexUnique());
-                    try {
-                        indexData.setCreatTime(sdf.parse(indexDataNew.getCreatTime()));
-                    } catch (ParseException e) {
-                        throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
-                    }
-                    indexData.setIndexUnit(indexDataNew.getIndexUnit());
-                    indexData.setIndexValue(indexDataNew.getIndexValue());
-                    indexData.setInquiryCode(indexDataSaveVO.getInquiryCode());
-                    indexData.setIsAbnormal(indexDataNew.getIsAbnormal());
-                    indexData.setPatientId(indexDataSaveVO.getPatientId());
-                    IndexDataList.add(indexData);
-                }
-            }
-            if (ListUtil.isNotEmpty(IndexDataList)) {
-                res = insertIndexDataList(IndexDataList);
-            }
-
-        }*/
-        return false;
-    }
+    public Boolean saveIndexDatas(IndexDataSaveVO indexDataSaveVO) {
+        RespDTO<Boolean> data = aiptServiceClient.saveIndexDatas(indexDataSaveVO);
+        RespDTOUtil.respNGDeal(data, data.msg);
+        return data.data;
     }
+}

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

@@ -19,8 +19,8 @@ public class IndexDataFindVO {
 	/**
 	 * 疾病ID
 	 */
-	@NotNull(message = "请输入疾病id")
-	private Long diseaseId;
+	@NotNull(message = "请输入疾病名")
+	private String diseaseName;
 	/**
 	 * 患者id
 	 */

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

@@ -1,22 +1,20 @@
 package com.diagbot.web;
 
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-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;
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.IndexConfigDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.IndexConfigFacade;
 import com.diagbot.vo.IndexConfigdiseaseNameVO;
-
 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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 /**
  * <p>
@@ -39,7 +37,7 @@ public class IndexConfigController {
     @PostMapping("/getindexConfigs")
     @SysLogger("getindexConfigs")
     public RespDTO<List<IndexConfigDTO>> getindexConfigs(@RequestBody IndexConfigdiseaseNameVO indexConfigdiseaseNameVO) {
-    	return indexConfigFacade.getindexConfig(indexConfigdiseaseNameVO);
-     
+        return RespDTO.onSuc(indexConfigFacade.getindexConfig(indexConfigdiseaseNameVO));
+
     }
 }

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

@@ -1,24 +1,21 @@
 package com.diagbot.web;
 
-import javax.validation.Valid;
-
-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;
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.IndexConfigAndDataDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.IndexDataFacade;
 import com.diagbot.vo.IndexDataFindVO;
 import com.diagbot.vo.IndexDataSaveVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import springfox.documentation.annotations.ApiIgnore;
+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;
+
+import javax.validation.Valid;
 
 /**
  * <p>
@@ -38,12 +35,11 @@ public class IndexDataController {
     @Autowired
     IndexDataFacade indexDataFacade;
 
-    @ApiOperation(value = "知识库标准化-根据疾病Id获取指标数据[by:wangfeng]", notes = "diseaseId：疾病Id 必填<br> patientId:患者id ,必填<br> startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
+    @ApiOperation(value = "知识库标准化-根据疾病获取指标数据[by:wangfeng]", notes = "diseaseName：疾病名 必填<br> patientId:患者id ,必填<br> startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
     @PostMapping("/getIndexDatas")
     @SysLogger("getIndexDatas")
     public RespDTO<IndexConfigAndDataDTO> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
-    	IndexConfigAndDataDTO data = indexDataFacade.getIndexDataAll(indexDataFindVO);
-        return RespDTO.onSuc(data);
+        return RespDTO.onSuc(indexDataFacade.getIndexDataAll(indexDataFindVO));
     }
 
     @ApiOperation(value = "知识库标准化-保存指标数据[by:wangfeng]", notes = "patientId : 患者id 必填<br> inquiryCode ：就诊号  必填<br> doctorId：医生id必填<br> IndexData：{指标公表名 :indexUnique;指标值indexValue;指标单位 indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
@@ -51,8 +47,7 @@ public class IndexDataController {
     @SysLogger("saveIndexDatas")
     @Transactional
     public RespDTO<Boolean> saveIndexDatas(@Valid @RequestBody IndexDataSaveVO indexDataSaveVO) {
-        boolean res = indexDataFacade.saveIndexDatas(indexDataSaveVO);
-        return RespDTO.onSuc(res);
+        return RespDTO.onSuc(indexDataFacade.saveIndexDatas(indexDataSaveVO));
     }
 
 }

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

@@ -1,27 +0,0 @@
-package com.diagbot.dto;
-
-import com.diagbot.entity.DeptInfo;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2018/11/19 18:56
- */
-@Getter
-@Setter
-public class DeptInfoDTO extends DeptInfo {
-
-    /**
-     * 归属类型和类型名称
-     */
-    private List<QuestionTypeDTO> typeDTOList;
-
-    /**
-     * 常用标签
-     */
-    private List<GetQuestionUsualAndTypeDTO> questionUsuals;
-}

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

@@ -1,39 +0,0 @@
-package com.diagbot.dto;
-
-import java.util.Date;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2019年3月26日 下午7:25:56
- */
-@Setter
-@Getter
-public class EvaluationModuleAllDTO {
-	private Long id;
-
-	/**
-	 * 区域名
-	 */
-	private String regionName;
-
-	/**
-	 * 区域类型
-	 */
-	private String regionType;
-
-	/**
-	 * 区域顺序
-	 */
-	private Integer orderNo;
-
-	/**
-	 * 疾病id
-	 */
-	private Long diseaseId;
-	
-}

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

@@ -1,61 +0,0 @@
-package com.diagbot.dto;
-
-import java.util.Date;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2019年3月25日 下午2:53:25
- */
-@Setter
-@Getter
-public class EvaluationModuleMappingDTO {
-
-	private Long id;
-
-	/**
-	 * 记录创建时间
-	 */
-	private Date gmtCreate;
-
-	/**
-	 * 记录修改时间,如果时间是1970年则表示纪录未修改
-	 */
-	private Date gmtModified;
-
-	/**
-	 * 创建人，0表示无创建人值
-	 */
-	private String creator;
-
-	/**
-	 * 修改人,如果为0则表示纪录未修改
-	 */
-	private String modifier;
-
-	/**
-	 * 区域名
-	 */
-	private String regionName;
-
-	/**
-	 * 区域类型
-	 */
-	private String regionType;
-
-	/**
-	 * 区域顺序
-	 */
-	private Integer orderNo;
-
-	/**
-	 * 疾病id
-	 */
-	private Long diseaseId;
-	
-	private String diseaseName;
-}

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

@@ -1,27 +0,0 @@
-/**
- * 
- */
-package com.diagbot.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description
- * @author rgb
- * @time 2018年12月19日下午2:06:21
- */
-@ApiModel(value="获取所有科室接口出参")
-@Getter
-@Setter
-public class GetAllDeptsDTO {
-	
-	/**
-	 * 科室名称
-	 */
-	@ApiModelProperty(value="科室名称")
-	private String name;
-
-}

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

@@ -1,31 +0,0 @@
-package com.diagbot.dto;
-
-import com.diagbot.entity.DeptInfo;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2018/12/14 15:24
- */
-@Getter
-@Setter
-public class GetDeptInfoDTO extends DeptInfo {
-
-    /**
-     * 操作人姓名
-     */
-    private String userName;
-
-    /**
-     * 归属类型
-     */
-    private Integer type;
-
-    /**
-     * 归属类型名称
-     */
-    private String typeName;
-
-}

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

@@ -1,18 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2019/4/2 11:39
- */
-@Getter
-@Setter
-public class GetDeptNameDTO {
-    //科室id
-    private Long id;
-    //科室名称
-    private String name;
-}

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

@@ -1,32 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2019/4/1 16:12
- */
-@Getter
-@Setter
-public class GetDisScaleAllInfoDTO{
-    //id
-    private Long id;
-    //记录修改时间,如果时间是1970年则表示纪录未修改
-    private Date gmtModified;
-    //诊断id
-    private String disId;
-    //删除id
-    private String delId;
-    //修改人
-    private String modifier;
-    //诊断名称
-    private String disName;
-    //量表名称
-    private String scaleName;
-    //操作人名称
-    private String userName;
-}

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

@@ -1,32 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2019/4/25 16:16
- */
-@Getter
-@Setter
-public class GetDisScaleByDisIdDTO {
-    //id
-    private Long id;
-    //记录修改时间,如果时间是1970年则表示纪录未修改
-    private Date gmtModified;
-    //诊断id
-    private Long disId;
-    //删除id
-    private Long scaleId;
-    //修改人
-    private String modifier;
-    //诊断名称
-    private String disName;
-    //量表名称
-    private String scaleName;
-    //操作人名称
-    private String userName;
-}

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

@@ -1,19 +0,0 @@
-package com.diagbot.dto;
-
-import com.diagbot.entity.QuestionUsual;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2019/3/7 16:13
- */
-@Getter
-@Setter
-public class GetQuestionUsualAndTypeDTO extends QuestionUsual {
-    /**
-     * 标签类型
-     */
-    private Integer type;
-}

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

@@ -1,54 +0,0 @@
-/**
- * 
- */
-package com.diagbot.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description
- * @author rgb
- * @time 2018年12月5日下午5:00:34
- */
-@ApiModel(value="根据标签获取同义词接口出参")
-@Getter
-@Setter
-public class GetRetrievalsByTagDTO {
-	
-	/**
-	 * 同义词id
-	 */
-	@ApiModelProperty(value="同义词id")
-	private Long retrievalId;
-	
-	/**
-	 * 同义词映射id
-	 */
-	@ApiModelProperty(value="同义词映射id")
-	private Long retrievalMappingId;
-	
-	/**
-	 * 同义词名称
-	 */
-	@ApiModelProperty(value="同义词名称")
-	private String retrievalName;
-	
-	/**
-	 * 同义词拼音
-	 */
-	@ApiModelProperty(value="同义词拼音")
-	private String retrievalSpell;
-	
-	/**
-	 * 同义词种类,1：本体，2：同义词3：组合项目(生命体征-脉搏)
-	 */
-	@ApiModelProperty(value="同义词种类,1：本体，2：同义词3：组合项目(生命体征-脉搏)")
-	private Integer retrievalType;
-	
-	
-	
-
-}

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

@@ -1,64 +0,0 @@
-package com.diagbot.dto;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2019年3月26日 上午11:16:17
- */
-@Setter
-@Getter
-public class IndexConfigAllDTO {
-	@TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 指标公表名
-     */
-    private String indexUnique;
-
-    /**
-     * 疾病id
-     */
-    private Long diseaseId;
-
-    /**
-     * 指标描述
-     */
-    private Integer indexDesc;
-
-    /**
-     * 显示顺序
-     */
-    private Integer orderNo;
-}

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

@@ -1,47 +0,0 @@
-package com.diagbot.dto;
-
-import java.util.Date;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2019年3月26日 上午10:00:35
- */
-@Setter
-@Getter
-public class IndexConfigDTO {
-	private Long id;
-	 /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-	 * 疾病id
-	 */
-	private Long diseaseId;
-
-	/**
-	 * 疾病id
-	 */
-	private String diseaseName;
-}

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

@@ -1,27 +0,0 @@
-/**
- * 
- */
-package com.diagbot.dto;
-
-import java.util.List;
-
-import com.diagbot.entity.QuestionInfo;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description
- * @author rgb
- * @time 2018年12月19日下午2:06:21
- */
-@SuppressWarnings("serial")
-@ApiModel(value="同义词excel文件导入接口出参")
-@Getter
-@Setter
-public class IndexRevDTO extends QuestionInfo{
-	
-	private String typeName;
-
-}

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

@@ -1,9 +0,0 @@
-package com.diagbot.dto;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/11/16 16:07
- */
-public class IntroduceDTO {
-}

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

@@ -1,26 +0,0 @@
-package com.diagbot.dto;
-
-import com.diagbot.entity.IntroduceDetail;
-import com.diagbot.entity.IntroduceInfo;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/12/11 9:59
- */
-@Getter
-@Setter
-public class IntroducePageDTO extends IntroduceInfo {
-    private String operator;
-    private String operatorName;
-    private Date gmtOperate;
-    private String tagName;
-    private List<QuestionShortDTO> questionList;
-    //private List<QuestionShortDTO> unRelatedQuestionList;
-    private List<IntroduceDetail> details;
-}

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

@@ -42,6 +42,6 @@ public class QuestionDTO {
     private List<QuestionDetail> questionDetailList = new ArrayList<>(); //标签明细表
     private List<QuestionDTO> questionMapping = new ArrayList<>();     //下级标签
     private Integer disType;//诊断类型
-    private List<ScaleContentDTO> scale = new ArrayList<>();
+//    private List<ScaleContentDTO> scale = new ArrayList<>();
     private String remark;//备注
 }

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

@@ -1,23 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2019/3/12 11:29
- */
-@Getter
-@Setter
-public class QuestionTypeDTO {
-    /**
-     * 标签类型
-     */
-    private Integer type;
-
-    /**
-     * 标签名称
-     */
-    private String typeName;
-}

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

@@ -1,24 +0,0 @@
-/**
- * 
- */
-package com.diagbot.dto;
-
-import java.util.List;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description
- * @author rgb
- * @time 2018年12月19日下午2:06:21
- */
-@ApiModel(value="同义词excel文件导入接口出参")
-@Getter
-@Setter
-public class RetrievalExcelImDTO {
-	
-	private List<String> messages;
-
-}

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

@@ -1,68 +0,0 @@
-package com.diagbot.dto;
-
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description
- * @author rgb
- * @time 2018年12月17日上午10:11:39
- */
-@ApiModel(value="获取标签同义词列表接口出参")
-@Getter
-@Setter
-public class RetrievalListDTO {
-	
-	/**
-     * 标签id
-     */
-	@ApiModelProperty(value="标签id")
-    private Long questionId;
-	
-	/**
-	 * 标签名称
-	 */
-	@ApiModelProperty(value="标签名称")
-	private String questionName;
-	
-	/**
-	 * 标签归属
-	 */
-	@ApiModelProperty(value="标签归属")
-	private Integer questionType;
-	
-	/**
-	 * 本体
-	 */
-	@ApiModelProperty(value="本体")
-	private String retrievalSelfName;
-	
-	/**
-	 * 别名
-	 */
-	@ApiModelProperty(value="别名")
-	private String retrievalNames;
-	
-	/**
-	 * 子项
-	 */
-	@ApiModelProperty(value="子项")
-	private String retrievalSonNames;
-	
-    /**
-     * 操作人姓名
-     */
-	@ApiModelProperty(value="操作人姓名")
-    private String operatorName;
-    
-    /**
-     * 操作时间
-     */
-	@ApiModelProperty(value="操作时间")
-    private Date gmtOperate;
-
-}

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

@@ -1,37 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 量表内容表
- * </p>
- *
- * @author zhoutg
- * @since 2019-04-08
- */
-@Getter
-@Setter
-public class ScaleContentDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 内容
-     */
-    private String content;
-
-    /**
-     * 0:文本，1：大数据接口填充
-     */
-    private Integer type;
-
-    /**
-     * 排序号
-     */
-    private Integer orderNo;
-
-}

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

@@ -1,15 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/11/29 15:09
- */
-@Getter
-@Setter
-public class VitalInfoDTO extends QuestionShortDTO{
-    private Integer orderNo;
-}

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

@@ -1,22 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/12/14 14:32
- */
-@Getter
-@Setter
-public class VitalOrderDTO {
-    private String operator;
-    private String operatorName;
-    private Date gmtOperate;
-    List<VitalInfoDTO> vitals;
-    List<QuestionShortDTO> unOrderedVitals;
-}

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

@@ -1,140 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
-import java.io.Serializable;
-
-/**
- * <p>
- * 科室信息表
- * </p>
- *
- * @author zhaops
- * @since 2018-11-22
- */
-@TableName("icss_dept_info")
-public class DeptInfo 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 String name;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "DeptInfo{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", name=" + name +
-                ", remark=" + remark +
-                "}";
-    }
-}

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

@@ -1,160 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 诊断量表映射表
- * </p>
- *
- * @author wangyu
- * @since 2019-04-01
- */
-@TableName("icss_dis_scale")
-public class DisScale 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;
-
-    /**
-     * 诊断标签id
-     */
-    private Long disId;
-
-    /**
-     * 量表标签id
-     */
-    private Long scaleId;
-
-    /**
-     * 排序号
-     */
-    private Integer orderNo;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public Long getDisId() {
-        return disId;
-    }
-
-    public void setDisId(Long disId) {
-        this.disId = disId;
-    }
-    public Long getScaleId() {
-        return scaleId;
-    }
-
-    public void setScaleId(Long scaleId) {
-        this.scaleId = scaleId;
-    }
-    public Integer getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(Integer orderNo) {
-        this.orderNo = orderNo;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "DisScale{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", disId=" + disId +
-        ", scaleId=" + scaleId +
-        ", orderNo=" + orderNo +
-        ", remark=" + remark +
-        "}";
-    }
-}

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

@@ -1,77 +0,0 @@
-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>
- * 诊断类型表
- * </p>
- *
- * @author zhoutg
- * @since 2019-03-28
- */
-@TableName("icss_dis_type")
-@Getter
-@Setter
-public class DisType 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;
-
-    /**
-     * 诊断标签id
-     */
-    private Long disId;
-
-    /**
-     * 父级诊断id
-     */
-    private Long parentId;
-
-    /**
-     * 1：慢病，2：急诊
-     */
-    private Integer type;
-
-    /**
-     * 备注
-     */
-    private String remark;
-}

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

@@ -1,167 +0,0 @@
-package com.diagbot.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-/**
- * <p>
- * 管理与评估模板表
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-25
- */
-@TableName("icss_evaluation_module_mapping")
-public class EvaluationModuleMapping 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 String regionName;
-
-    /**
-     * 区域类型（0默认自定义，1大数据，2内部数据）
-     */
-    private String regionType;
-
-    /**
-     * 区域顺序
-     */
-    private Integer orderNo;
-
-    /**
-     * 疾病id
-     */
-    private Long diseaseId;
-
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public String getRegionName() {
-        return regionName;
-    }
-
-    public void setRegionName(String regionName) {
-        this.regionName = regionName;
-    }
-    public String getRegionType() {
-        return regionType;
-    }
-
-    public void setRegionType(String regionType) {
-        this.regionType = regionType;
-    }
-    public Integer getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(Integer orderNo) {
-        this.orderNo = orderNo;
-    }
-    public Long getDiseaseId() {
-        return diseaseId;
-    }
-
-    public void setDiseaseId(Long diseaseId) {
-        this.diseaseId = diseaseId;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "EvaluationModuleMapping{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", regionName=" + regionName +
-        ", regionType=" + regionType +
-        ", orderNo=" + orderNo +
-        ", diseaseId=" + diseaseId +
-        ", remark=" + remark +
-        "}";
-    }
-}

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

@@ -1,171 +0,0 @@
-package com.diagbot.entity;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-/**
- * <p>
- * 指标配置
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-25
- */
-@TableName("icss_index_config")
-public class IndexConfig 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 String indexUnique;
-
-    /**
-     * 疾病id
-     */
-    private Long diseaseId;
-
-    /**
-     * 指标描述
-     */
-    private Integer indexDesc;
-
-    /**
-     * 显示顺序
-     */
-    private Integer orderNo;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public String getIndexUnique() {
-        return indexUnique;
-    }
-
-    public void setIndexUnique(String indexUnique) {
-        this.indexUnique = indexUnique;
-    }
-    public Long getDiseaseId() {
-        return diseaseId;
-    }
-
-    public void setDiseaseId(Long diseaseId) {
-        this.diseaseId = diseaseId;
-    }
-    public Integer getIndexDesc() {
-        return indexDesc;
-    }
-
-    public void setIndexDesc(Integer indexDesc) {
-        this.indexDesc = indexDesc;
-    }
-    public Integer getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(Integer orderNo) {
-        this.orderNo = orderNo;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "IndexConfig{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", indexUnique=" + indexUnique +
-        ", diseaseId=" + diseaseId +
-        ", indexDesc=" + indexDesc +
-        ", orderNo=" + orderNo +
-        ", remark=" + remark +
-        "}";
-    }
-}

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

@@ -1,210 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
-import java.io.Serializable;
-
-/**
- * <p>
- * 提示信息明细
- * </p>
- *
- * @author zhaops
- * @since 2018-11-16
- */
-@TableName("icss_introduce_detail")
-public class IntroduceDetail 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;
-
-    /**
-     * 提示信息id
-     */
-    private Long introduceId;
-
-    /**
-     * 提示明细标题
-     */
-    private String title;
-
-    /**
-     * 提示明细内容
-     */
-    private String content;
-
-    /**
-     * 提示明细内容-纯文本
-     */
-    private String text;
-
-    /**
-     * 提示明细序号
-     */
-    private Integer orderNo;
-
-    /**
-     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示，5-药品说明书，6-指标说明
-     */
-    private String position;
-
-    /**
-     * 是否诊断依据（1-是，0-否）
-     */
-    private Integer isReason;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public Long getIntroduceId() {
-        return introduceId;
-    }
-
-    public void setIntroduceId(Long introduceId) {
-        this.introduceId = introduceId;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public Integer getOrderNo() {
-        return orderNo;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public void setOrderNo(Integer orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    public String getPosition() {
-        return position;
-    }
-
-    public void setPosition(String position) {
-        this.position = position;
-    }
-
-    public Integer getIsReason() {
-        return isReason;
-    }
-
-    public void setIsReason(Integer isReason) {
-        this.isReason = isReason;
-    }
-
-    @Override
-    public String toString() {
-        return "IntroduceDetail{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", introduceId=" + introduceId +
-                ", title=" + title +
-                ", content=" + content +
-                ", text=" + text +
-                ", orderNo=" + orderNo +
-                ", position=" + position +
-                ", is_reason=" + isReason +
-                "}";
-    }
-}

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

@@ -1,133 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
-import java.io.Serializable;
-
-/**
- * <p>
- * 提示信息
- * </p>
- *
- * @author zhaops
- * @since 2018-11-16
- */
-@TableName("icss_introduce_info")
-public class IntroduceInfo 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 String name;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "IntroduceInfo{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", name=" + name +
-        ", remark=" + remark +
-        "}";
-    }
-}

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

@@ -1,156 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
-import java.io.Serializable;
-
-/**
- * <p>
- * 标签与提示信息映射表
- * </p>
- *
- * @author zhaops
- * @since 2018-11-16
- */
-@TableName("icss_introduce_map")
-public class IntroduceMap 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;
-
-    /**
-     * 标签id
-     */
-    private Long questionId;
-
-    /**
-     * 提示信息id
-     */
-    private Long introduceId;
-
-    /**
-     * 类型（参照icss_question_info）
-     */
-    private Integer type;
-
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public Long getQuestionId() {
-        return questionId;
-    }
-
-    public void setQuestionId(Long questionId) {
-        this.questionId = questionId;
-    }
-    public Long getIntroduceId() {
-        return introduceId;
-    }
-
-    public void setIntroduceId(Long introduceId) {
-        this.introduceId = introduceId;
-    }
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "IntroduceMap{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", questionId=" + questionId +
-        ", introduceId=" + introduceId +
-        ", type=" + type +
-        ", remark=" + remark +
-        "}";
-    }
-}

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

@@ -1,134 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 模板科室映射表
- * </p>
- *
- * @author wangyu
- * @since 2019-03-15
- */
-@TableName("icss_module_dept_mapping")
-public class ModuleDeptMapping 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;
-
-    /**
-     * 科室id
-     */
-    private Long deptId;
-
-    /**
-     * 模板id
-     */
-    private Long moduleId;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-    public Long getModuleId() {
-        return moduleId;
-    }
-
-    public void setModuleId(Long moduleId) {
-        this.moduleId = moduleId;
-    }
-
-    @Override
-    public String toString() {
-        return "ModuleDeptMapping{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", deptId=" + deptId +
-        ", moduleId=" + moduleId +
-        "}";
-    }
-}

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

@@ -1,134 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 模板疾病映射表
- * </p>
- *
- * @author wangyu
- * @since 2019-03-15
- */
-@TableName("icss_module_disease_mapping")
-public class ModuleDiseaseMapping 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;
-
-    /**
-     * 科室id
-     */
-    private Long disId;
-
-    /**
-     * 模板id
-     */
-    private Long moduleId;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public Long getDisId() {
-        return disId;
-    }
-
-    public void setDisId(Long disId) {
-        this.disId = disId;
-    }
-    public Long getModuleId() {
-        return moduleId;
-    }
-
-    public void setModuleId(Long moduleId) {
-        this.moduleId = moduleId;
-    }
-
-    @Override
-    public String toString() {
-        return "ModuleDiseaseMapping{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", disId=" + disId +
-        ", moduleId=" + moduleId +
-        "}";
-    }
-}

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

@@ -1,161 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 常用标签表
- * </p>
- *
- * @author wangyu
- * @since 2018-12-03
- */
-@TableName("icss_question_usual")
-public class QuestionUsual 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;
-
-    /**
-     * 标签id
-     */
-    private Long questionId;
-
-    /**
-     * 科室id
-     */
-    private Long deptId;
-
-    /**
-     * 排序号
-     */
-    private Long orderNo;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public Long getQuestionId() {
-        return questionId;
-    }
-
-    public void setQuestionId(Long questionId) {
-        this.questionId = questionId;
-    }
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public Long getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(Long orderNo) {
-        this.orderNo = orderNo;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "QuestionUsual{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", questionId=" + questionId +
-        ", deptId=" + deptId +
-        ", orderNo=" + orderNo +
-        ", remark=" + remark +
-        "}";
-    }
-}

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

@@ -1,147 +0,0 @@
-package com.diagbot.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-/**
- * <p>
- * 同义词检索表
- * </p>
- *
- * @author wangyu
- * @since 2018-12-03
- */
-@TableName("icss_retrieval")
-public class Retrieval 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 String name;
-
-    /**
-     * 拼音
-     */
-    private String spell;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getSpell() {
-        return spell;
-    }
-
-    public void setSpell(String spell) {
-        this.spell = spell;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "Retrieval{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", name=" + name +
-        ", spell=" + spell +
-        ", remark=" + remark +
-        "}";
-    }
-}

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

@@ -1,160 +0,0 @@
-package com.diagbot.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-/**
- * <p>
- * 同义词检索映射表
- * </p>
- *
- * @author wangyu
- * @since 2018-12-03
- */
-@TableName("icss_retrieval_mapping")
-public class RetrievalMapping 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;
-
-    /**
-     * 检索id
-     */
-    private Long retrievalId;
-
-    /**
-     * question_id
-     */
-    private Long questionId;
-
-    /**
-     * 显示类型(1：本体，2：同义词3：组合项目(生命体征-脉搏))
-     */
-    private Integer showType;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public Long getRetrievalId() {
-        return retrievalId;
-    }
-
-    public void setRetrievalId(Long retrievalId) {
-        this.retrievalId = retrievalId;
-    }
-    public Long getQuestionId() {
-        return questionId;
-    }
-
-    public void setQuestionId(Long questionId) {
-        this.questionId = questionId;
-    }
-    public Integer getShowType() {
-        return showType;
-    }
-
-    public void setShowType(Integer showType) {
-        this.showType = showType;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "RetrievalMapping{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", retrievalId=" + retrievalId +
-        ", questionId=" + questionId +
-        ", showType=" + showType +
-        ", remark=" + remark +
-        "}";
-    }
-}

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

@@ -1,83 +0,0 @@
-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>
- * 量表内容表
- * </p>
- *
- * @author zhoutg
- * @since 2019-04-08
- */
-@TableName("icss_scale_content")
-@Getter
-@Setter
-public class ScaleContent 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;
-
-    /**
-     * 量表标签id
-     */
-    private Long scaleId;
-
-    /**
-     * 内容
-     */
-    private String content;
-
-    /**
-     * 0:文本，1：大数据接口填充
-     */
-    private Integer type;
-
-    /**
-     * 排序号
-     */
-    private Integer orderNo;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-}

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

@@ -1,140 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
-import java.io.Serializable;
-
-/**
- * <p>
- * 查体全局排序
- * </p>
- *
- * @author zhaops
- * @since 2018-11-22
- */
-@TableName("icss_vital_order")
-public class VitalOrder 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;
-
-    /**
-     * 查体id
-     */
-    private Long questionId;
-
-    /**
-     * 排序号
-     */
-    private Integer orderNo;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public Long getQuestionId() {
-        return questionId;
-    }
-
-    public void setQuestionId(Long questionId) {
-        this.questionId = questionId;
-    }
-
-    public Integer getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(Integer orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    @Override
-    public String toString() {
-        return "VitalOrder{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", questionId=" + questionId +
-                ", orderNo=" + orderNo +
-                "}";
-    }
-}

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

@@ -1,25 +0,0 @@
-package com.diagbot.entity.wrapper;
-
-import com.diagbot.vo.QuestionUsualVO;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2018/12/13 16:24
- */
-@Getter
-@Setter
-public class QuestionUsualWapper extends QuestionUsualVO {
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-}

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

@@ -472,44 +472,6 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         return res;
     }
 
-    //    /**
-    //     * 别名新增标签检索
-    //     *
-    //     * @param questionIndexVO
-    //     * @return
-    //     */
-    //    public List<IndexRevDTO> indexRev(QuestionIndexVO questionIndexVO) {
-    //        Map<String, Object> paramMap = new HashMap<>();
-    //        paramMap.put("age", questionIndexVO.getAge());
-    //        paramMap.put("sexType", questionIndexVO.getSexType());
-    //        paramMap.put("tagName", questionIndexVO.getTagName());
-    //        paramMap.put("type", questionIndexVO.getType());
-    //        paramMap.put("controlType", questionIndexVO.getControlType());
-    //        paramMap.put("notIds", questionIndexVO.getNotIds());
-    //        paramMap.put("tagType", questionIndexVO.getTagType());
-    //        paramMap.put("existName", questionIndexVO.getExistName());
-    //        paramMap.put("notTagType", questionIndexVO.getNotTagType());
-    //        paramMap.put("notControlType", questionIndexVO.getNotControlType());
-    //        List<QuestionInfo> list = this.index(paramMap);
-    //        if (ListUtil.isNotEmpty(list)) {
-    //            Map<Long, Long> couMap = retrievalMappingFacade.getMapCouByQuesIds(list.stream().map(i -> i.getId()).collect(Collectors.toList()));
-    //            list = list.stream().filter(i -> {
-    //                if (couMap.get(i.getId()) != null) {
-    //                    return false;
-    //                }
-    //                return true;
-    //            }).collect(Collectors.toList());
-    //            if (ListUtil.isNotEmpty(list)) {
-    //                List<IndexRevDTO> indexRevDTOList = BeanUtil.listCopyTo(list, IndexRevDTO.class);
-    //                indexRevDTOList.forEach(i -> {
-    //                    i.setTypeName(QuestionTypeEnum.getName(i.getType()));
-    //                });
-    //                return indexRevDTOList;
-    //            }
-    //        }
-    //        return null;
-    //    }
-
     /**
      * 根据主标签id 检索子标签
      *

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

@@ -1,24 +0,0 @@
-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;
-
-    /**
-     * 备注，介绍说明
-     */
-    private String remark;
-
-}

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

@@ -1,21 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2019/4/1 13:25
- */
-@Getter
-@Setter
-public class AddDisScaleInfoVO {
-    @NotNull(message = "请输入诊断标签id")
-    private Long disId;
-    @NotNull(message = "请输入量表标签id")
-    private List<Long> scaleId;
-}

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

@@ -1,79 +0,0 @@
-package com.diagbot.vo;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description
- * @author rgb
- * @time 2018年12月5日下午5:00:52
- */
-@ApiModel(value="添加或者编辑标签同义词接口明细传参")
-@Getter
-@Setter
-public class AddTagRetrievalDetailVO {
-	
-	/**
-     * 标签id
-     */
-	@ApiModelProperty(value="标签id")
-	private Long questionId; 
-	
-	/**
-	 * 标签名称
-	 */
-	@ApiModelProperty(value="标签名称")
-	private String questionName;
-	
-	/**
-	 * 同义词名称
-	 */
-	@ApiModelProperty(value="同义词名称",required=true)
-	@NotBlank(message="同义词名称必传")
-	private String retrievalName;
-	
-	/**
-	 * 同义词拼音
-	 */
-	@ApiModelProperty(value="同义词拼音",required=true)
-	@NotBlank(message="同义词拼音必传")
-	private String retrievalSpell;
-	
-	/**
-	 * 同义词种类
-	 */
-	@ApiModelProperty(value="同义词种类",required=true)
-	@NotNull(message="同义词种类必传")
-	private Integer retrievalType;
-
-	@Override
-	public boolean equals(Object obj) {
-		if(this==obj){
-			return true;
-		}
-		if(obj instanceof AddTagRetrievalDetailVO){
-			AddTagRetrievalDetailVO addTagRetrievalDetailVO = (AddTagRetrievalDetailVO)obj;
-			if(addTagRetrievalDetailVO.getRetrievalName().equals(this.retrievalName)){
-					//&&addTagRetrievalDetailVO.getRetrievalType()==this.retrievalType){
-				return true;
-			}else{
-				return false;
-			}
-		}else{
-			return false;
-		}
-	}
-
-	@Override
-	public int hashCode() {
-		return this.retrievalName.hashCode();
-	}
-	
-	
-	
-}

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

@@ -1,44 +0,0 @@
-package com.diagbot.vo;
-
-import java.util.List;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description
- * @author rgb
- * @time 2018年12月5日下午5:00:52
- */
-@ApiModel(value="添加或者编辑标签同义词接口传参")
-@Getter
-@Setter
-public class AddTagRetrievalVO {
-	
-	/**
-     * 标签id
-     */
-	@ApiModelProperty(value="标签id",required=true)
-	@NotNull(message="标签id必传")
-    private Long questionId;
-	
-	/**
-	 * 标签名称
-	 */
-	@ApiModelProperty(value="标签名称",required=true)
-	@NotBlank(message="标签名称必传")
-	private String questionName;
-	
-	@Valid
-	@ApiModelProperty(value="同义词集合",required=true)
-	@NotEmpty(message="同义词必传")
-	private List<AddTagRetrievalDetailVO> itemList;
-	
-}

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

@@ -1,16 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2019/4/2 9:41
- */
-@Getter
-@Setter
-public class DelDisScaleInfoVO {
-    //诊断关联id
-    private String delId;
-}

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

@@ -1,28 +0,0 @@
-package com.diagbot.vo;
-
-import javax.validation.constraints.NotNull;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description
- * @author rgb
- * @time 2018年12月5日下午5:00:52
- */
-@ApiModel(value="根据标签id删除标签的同义词接口传参")
-@Getter
-@Setter
-public class DelRetrievalsByQuesIdVO {
-	
-	/**
-     * 标签id
-     */
-	@ApiModelProperty(value="标签id",required=true)
-	@NotNull(message="标签id必传")
-    private Long questionId;
-	
-
-}

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

@@ -1,18 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2018/12/5 16:27
- */
-@Getter
-@Setter
-public class DeleteDeptInfoVO {
-    @NotBlank(message = "请输入id")
-    private String id;
-}

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

@@ -1,23 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2018/12/13 17:17
- */
-@Setter
-@Getter
-public class DeleteQuestionUsualVO {
-    /**
-     * 科室id
-     */
-    private Long deptId;
-
-    /**
-     * 标签类型
-     */
-    private Integer type;
-}

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

@@ -1,17 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: ztg
- * @time: 2019/1/28 15:45
- */
-@Getter
-@Setter
-public class DeleteScaleVO {
-    private List<Long> ids;
-}

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

@@ -1,20 +0,0 @@
-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/DisTypeVO.java

@@ -1,33 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 诊断类型表
- * </p>
- *
- * @author zhoutg
- * @since 2019-03-28
- */
-@Getter
-@Setter
-public class DisTypeVO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-//    private Long id;
-//
-//    /**
-//     * 诊断标签id
-//     */
-//    private Long disId;
-
-    /**
-     * 0:普通病，1：慢病，2：急诊
-     */
-    private Integer type;
-}

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

@@ -1,17 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2019年4月9日 下午4:42:06
- */
-@Setter
-@Getter
-public class DiseaseNameVO {
-
-	private String  diseaseName;
-}

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

@@ -1,23 +0,0 @@
-package com.diagbot.vo;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2019年3月11日 下午6:12:02
- */
-@Setter
-@Getter
-public class EvaluationDiseaseIdVO {
-
-	/**
-	 * 疾病ID
-	 */
-	@NotNull(message = "请输入疾病id")
-	private Long diseaseId; 
-}

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

@@ -1,22 +0,0 @@
-package com.diagbot.vo;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2019年3月26日 下午7:16:51
- */
-@Setter
-@Getter
-public class EvaluationModuleDiseaseIdVO {
-	/**
-	 * 疾病ID
-	 */
-	@NotNull(message = "请输入疾病id")
-	private Long diseaseId;
-}

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

@@ -1,20 +0,0 @@
-package com.diagbot.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2019年3月25日 下午2:57:59
- */
-@Setter
-@Getter
-public class EvaluationModuleDiseaseNameVO extends Page{
-
-	private static final long serialVersionUID = 1L;
-	private String  diseaseName;
-}

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

@@ -1,24 +0,0 @@
-package com.diagbot.vo;
-
-import java.util.List;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2019年3月26日 下午7:21:44
- */
-@Setter
-@Getter
-public class EvaluationModuleListVO {
-
-	@NotNull(message = "请输入疾病id")
-	private Long diseaseId;
-	
-	private List<EvaluationModuleVO> evaluationModuleData;
-}

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

@@ -1,40 +0,0 @@
-package com.diagbot.vo;
-
-import java.util.List;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2019年3月26日 下午7:19:14
- */
-@Setter
-@Getter
-public class EvaluationModuleVO {
-
-	
-	/**
-     * 区域名
-     */
-    private String regionName;
-
-    /**
-     * 区域类型（0默认自定义，1大数据，2内部数据）
-     */
-    private String regionType;
-
-    /**
-     * 区域顺序
-     */
-    private Integer orderNo;
-
-    /**
-     * 疾病id
-     */
-    private Long diseaseId;
-
-    private String remark;
-}

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

@@ -1,25 +0,0 @@
-package com.diagbot.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description
- * @author rgb
- * @time 2018年12月5日下午5:00:52
- */
-@ApiModel(value="获取所有科室接口传参")
-@Getter
-@Setter
-public class GetAllDeptsVO {
-	
-	/**
-	 * 科室名称
-	 */
-	@ApiModelProperty(value="科室名称")
-	private String name;
-
-
-}

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

@@ -1,18 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2018/12/14 9:57
- */
-@Getter
-@Setter
-public class GetDeptInfoDetialsVO {
-    @NotNull(message = "请输入科室id")
-    private String id;
-}

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

@@ -1,17 +0,0 @@
-package com.diagbot.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2018/12/6 15:46
- */
-@Getter
-@Setter
-public class GetDeptInfoVO extends Page {
-
-    private String name;
-}

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

@@ -1,20 +0,0 @@
-package com.diagbot.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2019/4/1 16:14
- */
-@Getter
-@Setter
-public class GetDisScaleAllInfoVO extends Page {
-    //诊断名称
-    private String disName;
-    //量表名称
-    private String scaleName;
-
-}

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

@@ -1,18 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2019/4/1 16:57
- */
-@Getter
-@Setter
-public class GetDisScaleByDisIdVO {
-    @NotNull(message="请输入诊断id")
-    private Long disId;
-}

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

@@ -1,16 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2019/3/7 16:14
- */
-@Getter
-@Setter
-public class GetQuestionUsualAndTypeVO {
-    //标签类型
-    private Integer type;
-}

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

@@ -1,34 +0,0 @@
-package com.diagbot.vo;
-
-import javax.validation.constraints.NotNull;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description
- * @author rgb
- * @time 2018年12月5日下午5:00:52
- */
-@ApiModel(value="根据标签获取同义词接口传参")
-@Getter
-@Setter
-public class GetRetrievalsByTagVO {
-	
-	/**
-     * 标签id
-     */
-	@ApiModelProperty(value="标签id")
-	@NotNull(message="标签id必传")
-    private Long questionId;
-	
-	/**
-	 * 标签名称
-	 */
-	@ApiModelProperty(value="标签名称",required=true)
-	private String questionName;
-
-
-}

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

@@ -1,22 +0,0 @@
-package com.diagbot.vo;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2019年3月11日 下午6:47:34
- */
-@Setter
-@Getter
-public class IndexConfigDiseaseIdVO {
-	/**
-	 * 疾病ID
-	 */
-	@NotNull(message = "请输入疾病id")
-	private Long diseaseId; 
-}

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

@@ -1,19 +0,0 @@
-package com.diagbot.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2019年3月26日 上午10:09:20
- */
-@Setter
-@Getter
-public class IndexConfigDiseaseNameVO extends Page{
-	private static final long serialVersionUID = 1L;
-	private String  diseaseName;
-}

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

@@ -1,24 +0,0 @@
-package com.diagbot.vo;
-
-import java.util.List;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2019年3月26日 下午1:20:18
- */
-@Setter
-@Getter
-public class IndexConfigListVO {
-	
-	@NotNull(message = "请输入疾病id")
-	private Long diseaseId;
-	
-	private List<IndexConfigVO> indexConfigData;
-}

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

@@ -1,39 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2019年3月26日 下午1:21:08
- */
-@Setter
-@Getter
-public class IndexConfigVO {
-	/**
-     * 指标公表名
-     */
-    private String indexUnique;
-
-    /**
-     * 疾病id
-     */
-    private Long diseaseId;
-
-    /**
-     * 指标描述
-     */
-    private Integer indexDesc;
-
-    /**
-     * 显示顺序
-     */
-    private Integer orderNo;
-
-    /**
-     * 备注
-     */
-    private String remark;
-}

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

@@ -1,19 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/1/4 15:43
- */
-@Getter
-@Setter
-public class IntroduceDetailSingleVO extends IntroduceDetailVO {
-    @NotNull(message = "请输入提示信息id")
-    private Long introduceId;
-    private Long id;
-}

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

@@ -1,39 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/11/26 16:47
- */
-@Getter
-@Setter
-public class IntroduceDetailVO {
-    /**
-     * 提示信息
-     */
-    private String content;
-    /**
-     * 提示信息-纯文本
-     */
-    private String text;
-    /**
-     * 标题
-     */
-    private String title;
-    /**
-     * 排序号
-     */
-    private Integer orderNo;
-    /**
-     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示
-     */
-    private String position;
-
-    /**
-     * 是否诊断依据（1-是，0-否）
-     */
-    private Integer isReason;
-}

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

@@ -1,18 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/3/11 10:07
- */
-@Getter
-@Setter
-public class IntroduceIdVO {
-    @NotNull(message = "请输入提示信息id")
-    private Long introduceId;
-}

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

@@ -1,22 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description:标签与提示信息映射关系入参
- * @Author:zhaops
- * @time: 2018/11/16 16:45
- */
-@Getter
-@Setter
-public class IntroduceMapVO {
-    @NotNull(message = "请输入标签id")
-    private Long questionId;
-    //@NotNull(message = "请输入提示信息id")
-    private Long introduceId;
-    @NotNull(message = "请输入标签类型")
-    private Integer type;
-}

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

@@ -1,19 +0,0 @@
-package com.diagbot.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Map;
-
-/**
- * @Description:提示信息分页展示入参
- * @Author:zhaops
- * @time: 2018/11/16 15:50
- */
-@Getter
-@Setter
-public class IntroducePageVO extends Page {
-    String name;
-    String tagName;
-}

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

@@ -1,23 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotBlank;
-import java.util.List;
-
-/**
- * @Description:提示信息保存参数
- * @Author:zhaops
- * @time: 2018/11/16 14:29
- */
-@Getter
-@Setter
-public class IntroduceVO {
-    private Long id;
-    @NotBlank(message = "请输入名称")
-    private String name;
-    private String remark;
-    private List<IntroduceDetailVO> detailVOList;
-    private List<IntroduceMapVO> mapVOList;
-}

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

@@ -12,7 +12,5 @@ import lombok.Setter;
 @Getter
 @Setter
 public class QuestionSaveVO {
-
     private QuestionWrapper questionWrapper; //标签相关
-    private DisTypeVO disTypeVO;  //诊断类型
 }

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

@@ -1,17 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description: 标签文字
- * @Author: ztg
- * @Date: 2018/10/24 16:11
- */
-@Getter
-@Setter
-public class QuestionTextVO {
-
-    private String words; //文字
-    private Integer order; //排序号
-}

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

@@ -1,23 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2018/12/3 17:07
- */
-@Getter
-@Setter
-public class QuestionUsualVO {
-    @NotNull(message = "请输入科室id")
-    private Long deptId;
-    @NotNull(message = "请输入症状id")
-    private List<Long> questionId;
-    @NotNull(message = "请输入标签类型")
-    private Integer type;
-}

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

@@ -1,27 +0,0 @@
-package com.diagbot.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description
- * @author rgb
- * @time 2018年12月17日上午10:08:43
- */
-@ApiModel(value="获取标签同义词列表接口传参")
-@SuppressWarnings({ "serial", "rawtypes" })
-@Getter
-@Setter
-public class RetrievalListVO extends Page {
-	
-	/**
-	 * 标签名称
-	 */
-	@ApiModelProperty(value="标签名称")
-	private String questionName;
-
-}

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

@@ -1,30 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- * 量表内容表
- * </p>
- *
- * @author zhoutg
- * @since 2019-04-08
- */
-@Getter
-@Setter
-public class ScaleContentSaveVO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 量表标签id
-     */
-    private Long scaleId;
-    private List<ScaleContentVO> content = new ArrayList<>();
-
-}

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

@@ -1,43 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 量表内容表
- * </p>
- *
- * @author zhoutg
- * @since 2019-04-08
- */
-@Getter
-@Setter
-public class ScaleContentVO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 内容
-     */
-    private String content;
-
-    /**
-     * 0:文本，1：大数据接口填充
-     */
-    private Integer type;
-
-    /**
-     * 排序号
-     */
-    private Integer orderNo;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-}

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

@@ -1,26 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * @Description: 修改科室信息入参
- * @author: wangyu
- * @time: 2018/12/5 16:17
- */
-@Getter
-@Setter
-public class UpdateDeptInfoVO {
-    @NotBlank(message = "请输入id")
-    private String id;
-    /**
-     * 科室名称
-     */
-    private String name;
-    /**
-     * 备注，介绍说明
-     */
-    private String remark;
-}

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

@@ -1,21 +0,0 @@
-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/vo/VitalIdVO.java

@@ -1,18 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/3/11 10:01
- */
-@Getter
-@Setter
-public class VitalIdVO {
-    @NotNull(message = "请输入查体标签id")
-    private Long vitalId;
-}

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

@@ -1,20 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/11/26 15:26
- */
-@Getter
-@Setter
-public class VitalOrderVO {
-    @NotNull(message = "请输入查体标签ID")
-    private Long vitalId;
-    @NotNull(message = "请输入查体标签排序号")
-    private Integer orderNo;
-}

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

@@ -1,20 +1,8 @@
 package com.diagbot.web;
 
 
-import java.util.List;
-import java.util.Map;
-
-import com.diagbot.vo.QuestionIndexSubVO;
-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;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.IndexRevDTO;
 import com.diagbot.dto.QuestionDTO;
 import com.diagbot.dto.QuestionPageDTO;
 import com.diagbot.dto.RespDTO;
@@ -22,16 +10,24 @@ import com.diagbot.entity.QuestionInfo;
 import com.diagbot.facade.QuestionFacade;
 import com.diagbot.vo.DeleteQuestionVO;
 import com.diagbot.vo.QuestionIdsVO;
+import com.diagbot.vo.QuestionIndexSubVO;
 import com.diagbot.vo.QuestionIndexVO;
 import com.diagbot.vo.QuestionPageVO;
 import com.diagbot.vo.QuestionSaveVO;
 import com.diagbot.vo.QuestionSpecVO;
 import com.diagbot.vo.QuestionVO;
-
 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;
 
 import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -80,20 +76,11 @@ public class QuestionInfoController {
         return RespDTO.onSuc(data);
     }
 
-//    @ApiOperation(value = "别名新增标签检索[by:rengb]",
-//            notes = "")
-//    @PostMapping("/indexRev")
-//    @SysLogger("indexRev")
-//    public RespDTO<List<IndexRevDTO>> indexRev(@RequestBody QuestionIndexVO questionIndexVO) {
-//        List<IndexRevDTO> data = questionFacade.indexRev(questionIndexVO);
-//        return RespDTO.onSuc(data);
-//    }
-
     @ApiOperation(value = "子标签检索[by:zhaops]",
             notes = "")
     @PostMapping("/indexSub")
     @SysLogger("indexSub")
-    public RespDTO<List<QuestionInfo>> indexSub(@RequestBody @Valid  QuestionIndexSubVO questionIndexSubVO) {
+    public RespDTO<List<QuestionInfo>> indexSub(@RequestBody @Valid QuestionIndexSubVO questionIndexSubVO) {
         List<QuestionInfo> data = questionFacade.indexSub(questionIndexSubVO);
         return RespDTO.onSuc(data);
     }