调整药品、诊断相关代码

daqe-center/src/main/java/com/lantone/daqe/facade/DrugManagementFacade.java

@@ -225,7 +225,22 @@ public class DrugManagementFacade {
         return tempMap.values().stream().collect(Collectors.toList());
     }
 
+    /**
+     *获取药品匹配分页列表
+     *
+     * @param getMatchingDrugPageVO
+     * @Return com.baomidou.mybatisplus.core.metadata.IPage<com.lantone.daqe.dto.GetMatchingDrugPageDTO>
+     */
     public IPage<GetMatchingDrugPageDTO> getMatchingDrugPage(GetMatchingDrugPageVO getMatchingDrugPageVO) {
-        return drugInfoServiceImpl.getBaseMapper().getMatchingDrugPage(getMatchingDrugPageVO);
+
+        List<GetMatchingDrugPageDTO> getMatchingDrugPageDTOList = new ArrayList<>();
+        //数据整理组装
+        IPage<GetMatchingDrugPageDTO> drugPages = drugInfoServiceImpl.getBaseMapper().getMatchingDrugPage(getMatchingDrugPageVO);
+        for(GetMatchingDrugPageDTO drug:drugPages.getRecords()){
+            //目前先按照_切割
+            drug.setForm(drug.getStandard().split("_")[1]);
+            getMatchingDrugPageDTOList.add(drug);
+        }
+        return drugPages.setRecords(getMatchingDrugPageDTOList);
     }
 }

daqe-center/src/main/java/com/lantone/daqe/facade/RegularManagementFacade.java

@@ -135,19 +135,35 @@ public class RegularManagementFacade {
      * @return 是否删除成功
      */
     public Boolean delRegularById(DelRegularByIdVO delRegularByIdVO) {
-        if (regularInfoFacade.getById(delRegularByIdVO.getId()) == null) {
+        Boolean flag = false;
+        for (Long id : delRegularByIdVO.getIds()) {
+            flag = delRegularById(id, delRegularByIdVO.getHospitalId());
+        }
+        return flag;
+    }
+
+    /**
+     *通过id删除正则式
+     *
+     * @param id
+     * @param hospitalId
+     * @Return java.lang.Boolean
+     */
+    private Boolean delRegularById(Long id, Long hospitalId) {
+
+        if (regularInfoFacade.getById(id) == null) {
             Asserts.fail("该正则式不存在！");
         }
-        if (regularInfoFacade.removeById(delRegularByIdVO.getId())) {
+        if (regularInfoFacade.removeById(id)) {
             //删除表字段的实际值与正则式关联关系
             if (regularMappingFacade.update(new UpdateWrapper<RegularMapping>()
-                    .eq("regular_id", delRegularByIdVO.getId())
+                    .eq("regular_id", id)
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .set("is_deleted", IsDeleteEnum.Y.getKey()))) {
                 //删除表字段的正则式校验结果表中的正则式
                 return regularResultFacade.update(new UpdateWrapper<RegularResult>()
-                        .eq(delRegularByIdVO.getHospitalId() != null, "hospital_id", delRegularByIdVO.getHospitalId())
-                        .eq("regular_id", delRegularByIdVO.getId())
+                        .eq(hospitalId != null, "hospital_id", hospitalId)
+                        .eq("regular_id", id)
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
                         .set("is_deleted", IsDeleteEnum.Y.getKey()));
             }

daqe-center/src/main/java/com/lantone/daqe/mapper/DrugInfoMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.daqe.dto.GetMatchingDrugPageDTO;
 import com.lantone.daqe.entity.DrugInfo;
 import com.lantone.daqe.vo.GetMatchingDrugPageVO;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,5 +14,5 @@ import com.lantone.daqe.vo.GetMatchingDrugPageVO;
  */
 public interface DrugInfoMapper extends BaseMapper<DrugInfo> {
 
-    IPage<GetMatchingDrugPageDTO> getMatchingDrugPage(GetMatchingDrugPageVO getMatchingDrugPageVO);
+    IPage<GetMatchingDrugPageDTO> getMatchingDrugPage(@Param("getMatchingDrugPageVO") GetMatchingDrugPageVO getMatchingDrugPageVO);
 }

daqe-center/src/main/java/com/lantone/daqe/vo/DelRegularByIdVO.java

@@ -5,8 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description: 通过id删除正则式-接口入参
@@ -24,8 +25,8 @@ public class DelRegularByIdVO implements Serializable {
     private Long hospitalId;
 
     @ApiModelProperty(value = "主键", required = true)
-    @NotNull(message = "主键不能为空")
-    private Long id;
+    @NotEmpty(message = "主键不能为空")
+    private List<Long> ids;
 
 
 }

daqe-center/src/main/resources/mapper/DiseaseInfoMapper.xml

@@ -24,7 +24,7 @@
             AND id = #{getMatchingDiseasePageVO.id}
         </if>
         <if test="getMatchingDiseasePageVO.name != null and getMatchingDiseasePageVO.name != ''">
-            AND `name` LIKE like CONCAT('%',#{getMatchingDiseasePageVO.name},'%')
+            AND `name` LIKE  CONCAT('%',#{getMatchingDiseasePageVO.name},'%')
         </if>
     </select>
 </mapper>

daqe-center/src/main/resources/mapper/DrugInfoMapper.xml

@@ -2,5 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.daqe.mapper.DrugInfoMapper">
 
-    <select id="getMatchingDrugPage" resultType="com.lantone.daqe.dto.GetMatchingDrugPageDTO"></select>
+    <select id="getMatchingDrugPage" resultType="com.lantone.daqe.dto.GetMatchingDrugPageDTO">
+        SELECT
+            standard,
+            synonym
+        FROM
+        `hos_drug_info`
+        WHERE
+        1=1
+        <if test="getMatchingDrugPageVO.hospitalId != null">
+            hospital_id = #{getMatchingDrugPageVO.hospitalId}
+        </if>
+        <if test="getMatchingDrugPageVO.id != null">
+            AND id = #{getMatchingDrugPageVO.id}
+        </if>
+        <if test="getMatchingDrugPageVO.name != null and getMatchingDrugPageVO.name != ''">
+            AND `name` LIKE CONCAT('%',#{getMatchingDrugPageVO.name},'%')
+        </if>
+
+    </select>
 </mapper>

daqe-center/src/main/resources/mapper/OperationInfoMapper.xml

@@ -24,7 +24,7 @@
             AND id = #{getMatchingOperationVO.id}
         </if>
         <if test="getMatchingOperationVO.name != null and getMatchingOperationVO.name != ''">
-            AND `name` LIKE like CONCAT('%',#{getMatchingOperationVO.name},'%')
+            AND `name` LIKE CONCAT('%',#{getMatchingOperationVO.name},'%')
         </if>
     </select>
 </mapper>