From fca6e337094ebe09090ce465701450ccb818d10d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期六, 11 一月 2025 18:24:21 +0800
Subject: [PATCH] zjh20250111
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 10 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 8 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java | 4
ltkj-hosp/src/main/java/com/ltkj/hosp/dto/UpdateTransitionnewPriceDto.java | 4 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java | 4
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 50 ++++++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 27 +++++++++
ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml | 11 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 11 ++-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java | 5 +
15 files changed, 129 insertions(+), 15 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index 7a42826..5ee9777 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -1025,6 +1025,7 @@
if (StrUtil.isNotBlank(result)) {
int index = 1;
result = result.replaceAll("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
+// result = result.replaceAll("", "");
String[] split = result.split("\n");
StringBuilder builder = new StringBuilder();
for (String s : split) {
@@ -1161,7 +1162,8 @@
// result = "\n " + result.replaceAll("\n", "\n ");
int index1 = 1;
String[] split = result.split("\n");
- boolean contains = result.contains("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
+// boolean contains = result.contains("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
+ boolean contains = result.contains(" ");
StringBuilder builder = new StringBuilder();
for (String s : split) {
if (StrUtil.isBlank(s.replaceAll("\n","").trim())) continue;
@@ -1169,6 +1171,7 @@
index1++;
}
if (!contains) builder.append(" (").append(index1).append(")").append("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
+// if (!contains) builder.append(" (").append(index1).append(")").append(" ");
else builder.substring(0,builder.length() - 1);
result = builder.toString();
}
@@ -1189,7 +1192,8 @@
List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"","",tjOrder.getTjNumber());
for (Map<String, Object> objectMap : maps) {
String content = str + objectMap.get("bt").toString() + objectMap.get("nr").toString();
- if (StrUtil.isBlank(content)) content = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
+// if (StrUtil.isBlank(content)) content = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
+ if (StrUtil.isBlank(content)) content = " ";
paragraph = new Paragraph(content,defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
@@ -1257,7 +1261,8 @@
// document2.add(paragraph);
String content1 = str + objectMap.get("bt").toString() + objectMap.get("nr").toString().trim();
- if (StrUtil.isBlank(content)) content1 = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
+// if (StrUtil.isBlank(content)) content1 = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
+ if (StrUtil.isBlank(content)) content1 = " ";
paragraph = new Paragraph(content1,defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index b61a155..2dfe3e8 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -29,6 +29,7 @@
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
+import com.ltkj.hosp.vodomain.CsProVo;
import com.ltkj.system.domain.SysPost;
import com.ltkj.system.domain.SysUserPost;
import com.ltkj.system.service.*;
@@ -1804,4 +1805,53 @@
return AjaxResult.success(list);
}
+
+ @GetMapping ("/ysjcbGetProByTjNumAndOrderId")
+ @ApiOperation (value = "鍖荤敓妫�鏌ラ〉闈㈡煡璇㈡楠屾鏌ラ」鐩帴鍙�")
+ public AjaxResult ysjcbGetProByTjNumAndOrderId(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
+// List<TjOrderRemark> orderRemarkList = orderRemarkService.getTjOrderRemarkListByTjNum(tjNumber);
+// List<CsProVo> list = new ArrayList<>();
+// if (null != orderRemarkList && orderRemarkList.size() > 0) {
+// for (TjOrderRemark remark : orderRemarkList) {
+// CsProVo vo = new CsProVo();
+// vo.setDeptName(deptService.getById(remark.getDeptId()).getDeptName());
+// vo.setProName(projectService.getById(remark.getProId()).getProName());
+// vo.setType(remark.getType());
+// if (null != remark.getDoctorName()) {
+// vo.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
+// vo.setBcdoctorName(userService.getById(remark.getDoctorName()).getNickName());
+// }
+// vo.setSffs("缁熸敹");
+// vo.setIsPay("宸叉敹璐�");
+// vo.setQdcreateTime(remark.getCreateTime());
+// vo.setBcupdateTime(remark.getUpdateTime());
+// vo.setZhupdateTime(remark.getUpdateTime());
+// list.add(vo);
+// }
+// List<CsProVo> list1 = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber);
+// Collections.sort(list, new Comparator<CsProVo>() {
+// @Override
+// public int compare(CsProVo o1, CsProVo o2) {
+// return o1.getType() - o2.getType();
+// }
+// });
+// }
+
+ List<CsProVo> list = getysjcProVos(tjNumber);
+ return AjaxResult.success(list);
+ }
+
+ public List<CsProVo> getysjcProVos(String tjNumber) {
+ List<CsProVo> list = remarkService.ysjcGetProByTjNumAndOrderId(tjNumber);
+ if (null != list && !list.isEmpty()) {
+ list.sort(new Comparator<CsProVo>() {
+ @Override
+ public int compare(CsProVo o1, CsProVo o2) {
+ return o1.getType() - o2.getType();
+ }
+ });
+ }
+ return list;
+ }
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 9de2e65..4322d6c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -3788,6 +3788,7 @@
log.info("鐖堕」鐩甶d涓�: "+dto.getParentProId());
log.info("鎶樻墸涓�: "+new BigDecimal(dto.getDiscount()));
if(null !=list && !list.isEmpty()){
+ BigDecimal dxzj = transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(),dto.getParentProId());
for (TbTransition transition : list) {
BigDecimal ordPrice = transition.getOrdPrice();
BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
@@ -3796,6 +3797,15 @@
transition.setDiscount(new BigDecimal(dto.getDiscount()));
transitionService.updateById(transition);
}
+ if(null !=dto.getYhj() && dto.getYhj().compareTo(BigDecimal.ZERO)>=0){
+ List<TbTransition> transitionList = list.stream().filter(a ->
+ transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(),dto.getParentProId()).subtract(dto.getYhj()).compareTo(BigDecimal.ZERO) >= 0).collect(Collectors.toList());
+ if(!transitionList.isEmpty()){
+ TbTransition tbTransition = transitionList.get(0);
+ tbTransition.setNowPrice(dxzj);
+ transitionService.updateById(tbTransition);
+ }
+ }
}
}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index 8b7e808..df245be 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -93,7 +93,7 @@
List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
String config = configService.selectConfigByKey("tj_dxsxtj");
if (null != config && config.equals("N")) {
- tjProjects = tjProjectService.getOpenDxTjProjectList();
+ tjProjects = tjProjectService.getOpenDxTjProjectList(null);
}
if (tjProjects != null) {
for (TjProject project : tjProjects) {
@@ -591,7 +591,7 @@
List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
String config = configService.selectConfigByKey("tj_dxsxtj");
if (null != config && config.equals("N")) {
- tjProjects = tjProjectService.getOpenDxTjProjectList();
+ tjProjects = tjProjectService.getOpenDxTjProjectList(null);
}
String key = configService.selectConfigByKey("is_open_sfxm");
Map<String, Object> map = new HashMap<>();
@@ -604,11 +604,11 @@
@GetMapping("/getProParentIdDxListByFenYe")
@ApiOperation(value = "閫夋嫨浣撴椤圭洰(鎵�鏈夐〉闈㈤」鐩�)閫夊崟椤规椂璋冪敤鐨勬帴鍙�(鏈夊垎椤�)")
- public AjaxResult getProParentIdDxListByFenYe(@RequestParam(defaultValue = "1") int page,@RequestParam(defaultValue = "10") int pageSize) {
+ public AjaxResult getProParentIdDxListByFenYe(@RequestParam(defaultValue = "1") int page,@RequestParam(defaultValue = "10") int pageSize,String nr) {
List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
String config = configService.selectConfigByKey("tj_dxsxtj");
if (null != config && config.equals("N")) {
- tjProjects = tjProjectService.getOpenDxTjProjectList();
+ tjProjects = tjProjectService.getOpenDxTjProjectList(nr);
}
String key = configService.selectConfigByKey("is_open_sfxm");
Map<String, Object> map = new HashMap<>();
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/UpdateTransitionnewPriceDto.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/UpdateTransitionnewPriceDto.java
index 2922214..6604d9f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/UpdateTransitionnewPriceDto.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/UpdateTransitionnewPriceDto.java
@@ -2,6 +2,8 @@
import lombok.Data;
+import java.math.BigDecimal;
+
/**
* ClassName: updateTransitionnewPriceDto <br/>
* Description: <br/>
@@ -18,4 +20,6 @@
private String parentProId;
//鎶樻墸
private String discount;
+
+ private BigDecimal yhj;
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
index 38da148..11531aa 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -276,7 +276,7 @@
// BigDecimal getTbTransitionPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId);
@Select("SELECT SUM(a.now_price) FROM tb_transition a WHERE a.cus_id=#{cusId} AND a.parent_pro_id=#{proId}")
- BigDecimal getTbTransitionPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId);
+ BigDecimal getTbTransitionPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")String proId);
@Select("SELECT SUM(c.pro_price) FROM tj_project c WHERE c.pro_id IN " +
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index 0fc7a63..c9a779a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -224,4 +224,31 @@
"\n" +
"WHERE b.need_report='Y' AND c.org_type !=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} \n")
List<TjOrderRemark> yiShengJianChaGetPrentProCJGLY(@Param("tjNumber") String tjNumber);
+
+
+
+ @Select({"<script>" +
+ "SELECT\n" +
+ " pro.pro_id,\n" +
+ " dep.dept_name,\n" +
+ " dep.dept_id,\n" +
+ " pro.pro_name,\n" +
+ " re.type,\n" +
+ " us.nick_name doctor_name,\n" +
+ " us.nick_name bcdoctor_name,\n" +
+ " '缁熸敹' sffs,\n" +
+ " '宸叉敹璐�' is_pay,\n" +
+ " re.create_time qdcreate_time,\n" +
+ " re.update_time bcupdate_time,\n" +
+ " re.update_time zhupdate_time\n" +
+ " FROM\n" +
+ " tj_order_remark re\n" +
+ " LEFT JOIN sys_dept dep ON re.dept_id = dep.dept_id\n" +
+ " LEFT JOIN tj_project pro ON re.pro_id = pro.pro_id\n" +
+ " LEFT JOIN sys_user us ON us.user_id = re.doctor_name\n" +
+ " WHERE\n" +
+ " re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%' " +
+ " AND dep.org_type in (1,2 )"+
+ "</script>"})
+ List<CsProVo> ysjcGetProByTjNumAndOrderId(@Param("tjNumber") String tjNumber);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
index 5e476be..8dd0c2f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
@@ -143,8 +143,8 @@
@Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 and LOCATE( '浣撴',pro_name) and deleted=0")
List<TjProject> getDxTjProjectList();
- @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 and deleted=0")
- List<TjProject> getOpenDxTjProjectList();
+// @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 and deleted=0")
+ List<TjProject> getOpenDxTjProjectList(String nr);
@Select("SELECT a.*,GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) AS all_son_pro_name FROM\n" +
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
index fcdf465..2c4e379 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
@@ -122,7 +122,7 @@
boolean ttsaveTemoTransitionByGroupingId(String cusId, String cardId,String groupingId);
- BigDecimal getTbTransitionPriceAndOrdPrice(String cusId,Long proId);
+ BigDecimal getTbTransitionPriceAndOrdPrice(String cusId,String proId);
BigDecimal getTbTransitionDxPriceAndOrdPrice(String cusId,Long proId);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
index a44adcb..a4ccfc9 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
@@ -86,4 +86,6 @@
List<TjOrderRemark> yiShengJianChaGetPrentPro(String tjNumber,List<Integer> split);
List<TjOrderRemark> yiShengJianChaGetPrentProCJGLY(String tjNumber);
+
+ List<CsProVo> ysjcGetProByTjNumAndOrderId(String tjNumber);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
index 0a514fe..a45d2e8 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
@@ -111,7 +111,7 @@
List<TjProject> getTjProjectList();
List<TjProject> getDxTjProjectList();
- List<TjProject> getOpenDxTjProjectList();
+ List<TjProject> getOpenDxTjProjectList(String nr);
List<TjProject> getPacTjProjectList();
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
index 80701b5..fef5554 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
@@ -194,7 +194,7 @@
}
@Override
- public BigDecimal getTbTransitionPriceAndOrdPrice(String cusId, Long proId) {
+ public BigDecimal getTbTransitionPriceAndOrdPrice(String cusId, String proId) {
return tbTransitionMapper.getTbTransitionPriceAndOrdPrice(cusId,proId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
index 31f0b7c..a7d8037 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
@@ -176,4 +176,9 @@
return mapper.yiShengJianChaGetPrentProCJGLY(tjNumber);
}
+ @Override
+ public List<CsProVo> ysjcGetProByTjNumAndOrderId(String tjNumber) {
+ return mapper.ysjcGetProByTjNumAndOrderId(tjNumber);
+ }
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
index 35c8d0c..f02d8eb 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
@@ -215,8 +215,8 @@
}
@Override
- public List<TjProject> getOpenDxTjProjectList() {
- return tjProjectMapper.getOpenDxTjProjectList();
+ public List<TjProject> getOpenDxTjProjectList(String nr) {
+ return tjProjectMapper.getOpenDxTjProjectList(nr);
}
@Override
diff --git a/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml b/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
index 66c79c0..50e8ee1 100644
--- a/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
@@ -230,4 +230,15 @@
<select id="getLisViewList" resultType="java.util.Map">
SELECT * FROM `v_examitem`
</select>
+
+ <select id="getOpenDxTjProjectList" parameterType="string" resultType="com.ltkj.hosp.domain.TjProject">
+ SELECT * FROM `tj_project`
+ <where>
+ pro_parent_id=0 and pro_status=0 and deleted=0
+ <if test="nr != null ">and (pro_name like concat('%', #{nr}, '%')
+ or pro_eng_name like concat('%', #{nr}, '%'))</if>
+ </where>
+
+
+ </select>
</mapper>
--
Gitblit v1.8.0