From 5c02263e1dee4960eb81757dc6b13f2e2d6cadb6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 11 十二月 2024 22:59:31 +0800
Subject: [PATCH] zjh202412011
---
ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethodService.java | 116 +++++++++++++++++++++++++++++++++++---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjRulesService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java | 10 ++
ltkj-hosp/src/main/resources/mapper/hosp/TjRulesMapper.xml | 15 +++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 4
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java | 8 +-
6 files changed, 135 insertions(+), 20 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethodService.java
index 5ef2e15..0644767 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethodService.java
@@ -16,6 +16,7 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -252,17 +253,110 @@
}
- //3.9绉戝淇℃伅鎺ㄩ��
-// public AjaxResult getShouFeiXm (String queryString,String bianGengSj,int pageIndex,int pageSize ) {
-// Map<String, Object> map = new HashMap<> ();
-// map.put ("queryString",queryString);
-// map.put ("bianGengSj",bianGengSj);
-// map.put ("pageIndex",pageIndex);
-// map.put ("pageSize",pageSize);
-// //鑱屼笟缂栫爜
-// String post = HttpClientUtils.sendPost (HIS_URL+"/zhuShuJu/getShouFeiXm", map);
-// return AjaxResult.success ().put ("data", post);
-// }
+
+ /**
+ *绉戝淇℃伅鎺ㄩ��
+ * @param xingZhiSx 缁勭粐灞炴�� 绗竴浣�1聽琛ㄧず 鎸傚彿
+ * 绗簩浣� 1琛ㄧず涓村簥
+ * 绗笁浣� 1琛ㄧず妫�鏌�
+ * 绗洓浣� 1 琛ㄧず鎵嬫湳
+ * 绗簲浣� 1 琛ㄧず娌荤枟
+ * 绗叚浣� 1 琛ㄧず鎶ょ悊
+ * @param queryString 妯＄硦鍖归厤杈撯紛鐮�1銆佺瀹ゅ悕绉�
+ * @param zuoFeiBz 浣滃簾鏍囧織锛�0 姝ｅ父锛�1 浣滃簾
+ * @param yuanQuId 闄㈠尯id
+ * @param keShiIds 绉戝ID闆嗗悎
+ * @param ifPlus 鏄惁鏌ヨplus灞炴��
+ * @return
+ */
+ public AjaxResult getKeShiByConditions (int xingZhiSx, String queryString, int zuoFeiBz, String yuanQuId, List<String>keShiIds,int ifPlus) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("xingZhiSx",xingZhiSx);
+ map.put ("queryString",queryString);
+ map.put ("zuoFeiBz",zuoFeiBz);
+ map.put ("yuanQuId",yuanQuId);
+ map.put ("keShiIds",keShiIds);
+ map.put ("ifPlus",ifPlus);
+ //鑱屼笟缂栫爜
+ String post = HttpClientUtils.sendPost (HIS_URL+"/zhuShuJu/getKeShiByConditions", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+
+ /**
+ * //鍙栨牱鏈瓧鍏�
+ * @param queryString 鏍锋湰绫诲瀷鍚嶇О(鏍锋湰鍚嶇О/鏍锋湰绫诲瀷id)
+ * @param pageIndex
+ * @param pageSize 姣忊粴鏉℃暟锛堟渶饧や笉鑳借秴杩�100锛�
+ * @return
+ */
+ public AjaxResult getYangBen (String queryString,int pageIndex,int pageSize ) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("queryString",queryString);
+ map.put ("pageIndex",pageIndex);
+ map.put ("pageSize",pageSize);
+ //鑱屼笟缂栫爜
+ String post = HttpClientUtils.sendPost (HIS_URL+"/zhuShuJu/getYangBen", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ /**
+ * //鐥呭尯淇℃伅鎺ㄩ��
+ * @param yuanQuId 闄㈠尯Id
+ * @param keShiId 绉戝Id
+ * @param pageIndex 褰撳墠饣�
+ * @param pageSize 姣忊粴鏉℃暟锛堟渶饧や笉鑳借秴杩�100锛�
+ * @return
+ */
+ public AjaxResult getListBingQuZd (String yuanQuId,String keShiId,int pageIndex,int pageSize ) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("yuanQuId",yuanQuId);
+ map.put ("keShiId",keShiId);
+ map.put ("pageIndex",pageIndex);
+ map.put ("pageSize",pageSize);
+ //鑱屼笟缂栫爜
+ String post = HttpClientUtils.sendPost (HIS_URL+"/zhuShuJu/getListBingQuZd", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+ /**
+ * 鑱屸集淇℃伅
+ * @param bianGengSj 鍙樻洿鏃堕棿
+ * @param pageIndex 褰撳墠饣�
+ * @param pageSize 姣忊粴鏉℃暟锛堟渶饧や笉鑳借秴杩�100锛�
+ * @return
+ */
+ public AjaxResult getZhiGongPage (String bianGengSj,int pageIndex,int pageSize ) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("bianGengSj",bianGengSj);
+ map.put ("pageIndex",pageIndex);
+ map.put ("pageSize",pageSize);
+ //鑱屼笟缂栫爜
+ String post = HttpClientUtils.sendPost (HIS_URL+"/zhuShuJu/getZhiGongPage", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ /**
+ *
+ * @param queryString
+ * @param bianGengSj
+ * @param pageIndex
+ * @param pageSize
+ * @return
+ */
+ public AjaxResult getJianChaXm (String queryString,String bianGengSj,int pageIndex,int pageSize ) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("queryString",queryString);
+ map.put ("bianGengSj",bianGengSj);
+ map.put ("pageIndex",pageIndex);
+ map.put ("pageSize",pageSize);
+ //鑱屼笟缂栫爜
+ String post = HttpClientUtils.sendPost (HIS_URL+"/zhuShuJu/getJianChaXm", map);
+ return AjaxResult.success ().put ("data", post);
+ }
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 20ee064..4b3b8d6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -1641,7 +1641,7 @@
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){
- List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),null,tjOrderDetail.getYcbz());
+ List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),"",tjOrderDetail.getYcbz(),tjNumber);
if(null !=maps && !maps.isEmpty()){
tjOrderDetail.setAdvices(maps);
}
@@ -1668,7 +1668,7 @@
@ApiOperation (value = "鎬绘鏌ョ湅寮傚父椤圭洰寤鸿瑙勫垯鎺ュ彛")
public AjaxResult getyichangxiangmujianyiguize(@RequestParam String proId,@RequestParam String ycbz) {
if (StrUtil.isNotBlank(proId) && StrUtil.isNotBlank(ycbz)) {
- List<Map<String,Object>> map= rulesService.getyichangxiangmujianyiguize(proId,null,ycbz);
+ List<Map<String,Object>> map= rulesService.getyichangxiangmujianyiguize(proId,"",ycbz,"");
return AjaxResult.success(map);
}
return AjaxResult.error();
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java
index 88480db..5a838b3 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java
@@ -75,8 +75,8 @@
List<TjRules> getTjRulesListByTjNumAndProId(@Param("tjNum") String tjNum,@Param("proId") Long proId);
- @Select("SELECT a.advice_bt bt, a.advice_nr nr FROM tj_rules a JOIN tj_project b ON b.pro_id=a.pro_id\n" +
- " \n" +
- " WHERE (b.lis_xmbm= #{xmbm} OR a.pro_id=#{proId}) AND a.sign= #{ycbz}")
- List<Map<String,Object>> getyichangxiangmujianyiguize(@Param("xmbm") String xmbm,@Param("proId") String proId,@Param("ycbz") String ycbz);
+// @Select("SELECT a.advice_bt bt, a.advice_nr nr FROM tj_rules a JOIN tj_project b ON b.pro_id=a.pro_id\n" +
+// " \n" +
+// " WHERE (b.lis_xmbm= #{xmbm} OR a.pro_id=#{proId}) AND a.sign= #{ycbz}")
+ List<Map<String,Object>> getyichangxiangmujianyiguize(Map<String, Object> map);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjRulesService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjRulesService.java
index 3cdb7b5..e578519 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjRulesService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjRulesService.java
@@ -20,5 +20,5 @@
List<TjRules> getTjRulesListByTjNumAndProId(String tjNum,Long proId);
- List<Map<String,Object>> getyichangxiangmujianyiguize(String xmbm,String proId, String ycbz);
+ List<Map<String,Object>> getyichangxiangmujianyiguize(String xmbm,String proId, String ycbz,String tjnum);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java
index 721832e..5c8a400 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java
@@ -1,6 +1,7 @@
package com.ltkj.hosp.service.impl;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -39,7 +40,12 @@
}
@Override
- public List<Map<String,Object>> getyichangxiangmujianyiguize(String xmbm,String proId, String ycbz) {
- return mapper.getyichangxiangmujianyiguize(xmbm,proId,ycbz);
+ public List<Map<String,Object>> getyichangxiangmujianyiguize(String xmbm,String proId, String ycbz,String tjnum) {
+ Map<String, Object> map=new HashMap<>();
+ map.put("xmbm",xmbm);
+ map.put("proId",proId);
+ map.put("ycbz",ycbz);
+ map.put("tjnum",tjnum);
+ return mapper.getyichangxiangmujianyiguize(map);
}
}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjRulesMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjRulesMapper.xml
new file mode 100644
index 0000000..5008a77
--- /dev/null
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjRulesMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ltkj.hosp.mapper.TjRulesMapper">
+
+ <select id="getyichangxiangmujianyiguize" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map">
+ {call tj_lispacstongbujianyi(
+ #{xmbm,mode=IN,jdbcType=VARCHAR},
+ #{proId,mode=IN,jdbcType=VARCHAR},
+ #{ycbz,mode=IN,jdbcType=VARCHAR},
+ #{tjnum,mode=IN,jdbcType=VARCHAR} )}
+
+ </select>
+</mapper>
--
Gitblit v1.8.0