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

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

@@ -100,4 +100,8 @@ mybatis-plus:
 
 ai:
   server:
-    address: http://192.168.2.234:8080
+    address: http://192.168.2.234:8080
+
+treat:
+  server:
+    address: http://192.168.3.112:8080

config-server/src/main/resources/shared/icss-service-pro.yml

@@ -101,3 +101,7 @@ mybatis-plus:
 ai:
   server:
     address: http://192.168.2.234:8080
+
+treat:
+  server:
+    address: http://192.168.3.112:8080

config-server/src/main/resources/shared/icss-service-test.yml

@@ -100,4 +100,8 @@ mybatis-plus:
 
 ai:
   server:
-    address: http://192.168.2.234:8080
+    address: http://192.168.2.234:8080
+
+treat:
+  server:
+    address: http://192.168.3.112:8080

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

@@ -0,0 +1,36 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月18日 下午1:48:52
+ */
+@Getter
+@Setter
+public class DoctorPageModeDTO {
+
+	    private Long id;
+	    /**
+	     * 医生id
+	     */
+	    private Long doctorId;
+
+	    /**
+	     * 模式分类
+	     */
+	    private Integer modeClassify;
+
+	    /**
+	     * 模式值
+	     */
+	    private Integer modeValue;
+
+	    /**
+	     * 备注
+	     */
+	    private String remark;
+}

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

@@ -17,4 +17,6 @@ public class RetrievalDTO {
     private Long questionId;
     //显示类型
     private Integer showType;
+    //Tag名称
+    private String tagName;
 }

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

@@ -6,9 +6,7 @@ import org.springframework.stereotype.Component;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.DisclaimerInformationDTO;
-import com.diagbot.dto.TemplateInfoDTO;
 import com.diagbot.entity.DisclaimerInformation;
-import com.diagbot.entity.VersionDetail;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.service.impl.DisclaimerInformationServiceImpl;

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

@@ -1,19 +1,25 @@
 package com.diagbot.facade;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.DoctorPageModeDTO;
+import com.diagbot.dto.TemplateInfoDTO;
 import com.diagbot.entity.DoctorPageMode;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.DoctorPageModeServiceImpl;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.vo.DoctorIdVO;
 import com.diagbot.vo.DoctorPageModeVO;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.validation.Valid;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @author wangfeng
@@ -34,13 +40,14 @@ public class DoctorPageModeFacade extends DoctorPageModeServiceImpl {
         QueryWrapper<DoctorPageMode> doctorPageModeWrapper = new QueryWrapper<>();
         Map<String, Object> mapAll = new HashMap<>();
         mapAll.put("doctor_id", doctorPageModeVO.getDoctorId());
+        mapAll.put("mode_classify", doctorPageModeVO.getModeClassify());
         mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
         doctorPageModeWrapper.allEq(mapAll);
         DoctorPageMode datas = getOne(doctorPageModeWrapper);
         boolean res = false;
         if (datas != null) {
             UpdateWrapper<DoctorPageMode> doctorPageModeUpdate = new UpdateWrapper<>();
-            doctorPageModeUpdate.allEq(mapAll)
+            doctorPageModeUpdate.eq("id",datas.getId())
                     .set("mode_classify", doctorPageModeVO.getModeClassify())
                     .set("mode_value", doctorPageModeVO.getModeValue())
                     .set("modifier", doctorPageModeVO.getDoctorId().toString())
@@ -66,14 +73,15 @@ public class DoctorPageModeFacade extends DoctorPageModeServiceImpl {
      * @param doctorIdVO
      * @return
      */
-    public DoctorPageMode getDoctorPageMode(@Valid DoctorIdVO doctorIdVO) {
+    public List<DoctorPageModeDTO> getDoctorPageMode(@Valid DoctorIdVO doctorIdVO) {
         QueryWrapper<DoctorPageMode> doctorPageModeWrapper = new QueryWrapper<>();
         Map<String, Object> mapAll = new HashMap<>();
         mapAll.put("doctor_id", doctorIdVO.getDoctorId());
         mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
         doctorPageModeWrapper.allEq(mapAll);
-        DoctorPageMode doctorPageModeData = getOne(doctorPageModeWrapper);
-        return doctorPageModeData;
+        List<DoctorPageMode> doctorPageModeData = list(doctorPageModeWrapper);
+        List<DoctorPageModeDTO> data =  BeanUtil.listCopyTo(doctorPageModeData, DoctorPageModeDTO.class);
+        return data;
     }
 
 }

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

@@ -1,9 +1,11 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.QuestionDTO;
 import com.diagbot.entity.QuestionDetail;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.wrapper.QuestionInfoWrapper;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.QuestionInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.EntityUtil;
@@ -123,4 +125,20 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         }
         return data;
     }
+
+    /**
+     * 获取标签信息
+     *
+     * @return
+     */
+    public Map<Long,QuestionInfo> getQuestionInfos(){
+        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
+        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        List<QuestionInfo> questionInfoList = this.list(questionInfoQueryWrapper);
+        Map<Long,QuestionInfo> map = new HashMap<>();
+        for (QuestionInfo questionInfo:questionInfoList) {
+            map.put(questionInfo.getId(),questionInfo);
+        }
+        return map;
+    }
 }

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

@@ -1,13 +1,14 @@
 package com.diagbot.facade;
 
 import com.diagbot.dto.RetrievalDTO;
+import com.diagbot.entity.QuestionInfo;
 import com.diagbot.service.impl.RetrievalServiceImpl;
-import com.diagbot.util.StringUtil;
 import com.diagbot.vo.RetrievalVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
@@ -17,6 +18,8 @@ import java.util.List;
 @Component
 public class RetrievalFacade extends RetrievalServiceImpl {
 
+    @Autowired
+    QuestionFacade questionFacade;
     /**
      * 获取标签信息
      *
@@ -24,12 +27,13 @@ public class RetrievalFacade extends RetrievalServiceImpl {
      * @return
      */
     public List<RetrievalDTO> getTagInfos(RetrievalVO retrievalVO) {
-        List<RetrievalDTO> data = new ArrayList<>();
-        if (StringUtil.isBlank(retrievalVO.getInputStr())) {
-            data = new ArrayList<>();
-            return data;
+        //获取同义词标签信息
+        List<RetrievalDTO> data = this.getSymptopInfo(retrievalVO);
+        //将标签名放入实体
+        Map<Long, QuestionInfo> map = questionFacade.getQuestionInfos();
+        for (RetrievalDTO retrievalDTO:data) {
+            retrievalDTO.setTagName(map.get(retrievalDTO.getQuestionId()).getTagName());
         }
-        data = this.getSymptopInfo(retrievalVO);
         return data;
     }
 }

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

@@ -48,7 +48,6 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
         mapAll.put("hospital_id", templateInfoVO.getHospitalId());
         mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
         templateInfoQuery.allEq(mapAll).orderByDesc("gmt_create");
-        ;
         List<TemplateInfoDTO> data = new ArrayList<TemplateInfoDTO>();
         List<TemplateInfo> datas = list(templateInfoQuery);
 		/*for(TemplateInfo templateInfo :datas){

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

@@ -1,14 +1,10 @@
 package com.diagbot.web;
 
 
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.DoctorPageMode;
-import com.diagbot.facade.DoctorPageModeFacade;
-import com.diagbot.vo.DoctorIdVO;
-import com.diagbot.vo.DoctorPageModeVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import java.util.List;
+
+import javax.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,7 +12,15 @@ 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 com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DoctorPageModeDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.DoctorPageModeFacade;
+import com.diagbot.vo.DoctorIdVO;
+import com.diagbot.vo.DoctorPageModeVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * <p>
@@ -56,9 +60,9 @@ public class DoctorPageModeController {
     @ApiOperation(value = "获取医生页面结构设置信息[by:wangfeng]", notes = "获取医生页面结构设置信息")
     @PostMapping("/getDoctorPageModes")
     @SysLogger("getDoctorPageModes")
-    public RespDTO<DoctorPageMode> getDoctorPageModes(@Valid @RequestBody DoctorIdVO doctorIdVO) {
+    public RespDTO<List<DoctorPageModeDTO>> getDoctorPageModes(@Valid @RequestBody DoctorIdVO doctorIdVO) {
 
-        DoctorPageMode doctorPageModeData = doctorPageModeFacade.getDoctorPageMode(doctorIdVO);
+    	List<DoctorPageModeDTO> doctorPageModeData = doctorPageModeFacade.getDoctorPageMode(doctorIdVO);
 
         return RespDTO.onSuc(doctorPageModeData);
     }

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

@@ -16,7 +16,7 @@
     </resultMap>
 
     <select id="getSymptopInfo" resultType="com.diagbot.dto.RetrievalDTO">
-        SELECT c.`name`,c.id as question_id,b.show_type FROM icss_retrieval a
+        SELECT a.`name`,c.id as question_id,b.show_type FROM icss_retrieval a
         LEFT JOIN icss_retrieval_mapping b ON a.id = b.retrieval_id
         LEFT JOIN icss_question_info c ON b.question_id = c.id
         WHERE a.is_deleted = 'N' AND b.is_deleted = 'N' AND c.is_deleted = 'N'
@@ -33,7 +33,7 @@
             and c.sex_type in ('3',#{sexType})
         </if>
         UNION
-        SELECT c.`name`,c.id as question_id,b.show_type FROM icss_retrieval a
+        SELECT a.`name`,c.id as question_id,b.show_type FROM icss_retrieval a
         LEFT JOIN icss_retrieval_mapping b ON a.id = b.retrieval_id
         LEFT JOIN icss_question_info c ON b.question_id = c.id
         WHERE a.is_deleted = 'N' AND b.is_deleted = 'N' AND c.is_deleted = 'N'
@@ -50,7 +50,7 @@
             and c.sex_type in ('3',#{sexType})
         </if>
         UNION
-        SELECT c.`name`,c.id as question_id,b.show_type FROM icss_retrieval a
+        SELECT a.`name`,c.id as question_id,b.show_type FROM icss_retrieval a
         LEFT JOIN icss_retrieval_mapping b ON a.id = b.retrieval_id
         LEFT JOIN icss_question_info c ON b.question_id = c.id
         WHERE a.is_deleted = 'N' AND b.is_deleted = 'N' AND c.is_deleted = 'N'

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

@@ -140,7 +140,14 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
      * @return
      */
     public DeptInfo getDeptInfoDetials(GetDeptInfoDetialsVO getDeptInfoDetialsVO) {
-        DeptInfo deptInfo = this.getById(getDeptInfoDetialsVO.getId());
+        QueryWrapper<DeptInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
+                    .eq("id",getDeptInfoDetialsVO.getId());
+        DeptInfo deptInfo = this.getOne(queryWrapper);
+        if(deptInfo == null){
+            throw new CommonException(CommonErrorCode.RPC_ERROR,
+                    "科室信息不存在");
+        }
         return deptInfo;
     }
 }

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

@@ -1,5 +1,14 @@
 package com.diagbot.facade;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,14 +27,6 @@ import com.diagbot.util.UserUtils;
 import com.diagbot.vo.DisclaimerInformationAllVO;
 import com.diagbot.vo.DisclaimerInformationIdVO;
 import com.diagbot.vo.DisclaimerInformationVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @author wangfeng

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

@@ -20,7 +20,6 @@ import com.diagbot.enums.StatusEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.VersionDetailServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.VersionDetailIdVO;

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

@@ -27,7 +27,6 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.VersionDetailServiceImpl;
 import com.diagbot.service.impl.VersionInfoServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;