From 7b248040f67265d54fb1a386f8e36a022ee22cee Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 24 十二月 2024 17:48:39 +0800
Subject: [PATCH] zjh202412024
---
ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProGzjyServiceImpl.java | 25 ++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java | 4
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjProGzjyService.java | 16 ++
ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml | 14 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java | 26 ++++
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java | 29 ++--
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProGzjy.java | 38 ++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java | 7 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 55 ++++----
ltkj-admin/src/main/resources/banner.txt | 31 ++--
ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml | 19 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProGzjyMapper.java | 20 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java | 51 +++++++-
14 files changed, 272 insertions(+), 68 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
index a8bc740..0ddb2b2 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
@@ -44,13 +44,10 @@
public class TjSqlController extends BaseController {
@Resource
private TestMapper testMapper;
-
@Resource
private TjvLtkjvtjpatService tjvLtkjvtjpatService;
-
@Resource
private LtkjMiddleDetailService middleDetailService;
-
@Resource
private LtkjMiddleHeadService headService;
@Resource
@@ -61,16 +58,8 @@
private LtkjHybgdService ltkjHybgdService;
@Resource
private LtkjHysqdService ltkjHysqdService;
- @Autowired
- public RedisTemplate<Object,Object> redisTemplate;
@Resource
private ITjCustomerService tjCustomerService;
- @Resource
- private RedisCache redisCache;
- @Resource
- private TjAsyncService asyncService;
- @Resource
- private ITjOrderRemarkService remarkService;
@Resource
private ITjOrderService orderService;
@Resource
@@ -83,16 +72,22 @@
private ITjOrderDetailService tjOrderDetailService;
@Resource
private ITjOrderRemarkService tjOrderRemarkService;
+ @Resource
+ private ITjProjectService projectService;
@GetMapping("/getTjHyBgList")
@ApiOperation(value = "鏌ヨlis鏁版嵁搴撻」鐩俊鎭帴鍙�")
- public AjaxResult getTjHyBgList(@RequestParam(required = false)String pacCode,
- @RequestParam(required = false)String pacName,
- @RequestParam(required = false)String pacRemark) {
- List<Map<String, Object>> maps = testMapper.getTjHyBgList(pacCode,pacName,pacRemark);
- DynamicDataSourceContextHolder.clearDataSourceType();
- return AjaxResult.success(maps);
+ public AjaxResult getTjHyBgList(@RequestParam(defaultValue = "1")Integer page,
+ @RequestParam(defaultValue = "10")Integer pageSize,
+ @RequestParam(required = false)String pname,
+ @RequestParam(required = false)String pid,
+ @RequestParam(required = false)String pym,
+ @RequestParam(required = false)String checktype) {
+// List<Map<String, Object>> maps = testMapper.getTjHyBgList(pacCode,pacName,pacRemark);
+// DynamicDataSourceContextHolder.clearDataSourceType();
+ Map<String,Object> map= projectService.getTjHyBgList(page,pageSize,pname,pid,pym,checktype);
+ return AjaxResult.success(map);
}
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 56b7c3d..d9ca10e 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
@@ -1355,31 +1355,31 @@
final TjCustomer byId1 = customerService.getById(order.getUserId());
if (null != tjOrderDetailList && !tjOrderDetailList.isEmpty()) {
//----------------------------------start
- for (TjOrderDetail tjOrderDetail : tjOrderDetailList) {
- final TjProject byId = projectService.getById(tjOrderDetail.getProId());
- //缁欑梾绉嶈褰曡〃瀛� 鏂逛究缁熻鐥呯鍜屽鎴蜂俊鎭箣闂寸殑鍏崇郴
- if (tjOrderDetail.getRulesList()!=null){
- for (TjRules tjRules : tjOrderDetail.getRulesList()) {
- TjOrderDetailRules orderDetailRules=new TjOrderDetailRules();
- orderDetailRules.setAid(tjRules.getAid());
- if (byId1!=null){
- orderDetailRules.setCusName(byId1.getCusName());
- orderDetailRules.setCusSex(String.valueOf(byId1.getCusSex()));
- orderDetailRules.setCusAge(String.valueOf(MatchUtils.getAgeByIdCard(byId1.getCusIdcard())));
- orderDetailRules.setCusId(String.valueOf(byId1.getCusId()));
- }
- orderDetailRules.setBingzhong(tjRules.getBingzhong());
- orderDetailRules.setDoctorName(sysUser.getNickName());
- orderDetailRules.setTjNumber(order.getTjNumber());
- if (byId!=null){
- orderDetailRules.setProId(String.valueOf(byId.getProId()));
- orderDetailRules.setProName(byId.getProName());
- }
- orderDetailRules.setDoctorId(String.valueOf(sysUser.getUserId()));
- tjOrderDetailRulesService.save(orderDetailRules);
- }
- }
- }
+// for (TjOrderDetail tjOrderDetail : tjOrderDetailList) {
+// final TjProject byId = projectService.getById(tjOrderDetail.getProId());
+// //缁欑梾绉嶈褰曡〃瀛� 鏂逛究缁熻鐥呯鍜屽鎴蜂俊鎭箣闂寸殑鍏崇郴
+// if (tjOrderDetail.getRulesList()!=null){
+// for (TjRules tjRules : tjOrderDetail.getRulesList()) {
+// TjOrderDetailRules orderDetailRules=new TjOrderDetailRules();
+// orderDetailRules.setAid(tjRules.getAid());
+// if (byId1!=null){
+// orderDetailRules.setCusName(byId1.getCusName());
+// orderDetailRules.setCusSex(String.valueOf(byId1.getCusSex()));
+// orderDetailRules.setCusAge(String.valueOf(MatchUtils.getAgeByIdCard(byId1.getCusIdcard())));
+// orderDetailRules.setCusId(String.valueOf(byId1.getCusId()));
+// }
+// orderDetailRules.setBingzhong(tjRules.getBingzhong());
+// orderDetailRules.setDoctorName(sysUser.getNickName());
+// orderDetailRules.setTjNumber(order.getTjNumber());
+// if (byId!=null){
+// orderDetailRules.setProId(String.valueOf(byId.getProId()));
+// orderDetailRules.setProName(byId.getProName());
+// }
+// orderDetailRules.setDoctorId(String.valueOf(sysUser.getUserId()));
+// tjOrderDetailRulesService.save(orderDetailRules);
+// }
+// }
+// }
asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order);
LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
@@ -1441,6 +1441,9 @@
String configByKey = configService.selectConfigByKey("sfkqdyhis");
// 鍒ゆ柇鏄惁鏀惰垂 璇锋眰鎺ュ彛
TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
+ if(null ==tjOrder){
+ return AjaxResult.error("鏈壘鍒颁綋妫�璁板綍");
+ }
LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition,"N");
@@ -1524,7 +1527,7 @@
wq2.eq(TjProject::getNeedReport,"Y");
List<TjProject> Deptlist = projectService.list(wq2);
List<Long> proIdList = Deptlist.stream().map(TjProject::getProId).collect(Collectors.toList());
- if (Deptlist.size() == 0 || proIdList.size() == 0) {
+ if (Deptlist.isEmpty() || proIdList.isEmpty()) {
return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
}
LambdaQueryWrapper<TjOrder> wqqq = new LambdaQueryWrapper<>();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
index f5331c7..4271cb5 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
@@ -1,10 +1,7 @@
package com.ltkj.web.controller.system;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -51,6 +48,8 @@
private ITjGroupingProService groupingProService;
@Resource
private ITjProjectService projectService;
+ @Resource
+ private TjProGzjyService proGzjyService;
/**
* 鏌ヨ瑙勫垯+鐥呯鍒楄〃
@@ -210,15 +209,49 @@
@GetMapping("/AutoGetRule")
@ApiOperation(value = "瑙勫垯鑷姩璁＄畻")
public AjaxResult AutoGetRule(@ApiParam(value = "椤圭洰") @RequestParam String proId,
- @ApiParam(value = "瀹㈡埛") @RequestParam String cusId,
+ @ApiParam(value = "瀹㈡埛") @RequestParam(required = false) String cusId,
+ @ApiParam(value = "浣撴鍙�")@RequestParam String tjNum,
@ApiParam(value = "鍏抽敭瀛�") @RequestParam(required = false) String keyWord,
- @ApiParam(value = "缁撴灉鍊�") @RequestParam(required = false) BigDecimal keyNum) {
+ @ApiParam(value = "缁撴灉鍊�") @RequestParam(required = false) String keyNum) {
+ TjProject project = projectService.getById(proId);
+ TjOrder order = orderService.getOrderByTjNum(tjNum);
+ if(null !=project && null !=order){
+ TjProject pproject = projectService.getById(project.getProParentId());
+ List<Map<String, Object>> tjproGzJy = projectService.getTjproGzJy(tjNum, proId, keyNum, 0);
+ if(null !=tjproGzJy && !tjproGzJy.isEmpty()){
+// proGzjyService.remove(new LambdaQueryWrapper<TjProGzjy>().eq(TjProGzjy::getProId,proId).eq(TjProGzjy::getTjNumber,tjNum));
+ proGzjyService.deletedByTjNumAndProId(proId,tjNum);
+ for (Map<String, Object> map : tjproGzJy) {
+ Object bz = map.get("bz");
+ Object bt = map.get("bt");
+ Object nr = map.get("nr");
+ TjProGzjy proGzjy=new TjProGzjy();
+ proGzjy.setTjNumber(tjNum);
+ proGzjy.setOrderId(order.getOrderId());
+ proGzjy.setProId(Long.valueOf(proId));
+ proGzjy.setProName(project.getProName());
+ proGzjy.setProPrentId(project.getProParentId());
+ proGzjy.setProPrentName(pproject.getProName());
+ proGzjy.setProJgz(keyNum);
+ if(null !=bz)proGzjy.setBz(bz.toString());
+ if(null !=bt)proGzjy.setBt(bt.toString());
+ if(null !=nr)proGzjy.setJy(nr.toString());
+ proGzjyService.save(proGzjy);
+ }
+ }
+ return AjaxResult.success(tjproGzJy);
+ }
+ return AjaxResult.success();
+ }
+
+ //涔嬪墠瑙勫垯绠楁硶鏂规硶
+ private AjaxResult getAjaxResult(String proId, String cusId, String keyWord, BigDecimal keyNum) {
List<TjRules> res = new ArrayList<>();
- if (proId==null){
+ if (proId ==null){
return AjaxResult.success(res);
}
- if (cusId==null){
+ if (cusId ==null){
return AjaxResult.success(res);
}
TjCustomer byId = customerService.getById(cusId);
@@ -248,7 +281,7 @@
}
}
} else if ("1".equals(tjRules.getRuleType())) {
- if (keyWord!=null){
+ if (keyWord !=null){
if (tjRules.getRuleStr().contains(keyWord)) {
res.add(tjRules);
}
diff --git a/ltkj-admin/src/main/resources/banner.txt b/ltkj-admin/src/main/resources/banner.txt
index 44c7a59..4d2771a 100644
--- a/ltkj-admin/src/main/resources/banner.txt
+++ b/ltkj-admin/src/main/resources/banner.txt
@@ -1,16 +1,19 @@
${AnsiColor.BRIGHT_YELLOW}
- __ /^\
- .' \ / :.\
- / \ | :: \
- / /. \ / ::: |
- | |::. \ / :::'/
- | / \::. | / :::'/
- `--` \' `~~~ ':'/`
- / (
- / 0 _ 0 \
- \/ \_/ \/
- -== '.' | '.' ==-
- /\ '-^-' /\
- \ _ _ /
- .-`-((\o/))-`-. |
+ xxxxxx xxxx
+ xxx xxxx
+ x xxxx
+ xxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxx x
+ xxxx xxxx xxxx x
+ xxx xxx xxxxxxxxxxxxxxx x
+ xx xx xxxx x
+ x xxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxx x
+ x xxxxxxxxxxxx xxxx x
+ x xxxx xxxx xxxxxxxxxxxxx x
+ x xxxxxxxxxxxx xxxx x
+ x xxxx xxxx xxxxxxxxxxxxx x
+ x xxxxxxxxxxxx xxxx xx
+ xx xxxx xxxx xxxxxxxxxxxxx xxx
+ xxx xxxx x xxxx xxxx xxxxx
+ xxxx xxxx xxxxx xxxx xxxxxx
+ xxxxxxxxxxxxx xxx xxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java b/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java
index 87c120a..07668f9 100644
--- a/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java
+++ b/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java
@@ -191,6 +191,11 @@
* 閲嶇偣绉戝绫诲瀷缂栫爜锛圥T10.06.15锛�
*/
private String deptFcusTypeCode;
+
+ private String hisksid;
+
+ private String hisksmc;
+
//浠ヤ笂
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProGzjy.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProGzjy.java
new file mode 100644
index 0000000..ad28401
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProGzjy.java
@@ -0,0 +1,38 @@
+package com.ltkj.hosp.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.ltkj.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * ClassName: TjProGzjy <br/>
+ * Description: <br/>
+ * date: 2024/12/23 10:58<br/>
+ *
+ * @author zjh<br />
+ */
+
+@Data
+public class TjProGzjy extends BaseEntity {
+
+ @ApiModelProperty(value = "涓婚敭id")
+ @TableId
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ private String tjNumber;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long orderId;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long proId;
+ private String proName;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long proPrentId;
+ private String proPrentName;
+ private String proJgz;
+ private String bz;
+ private String bt;
+ private String jy;
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProGzjyMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProGzjyMapper.java
new file mode 100644
index 0000000..f134c46
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProGzjyMapper.java
@@ -0,0 +1,20 @@
+package com.ltkj.hosp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.hosp.domain.TjProGzjy;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * ClassName: TjProGzjyMapper <br/>
+ * Description: <br/>
+ * date: 2024/12/24 08:53<br/>
+ *
+ * @author zjh<br />
+ */
+@Mapper
+public interface TjProGzjyMapper extends BaseMapper<TjProGzjy> {
+ @Delete("delete from tj_pro_gzjy where tj_number=#{tjNum} and pro_id=#{proId}")
+ void deletedByTjNumAndProId(@Param("proId") String proId,@Param("tjNum") String tjNum);
+}
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 74eab2b..af82a22 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
@@ -184,4 +184,11 @@
List<Map<String,Object>> tjCsXmjgcx(Map<String,Object> map);
+
+
+ List<Map<String,Object>> getTjproGzJy(Map<String,Object> map);
+
+
+ List<List<?>> getTjHyBgList(Map<String,Object> map);
+
}
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 95b80b7..06260c2 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
@@ -135,4 +135,8 @@
List<Map<String,Object>> tjCsXmjgcx(String tjNum, String proId);
+ List<Map<String,Object>> getTjproGzJy(String tjNum, String proId,String gzz,int cgorjyjc);
+
+
+ Map<String,Object> getTjHyBgList(Integer page,Integer pageSize,String pname,String pid,String pym,String checktype);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjProGzjyService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjProGzjyService.java
new file mode 100644
index 0000000..c6ca7e3
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjProGzjyService.java
@@ -0,0 +1,16 @@
+package com.ltkj.hosp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.hosp.domain.TjProGzjy;
+
+/**
+ * ClassName: TjProGzjyService <br/>
+ * Description: <br/>
+ * date: 2024/12/24 08:54<br/>
+ *
+ * @author zjh<br />
+ */
+
+public interface TjProGzjyService extends IService<TjProGzjy> {
+ void deletedByTjNumAndProId(String proId, String tjNum);
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProGzjyServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProGzjyServiceImpl.java
new file mode 100644
index 0000000..1f18dfc
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProGzjyServiceImpl.java
@@ -0,0 +1,25 @@
+package com.ltkj.hosp.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ltkj.hosp.domain.TjProGzjy;
+import com.ltkj.hosp.mapper.TjProGzjyMapper;
+import com.ltkj.hosp.service.TjProGzjyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * ClassName: TjProGzjyServiceImpl <br/>
+ * Description: <br/>
+ * date: 2024/12/24 08:54<br/>
+ *
+ * @author zjh<br />
+ */
+@Service
+public class TjProGzjyServiceImpl extends ServiceImpl<TjProGzjyMapper, TjProGzjy> implements TjProGzjyService {
+ @Autowired
+ private TjProGzjyMapper mapper;
+ @Override
+ public void deletedByTjNumAndProId(String proId, String tjNum) {
+ mapper.deletedByTjNumAndProId( proId, tjNum);
+ }
+}
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 1934f3d..8cbd698 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
@@ -304,4 +304,30 @@
return tjProjectMapper.tjCsXmjgcx(map);
}
+ @Override
+ public List<Map<String, Object>> getTjproGzJy(String tjNum, String proId, String gzz, int cgorjyjc) {
+ Map<String,Object> map=new HashMap<>();
+ map.put("tjnum",tjNum);
+ map.put("proid",proId);
+ map.put("jgz",gzz);
+ map.put("cgorjyjc",cgorjyjc);
+ return tjProjectMapper.getTjproGzJy(map);
+ }
+
+ @Override
+ public Map<String,Object> getTjHyBgList(Integer page,Integer pageSize,String pname,String pid,String pym,String checktype) {
+ Map<String,Object> map=new HashMap<>();
+ map.put("page",page);
+ map.put("pageSize",pageSize);
+ map.put("pname",pname);
+ map.put("pid",pid);
+ map.put("pym",pym);
+ map.put("checktype",checktype);
+ List<List<?>> list = tjProjectMapper.getTjHyBgList(map);
+ Map<String,Object> map1=new HashMap<>();
+ map1.put("list",list);
+ map1.put("total",map.get("total"));
+ return map1;
+ }
+
}
diff --git a/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml b/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
index e7060d1..b777a9a 100644
--- a/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
@@ -196,4 +196,23 @@
#{proid,mode=IN,jdbcType=VARCHAR}
)}
</select>
+ <select id="getTjproGzJy" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map">
+ {call tj_zidonghuoqujianyiguize(
+ #{tjnum,mode=IN,jdbcType=VARCHAR},
+ #{proid,mode=IN,jdbcType=VARCHAR},
+ #{jgz,mode=IN,jdbcType=VARCHAR},
+ #{cgorjyjc,mode=IN,jdbcType=INTEGER}
+ )}
+ </select>
+ <select id="getTjHyBgList" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map">
+ {call tj_dict_list(
+ #{checktype,mode=IN,jdbcType=VARCHAR},
+ #{page,mode=IN,jdbcType=INTEGER},
+ #{pageSize,mode=IN,jdbcType=INTEGER},
+ #{pname,mode=IN,jdbcType=VARCHAR},
+ #{pid,mode=IN,jdbcType=VARCHAR},
+ #{pym,mode=IN,jdbcType=VARCHAR},
+ #{total,mode=OUT,jdbcType=INTEGER}
+ )}
+ </select>
</mapper>
diff --git a/ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 48f1f6a..022e364 100644
--- a/ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -44,6 +44,8 @@
<result property="deptTypeCode" column="dept_type_code"/>
<result property="deptFcusTypeCode" column="dept_fcus_type_code"/>
<result property="modality" column="modality"/>
+ <result property="hisksid" column="hisksid"/>
+ <result property="hisksmc" column="hisksmc"/>
</resultMap>
<sql id="selectDeptVo">
@@ -81,7 +83,9 @@
d.standard_dept_code,
d.dept_type_code,
d.dept_fcus_type_code,
- d.modality
+ d.modality,
+ d.hisksid,
+ d.hisksmc
from sys_dept d
</sql>
@@ -203,6 +207,8 @@
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="modality != null and modality != ''">modality,</if>
+ <if test="hisksid != null and hisksid != ''">hisksid,</if>
+ <if test="hisksmc != null and hisksmc != ''">hisksmc,</if>
create_time
)values(
<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -240,6 +246,8 @@
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="modality != null and modality != ''">#{modality},</if>
+ <if test="hisksid != null and hisksid != ''">#{hisksid},</if>
+ <if test="hisksmc != null and hisksmc != ''">#{hisksmc},</if>
sysdate()
)
</insert>
@@ -282,6 +290,8 @@
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="modality != null and modality != ''">modality = #{modality},</if>
+ <if test="hisksid != null and hisksid != ''">hisksid = #{hisksid},</if>
+ <if test="hisksmc != null and hisksmc != ''">hisksmc = #{hisksmc},</if>
update_time = sysdate()
</set>
where dept_id = #{deptId}
@@ -309,7 +319,7 @@
<delete id="deleteDeptById" parameterType="Long">
update sys_dept
- set deleted = '2'
+ set deleted = '1'
where dept_id = #{deptId}
</delete>
--
Gitblit v1.8.0