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

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/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/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;