添加化验辅检静态知识

tran-service/src/main/java/com/diagbot/entity/LisInfoForDJ.java

@@ -1,14 +0,0 @@
-package com.diagbot.entity;
-
-import lombok.Getter;
-import lombok.Setter;
-import java.io.Serializable;
-
-@Getter
-@Setter
-public class LisInfoForDJ  implements Serializable {
-
-    private String name;
-    private String type;
-    private String hosCode;
-}

tran-service/src/main/java/com/diagbot/facade/PacsConfigFacade.java

@@ -1,10 +1,13 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.LisConfigDTO;
+import com.diagbot.dto.PacsConfigDTO;
 import com.diagbot.entity.PacsConfig;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.PacsConfigServiceImpl;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.vo.LisPacsInfoForDJVO;
 import org.springframework.stereotype.Component;
 
 import java.util.LinkedHashMap;
@@ -48,4 +51,16 @@ public class PacsConfigFacade extends PacsConfigServiceImpl{
         }
         return retMap;
     }
+
+    /**
+     * 根据医院编码、his套餐名查询公表名
+     *
+     * @param lisPacsInfoForDJVO
+     * @return
+     */
+    public List<PacsConfigDTO> getPacsConfigByNamesAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO) {
+
+        List<PacsConfigDTO> datas = getPacsConfigByNameAndHosCode(lisPacsInfoForDJVO);
+        return datas;
+    }
 }

tran-service/src/main/java/com/diagbot/facade/TranLisConfigFacade.java

@@ -9,6 +9,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.LisConfigVO;
 import com.diagbot.vo.LisHospitalCodeVO;
+import com.diagbot.vo.LisPacsInfoForDJVO;
 import org.springframework.stereotype.Component;
 
 import java.util.LinkedHashMap;
@@ -87,4 +88,16 @@ public class TranLisConfigFacade extends TranLisConfigServiceImpl{
 		}
 		return retMap;
 	}
+
+	/**
+	 * 根据医院编码、his套餐名、his项目名查询公表名
+	 *
+	 * @param lisPacsInfoForDJVO
+	 * @return
+	 */
+	public List<LisConfigDTO> getLisConfigByNameAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO) {
+
+		List<LisConfigDTO> datas = getLisConfigByNamesAndHosCode(lisPacsInfoForDJVO);
+		return datas;
+	}
 }

tran-service/src/main/java/com/diagbot/mapper/PacsConfigMapper.java

@@ -1,7 +1,11 @@
 package com.diagbot.mapper;
 
+import com.diagbot.dto.PacsConfigDTO;
 import com.diagbot.entity.PacsConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.LisPacsInfoForDJVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface PacsConfigMapper extends BaseMapper<PacsConfig> {
 
+    public List<PacsConfigDTO> getPacsConfigByNameAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO);
 }

tran-service/src/main/java/com/diagbot/mapper/TranLisConfigMapper.java

@@ -1,13 +1,13 @@
 package com.diagbot.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diagbot.dto.LisConfigDTO;
 import com.diagbot.entity.TranLisConfig;
 import com.diagbot.vo.LisHospitalCodeVO;
+import com.diagbot.vo.LisPacsInfoForDJVO;
 
 import java.util.List;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 /**
  * <p>
  * 套餐字段映射公表 Mapper 接口
@@ -20,4 +20,6 @@ public interface TranLisConfigMapper extends BaseMapper<TranLisConfig> {
 
 	List<LisConfigDTO> getLisConfigByhospitalIds(LisHospitalCodeVO lisHospitalCodeVO);
 
+	List<LisConfigDTO> getLisConfigByNamesAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO);
+
 }

tran-service/src/main/java/com/diagbot/service/PacsConfigService.java

@@ -1,7 +1,11 @@
 package com.diagbot.service;
 
+import com.diagbot.dto.PacsConfigDTO;
 import com.diagbot.entity.PacsConfig;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.LisPacsInfoForDJVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface PacsConfigService extends IService<PacsConfig> {
 
+    public List<PacsConfigDTO> getPacsConfigByNameAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO);
 }

tran-service/src/main/java/com/diagbot/service/TranLisConfigService.java

@@ -1,13 +1,13 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.LisConfigDTO;
 import com.diagbot.entity.TranLisConfig;
 import com.diagbot.vo.LisHospitalCodeVO;
+import com.diagbot.vo.LisPacsInfoForDJVO;
 
 import java.util.List;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-
 /**
  * <p>
  * 套餐字段映射公表 服务类
@@ -20,4 +20,6 @@ public interface TranLisConfigService extends IService<TranLisConfig> {
 	
 	public List<LisConfigDTO> getLisConfigByhospitalId(LisHospitalCodeVO lisHospitalCodeVO);
 
+	public List<LisConfigDTO> getLisConfigByNamesAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO);
+
 }

tran-service/src/main/java/com/diagbot/service/impl/PacsConfigServiceImpl.java

@@ -1,11 +1,16 @@
 package com.diagbot.service.impl;
 
+import com.diagbot.dto.LisConfigDTO;
+import com.diagbot.dto.PacsConfigDTO;
 import com.diagbot.entity.PacsConfig;
 import com.diagbot.mapper.PacsConfigMapper;
 import com.diagbot.service.PacsConfigService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.LisPacsInfoForDJVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 辅检项目公表映射配置表 服务实现类
@@ -17,4 +22,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class PacsConfigServiceImpl extends ServiceImpl<PacsConfigMapper, PacsConfig> implements PacsConfigService {
 
+    @Override
+    public List<PacsConfigDTO> getPacsConfigByNameAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO){
+        return baseMapper.getPacsConfigByNameAndHosCode(lisPacsInfoForDJVO);
+    }
+
 }

tran-service/src/main/java/com/diagbot/service/impl/TranLisConfigServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import java.util.List;
 
+import com.diagbot.vo.LisPacsInfoForDJVO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -27,4 +28,9 @@ public class TranLisConfigServiceImpl extends ServiceImpl<TranLisConfigMapper, T
 		return baseMapper.getLisConfigByhospitalIds(lisHospitalCodeVO);
 	}
 
+	@Override
+	public List<LisConfigDTO> getLisConfigByNamesAndHosCode(LisPacsInfoForDJVO lisPacsInfoForDJVO){
+		return baseMapper.getLisConfigByNamesAndHosCode(lisPacsInfoForDJVO);
+	}
+
 }

tran-service/src/main/java/com/diagbot/vo/LisPacsInfoForDJVO.java

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+import java.io.Serializable;
+
+@Getter
+@Setter
+public class LisPacsInfoForDJVO implements Serializable {
+
+    private String mealName;//套餐名
+    private String itemName;//项目名
+    private int type;//类型 5：化验 6：辅检
+    private String hosCode;//医院编码
+}

tran-service/src/main/java/com/diagbot/web/InquiryInfoController.java

@@ -5,14 +5,10 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.*;
 import com.diagbot.entity.DiseaseIcd;
 import com.diagbot.entity.InputInfo;
-import com.diagbot.entity.LisInfoForDJ;
+import com.diagbot.vo.LisPacsInfoForDJVO;
 import com.diagbot.facade.*;
 import com.diagbot.shaoyifu.entity.NLPInputRemote;
 import com.diagbot.shaoyifu.entity.UrlOut;
-import com.diagbot.shaoyifu.entity.wrapper.InterfaceInfoWrapper;
-import com.diagbot.shaoyifu.response.InterfaceResponse;
-import com.diagbot.shaoyifu.util.HttpApi;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.vo.*;
 import io.swagger.annotations.Api;
@@ -50,7 +46,8 @@ public class InquiryInfoController {
     private InputInfoFacade inputInfoFacade;
     @Autowired
     private TranLisConfigFacade tranLisConfigFacade;
-
+    @Autowired
+    private PacsConfigFacade pacsConfigFacade;
     /**
      * 问诊记录保存
      *
@@ -311,22 +308,26 @@ public class InquiryInfoController {
         return RespDTO.onSuc(inquiryInfoFacade.getExportInquirys(inquiryIds));
     }
 
-    @PostMapping(value = "/getLisInfo")
+    /**
+     * 邵逸夫化验静态知识
+     * type 5：化验 6：辅检
+     * @param lisPacsInfoForDJVO
+     * @return
+     */
+    @PostMapping(value = "/getLisPacsInfo")
     @ResponseBody
-    public String getLisInfo(@RequestBody LisInfoForDJ lisInfoForDJ) {
-
-        LisConfigVO lisConfigVO = new LisConfigVO();
-        lisConfigVO.setHosCode(lisInfoForDJ.getHosCode());
-        ArrayList<String> al = new ArrayList<>();
-        al.add(lisInfoForDJ.getName());
-        lisConfigVO.setUniqueNameList(al);
-        Map<String, List<String>> a  = tranLisConfigFacade.getLisConfigByUniqueNameAndHosCode(lisConfigVO);
-        if(a.isEmpty()){
-            return "无化验信息";
-        }else{
-            List lis = a.get("uniqueNameList");
+    public String getLisInfoForDJ(@RequestBody LisPacsInfoForDJVO lisPacsInfoForDJVO) {
+        String url= "";
+        if(lisPacsInfoForDJVO.getType() == 5) {
+            List<LisConfigDTO> a = tranLisConfigFacade.getLisConfigByNamesAndHosCode(lisPacsInfoForDJVO);
+            url = "http://127.0.0.1:5446/information.html?type=" + lisPacsInfoForDJVO.getType() +
+                    "&position=2" + "&name=" + a.get(0).getUniqueName();
+        }else if (lisPacsInfoForDJVO.getType() == 6){
+            List<PacsConfigDTO> b = pacsConfigFacade.getPacsConfigByNameAndHosCode(lisPacsInfoForDJVO);
+            url = "http://127.0.0.1:5446/information.html?type=" + lisPacsInfoForDJVO.getType() +
+                    "&position=2" + "&name=" + b.get(0).getUniqueName();
         }
-        return null;
+        return url;
     }
 
 }

tran-service/src/main/resources/mapper/PacsConfigMapper.xml

@@ -15,4 +15,14 @@
         <result column="unique_name" property="uniqueName" />
     </resultMap>
 
+    <select id="getPacsConfigByNameAndHosCode" resultType="com.diagbot.dto.PacsConfigDTO">
+        SELECT *
+        FROM tran_pacs_config a WHERE a.is_deleted = 'N'
+        <if test="hosCode!=null">
+            AND hospital_code = #{hosCode}
+        </if>
+        <if test="mealName!=null">
+            AND meal_name = #{mealName}
+        </if>
+    </select>
 </mapper>

tran-service/src/main/resources/mapper/TranLisConfigMapper.xml

@@ -31,4 +31,18 @@
 			</foreach>
 		</if>
 	</select>
+
+	<select id="getLisConfigByNamesAndHosCode" resultType="com.diagbot.dto.LisConfigDTO">
+		SELECT *
+		FROM tran_lis_config a WHERE a.is_deleted = 'N'
+		<if test="hosCode!=null">
+			AND hospital_code = #{hosCode}
+		</if>
+		<if test="mealName!=null">
+			AND meal_name = #{mealName}
+		</if>
+		<if test="itemName!=null">
+			AND item_name = #{itemName}
+		</if>
+	</select>
 </mapper>