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

src/main/java/com/diagbot/dto/DiagnosesFindDTO.java

@@ -0,0 +1,18 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-29 11:06
+ */
+@Setter
+@Getter
+public class DiagnosesFindDTO {
+
+    private Long conceptId;
+
+    private String conceptName;
+}

src/main/java/com/diagbot/facade/KlDiagnoseFacade.java

@@ -3,6 +3,7 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.DiagnosesFindDTO;
 import com.diagbot.dto.KlDiagnoseByIdDTO;
 import com.diagbot.dto.KlDiagnoseGroupDTO;
 import com.diagbot.dto.KlDiagnoseInfoDTO;
@@ -17,6 +18,7 @@ import com.diagbot.service.impl.KlDiagnoseServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
+import com.diagbot.vo.DiagnosesFindVO;
 import com.diagbot.vo.KlDiagnoseByIdVO;
 import com.diagbot.vo.KlDiagnoseClearVO;
 import com.diagbot.vo.KlDiagnoseDetailVO;
@@ -130,6 +132,7 @@ public class KlDiagnoseFacade extends KlDiagnoseServiceImpl {
         klKlDiagnoseUpdate.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("id", klDiagnoseSatarDisVO.getId())
                 .set("status", start)
+                .set("modifier", klDiagnoseSatarDisVO.getModifier())
                 .set("gmt_modified", now);
         return this.update(new KlDiagnose(), klKlDiagnoseUpdate);
     }
@@ -157,6 +160,7 @@ public class KlDiagnoseFacade extends KlDiagnoseServiceImpl {
                     .eq("id", klDiagnoseSaveVO.getId())
                     .set(StringUtil.isNotBlank(klDiagnoseSaveVO.getDescription()), "description", klDiagnoseSaveVO.getDescription())
                     .set(StringUtil.isNotBlank(klDiagnoseSaveVO.getConceptId().toString()), "concept_id", klDiagnoseSaveVO.getConceptId())
+                    .set("modifier", klDiagnoseSaveVO.getModifier())
                     .set("gmt_modified", now);
             res = this.update(klDiagnoseUpdate);
 
@@ -264,4 +268,8 @@ public class KlDiagnoseFacade extends KlDiagnoseServiceImpl {
         }
         return res;
     }
+
+    public List<DiagnosesFindDTO> findDiaNameAlls(DiagnosesFindVO diagnosesFindVO) {
+        return this.findDiaNameAll(diagnosesFindVO);
+    }
 }

src/main/java/com/diagbot/mapper/KlDiagnoseMapper.java

@@ -2,11 +2,13 @@ package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.DiagnoseDTO;
+import com.diagbot.dto.DiagnosesFindDTO;
 import com.diagbot.dto.KlDiagnoseByIdDTO;
 import com.diagbot.dto.KlDiagnoseInfoDTO;
 import com.diagbot.entity.KlDiagnose;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diagbot.vo.DiagnoseVO;
+import com.diagbot.vo.DiagnosesFindVO;
 import com.diagbot.vo.KlDiagnoseByIdVO;
 import com.diagbot.vo.KlDiagnoseInfoVO;
 
@@ -27,4 +29,6 @@ public interface KlDiagnoseMapper extends BaseMapper<KlDiagnose> {
     IPage<KlDiagnoseInfoDTO> getKlDiagnosePages(KlDiagnoseInfoVO klDiagnoseInfoVO);
 
     List<KlDiagnoseByIdDTO> getByIdDiagnoses(KlDiagnoseByIdVO klDiagnoseByIdVO);
+
+    List<DiagnosesFindDTO> findDiaNameAll(DiagnosesFindVO diagnosesFindVO);
 }

src/main/java/com/diagbot/service/KlDiagnoseService.java

@@ -2,11 +2,13 @@ package com.diagbot.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.DiagnoseDTO;
+import com.diagbot.dto.DiagnosesFindDTO;
 import com.diagbot.dto.KlDiagnoseByIdDTO;
 import com.diagbot.dto.KlDiagnoseInfoDTO;
 import com.diagbot.entity.KlDiagnose;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.vo.DiagnoseVO;
+import com.diagbot.vo.DiagnosesFindVO;
 import com.diagbot.vo.KlDiagnoseByIdVO;
 import com.diagbot.vo.KlDiagnoseInfoVO;
 
@@ -27,4 +29,6 @@ public interface KlDiagnoseService extends IService<KlDiagnose> {
     IPage<KlDiagnoseInfoDTO> getKlDiagnosePages(KlDiagnoseInfoVO klDiagnoseInfoVO);
 
     List<KlDiagnoseByIdDTO> getByIdDiagnoses(KlDiagnoseByIdVO klDiagnoseByIdVO);
+
+    List<DiagnosesFindDTO> findDiaNameAll(DiagnosesFindVO diagnosesFindVO);
 }

src/main/java/com/diagbot/service/impl/KlDiagnoseServiceImpl.java

@@ -2,6 +2,7 @@ package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.DiagnoseDTO;
+import com.diagbot.dto.DiagnosesFindDTO;
 import com.diagbot.dto.KlDiagnoseByIdDTO;
 import com.diagbot.dto.KlDiagnoseInfoDTO;
 import com.diagbot.entity.KlDiagnose;
@@ -9,6 +10,7 @@ import com.diagbot.mapper.KlDiagnoseMapper;
 import com.diagbot.service.KlDiagnoseService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.vo.DiagnoseVO;
+import com.diagbot.vo.DiagnosesFindVO;
 import com.diagbot.vo.KlDiagnoseByIdVO;
 import com.diagbot.vo.KlDiagnoseInfoVO;
 import org.springframework.stereotype.Service;
@@ -39,4 +41,9 @@ public class KlDiagnoseServiceImpl extends ServiceImpl<KlDiagnoseMapper, KlDiagn
     public List<KlDiagnoseByIdDTO> getByIdDiagnoses(KlDiagnoseByIdVO klDiagnoseByIdVO) {
         return baseMapper.getByIdDiagnoses(klDiagnoseByIdVO);
     }
+
+    @Override
+    public List<DiagnosesFindDTO> findDiaNameAll(DiagnosesFindVO diagnosesFindVO) {
+        return baseMapper.findDiaNameAll(diagnosesFindVO);
+    }
 }

src/main/java/com/diagbot/vo/DiagnosesFindVO.java

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-29 11:05
+ */
+@Setter
+@Getter
+public class DiagnosesFindVO {
+    @ApiModelProperty(value="名称")
+    @NotBlank(message = "请输入搜索名称")
+    private String diseaseName;
+}

src/main/java/com/diagbot/web/KlDiagnoseController.java

@@ -2,11 +2,14 @@ package com.diagbot.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DiagnosesFindDTO;
+import com.diagbot.dto.GetAllForRelationDTO;
 import com.diagbot.dto.KlDiagnoseInfoDTO;
 import com.diagbot.dto.KlDiagnoseTypeDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.facade.KlDiagnoseFacade;
+import com.diagbot.vo.DiagnosesFindVO;
 import com.diagbot.vo.KlDiagnoseByIdVO;
 import com.diagbot.vo.KlDiagnoseClearVO;
 import com.diagbot.vo.KlDiagnoseInfoVO;
@@ -80,4 +83,13 @@ public class KlDiagnoseController {
     public RespDTO<Boolean> startKlDiagnoses(@RequestBody @Valid KlDiagnoseSatarDisVO klDiagnoseSatarDisVO) {
         return RespDTO.onSuc(klDiagnoseFacade.disableDiagnose(klDiagnoseSatarDisVO, StatusEnum.Enable.getKey()));
     }
+
+    @ApiOperation(value = "搜索未添加的诊断依据术语名[by:wangfeng]",
+            notes = "diseaseName：疾病医学术语名称 <br>")
+    @PostMapping("/findDiaName")
+    @SysLogger("findDiaName")
+    public RespDTO<List<DiagnosesFindDTO>> findDiaNames(@Valid @RequestBody DiagnosesFindVO diagnosesFindVO) {
+        List<DiagnosesFindDTO> klConcepts = klDiagnoseFacade.findDiaNameAlls(diagnosesFindVO);
+        return RespDTO.onSuc(klConcepts);
+    }
 }

src/main/resources/mapper/KlDiagnoseMapper.xml

@@ -208,5 +208,22 @@
         ) dibas
         ON dibas.basid = dico.diagnose_base_id
     </select>
+    <select id="findDiaNameAll" resultType="com.diagbot.dto.DiagnosesFindDTO">
+        SELECT DISTINCT
+        con.id as conceptId,
+        con.lib_name as conceptName
+        FROM
+        kl_diagnose dia
+        RIGHT JOIN kl_concept con
+        ON dia.concept_id = con.id
+        WHERE con.is_deleted = 'N'
+        AND con.lib_type = 100
+        AND con.status = 1
+        AND dia.`concept_id` IS NULL
+        <if test="diseaseName != null and diseaseName != ''">
+            AND UPPER(con.lib_name) LIKE CONCAT('%', UPPER(trim(#{diseaseName})), '%')
+        </if>
+        ORDER BY con.lib_name DESC
+    </select>
 
 </mapper>