From 73a816fd2b1e29c25d615c85ce34b12b55c16ccf Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 20 一月 2025 13:41:45 +0800
Subject: [PATCH] zjh20250120
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 714 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 411 insertions(+), 303 deletions(-)
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 5e547ac..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
@@ -2,11 +2,13 @@
import java.io.*;
import java.math.BigDecimal;
+import java.sql.Struct;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.extra.pinyin.PinyinUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
@@ -27,13 +29,16 @@
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.*;
import com.ltkj.web.controller.his.HisApiGetMethodService;
+import com.ltkj.web.wxUtils.HttpClientUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.ibatis.jdbc.Null;
@@ -106,7 +111,7 @@
@Autowired
private ITjRulesService tjRulesService;
@Autowired
- public RedisTemplate<Object,Object> redisTemplate;
+ public RedisTemplate<Object, Object> redisTemplate;
@Resource
private TestMapper testMapper;
@Autowired
@@ -117,6 +122,23 @@
private HisApiGetMethodService hisApiGetMethodService;
@Autowired
private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;
+
+
+ @GetMapping("/getdangqiandengluyuanqu")
+ @ApiOperation("鑾峰彇褰撳墠鐧诲綍浜哄搴旂殑闄㈠尯鍚�")
+ public AjaxResult getdangqiandengluyuanqu() {
+ Long deptId = SecurityUtils.getDeptId();
+ if (null != deptId) {
+ SysDept dept = deptService.getById(deptId);
+ if (null != dept) {
+ String hospName = dept.getHospName();
+ return AjaxResult.success(hospName);
+ }
+ }
+
+
+ return AjaxResult.success();
+ }
/**
* 璇ヤ綋妫�绉戝涓嬪鎴峰垪琛ㄦ樉绀烘帴鍙�
@@ -163,8 +185,8 @@
return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
}
List<TjCustomer> customerLis = new ArrayList<>();
- if(null==name) name="";
- if(null==tjNumber) tjNumber="";
+ if (null == name) name = "";
+ if (null == tjNumber) tjNumber = "";
// //鏍规嵁浣撴鍙锋煡
// if (null != tjNumber) {
@@ -319,7 +341,7 @@
// .match(key).build();
// RedisSerializer<String> redisSerializer = (RedisSerializer<String>) redisTemplate.getKeySerializer();
// 0鏈,1宸叉
- Map<String,Object> map=null;
+ Map<String, Object> map = null;
if (type == 0) {
// Cursor cursor = redisTemplate.executeWithStickyConnection(redisConnection -> new ConvertingCursor<>(redisConnection.scan(options), redisSerializer::deserialize));
// List<TjCustomer> customers = new ArrayList<>();
@@ -383,7 +405,7 @@
for (Long orderId : orderIds) {
if (null != orderId) {
TjOrder order = orderService.getById(orderId);
- if(null ==order){
+ if (null == order) {
continue;
}
if (type == 1) {
@@ -410,7 +432,7 @@
StringBuilder stringBuilder = new StringBuilder();
for (TjOrderRemark remark : list) {
TjProject byId = projectService.getById(remark.getProId());
- if(null !=byId){
+ if (null != byId) {
stringBuilder.append(byId.getProName()).append(";");
}
}
@@ -439,10 +461,10 @@
@GetMapping("/huaYangetProList")
@ApiOperation("鍖栭獙妫�鏌ラ〉闈㈠垪琛�")
public AjaxResult huaYangetProList(@ApiParam(value = "浣撴鍗曞彿") @RequestParam(required = false) String tjNumber,
- @ApiParam(value = "0鏈,1宸叉") @RequestParam(defaultValue = "0") Integer type,
- @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
- @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
- @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
+ @ApiParam(value = "0鏈,1宸叉") @RequestParam(defaultValue = "0") Integer type,
+ @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
+ @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
// String userId = SecurityUtils.getLoginUser().getUserId();
// Integer ksId = null;
// SysUser sysUser = null;
@@ -477,7 +499,7 @@
// }
// if(sysUser.getUserName().equals("10001")){
- ksproList = projectService.getHuaYanProId();
+ ksproList = projectService.getHuaYanProId();
// }
// else {
// ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId));
@@ -783,7 +805,7 @@
// .match(key).build();
// RedisSerializer<String> redisSerializer = (RedisSerializer<String>) redisTemplate.getKeySerializer();
// 0鏈,1宸叉
- Map<String,Object> map=null;
+ Map<String, Object> map = null;
if (type == 0) {
// Cursor cursor = redisTemplate.executeWithStickyConnection(redisConnection -> new ConvertingCursor<>(redisConnection.scan(options), redisSerializer::deserialize));
// List<TjCustomer> customers = new ArrayList<>();
@@ -829,10 +851,10 @@
@GetMapping("/yingXiangGetProList")
@ApiOperation("褰卞儚妫�鏌ラ〉闈㈠垪琛�")
public AjaxResult yingXiangGetProList(@ApiParam(value = "浣撴鍗曞彿") @RequestParam(required = false) String tjNumber,
- @ApiParam(value = "0鏈,1宸叉") @RequestParam(defaultValue = "0") Integer type,
- @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
- @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
- @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
+ @ApiParam(value = "0鏈,1宸叉") @RequestParam(defaultValue = "0") Integer type,
+ @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
+ @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
/* String userId = SecurityUtils.getLoginUser().getUserId();
Integer ksId = null;
SysUser sysUser = null;
@@ -1025,7 +1047,7 @@
// }
// }
// List<TjCustomer> customerLists = null;
- Map<String,Object> map=null;
+ Map<String, Object> map = null;
if (type == 0) {
// Cursor cursor = redisTemplate.executeWithStickyConnection(redisConnection -> new ConvertingCursor<>(redisConnection.scan(options), redisSerializer::deserialize));
// List<TjCustomer> customers = new ArrayList<>();
@@ -1085,7 +1107,7 @@
String format = DateUtil.format(patbirth, "yyyy.MM.dd");
- List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname,sex,null);
+ List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname, sex, null);
return AjaxResult.success(tjYxjcList);
}
@@ -1100,9 +1122,6 @@
// List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname,sex,null,null);
// return AjaxResult.success(tjYxjcList);
// }
-
-
-
/**
@@ -1276,9 +1295,9 @@
dept.setUpdateBy(getUsername());
//鏌ヨ闄㈠尯鍚嶅瓧璧嬪��
- if (dept.getHospId()!=null){
+ if (dept.getHospId() != null) {
final DictHosp byId = dictHospService.getById(dept.getHospId());
- if (byId!=null){
+ if (byId != null) {
dept.setHospName(byId.getHospAreaName());
}
}
@@ -1320,12 +1339,12 @@
}
for (TjOrderRemark orderRemark : remarklList) {
List<String> summaryList = orderRemark.getSummaryList();
- if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null) ) {
+ if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
- }else {
+ } else {
orderRemark.setSummary(null);
}
- if(StringUtils.isBlank(orderRemark.getRemark()))orderRemark.setRemark(null);
+ if (StringUtils.isBlank(orderRemark.getRemark())) orderRemark.setRemark(null);
LambdaQueryWrapper<TjOrder> qw = new LambdaQueryWrapper<>();
qw.eq(TjOrder::getTjNumber, orderRemark.getTjNumber());
TjOrder order = orderService.getOne(qw);
@@ -1338,31 +1357,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());
@@ -1383,7 +1402,7 @@
one.setRemark(orderRemark.getRemark());
if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
- }else {
+ } else {
one.setSummary(null);
}
one.setDoctorName(orderRemark.getDoctorName());
@@ -1391,12 +1410,13 @@
remarkService.updateById(one);
}
asyncService.updateCheckType(orderRemark.getTjNumber());
- asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
+ asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(), null, String.valueOf(orderRemark.getProId()));
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
- asyncService.updateCheckType(orderRemark.getTjNumber());
- asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
+// asyncService.updateCheckType(orderRemark.getTjNumber());
+// asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
}
+ remarkService.tjYishengjianchajianyi(null, null, null, null);
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
@@ -1423,184 +1443,205 @@
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");
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId, tjOrder.getOrderId());
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition, "N");
TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
- if(null !=tjFlowingWater && (tjFlowingWater.getPayStasus()!=1 || tjFlowingWater.getPayStasus()!=3)){
- if (configByKey.equals("Y")){
- HashMap<String, Object> hisRequestParams = new HashMap<>();
- // 涓嶅湪闇�瑕佽韩浠借瘉鍙�
- hisRequestParams.put("patientId",tjOrder.getCardId());
- log.info("ltkj--- "+DateUtil.date()+"鎿嶄綔浜篿d: "+userId+"鎿嶄綔绉戝: "+sysUser.getDeptId()+"鎿嶄綔鐨勪綋妫�浜�: "+tjNumber);
- AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
- if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
- int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
- if (sfsf > 0){
- log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 瀛樺湪鏈即璐归」鐩殑 灏卞崟鏁� "+sfsf);
- log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 瀛樺湪鏈即璐归」鐩殑 灏辫瘖鍙� "+tjOrder.getCardId()+" 浣撴鍙� "+tjOrder.getTjNumber());
- return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
+ if (null != tjFlowingWater) {
+ if (tjFlowingWater.getPayStasus() != 1 && tjFlowingWater.getPayStasus() != 3) {
+ if (configByKey.equals("Y")) {
+ HashMap<String, Object> hisRequestParams = new HashMap<>();
+ // 涓嶅湪闇�瑕佽韩浠借瘉鍙�
+ hisRequestParams.put("patientId", tjOrder.getCardId());
+ log.info("ltkj--- " + DateUtil.date() + "鎿嶄綔浜篿d: " + userId + "鎿嶄綔绉戝: " + sysUser.getDeptId() + "鎿嶄綔鐨勪綋妫�浜�: " + tjNumber);
+ AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
+ if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
+ int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
+ if (sfsf > 0) {
+ log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏卞崟鏁� " + sfsf);
+ log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏辫瘖鍙� " + tjOrder.getCardId() + " 浣撴鍙� " + tjOrder.getTjNumber());
+ return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
+ }
+ extracted(tjOrder, tjFlowingWater);
+ } else {
+ log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 鏈煡璇㈠埌缂磋垂璁板綍鐨� 灏辫瘖鍙� " + tjOrder.getCardId() + " 浣撴鍙� " + tjOrder.getTjNumber());
+ return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
}
- extracted(tjOrder, tjFlowingWater);
- }else {
- log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 鏈煡璇㈠埌缂磋垂璁板綍鐨� 灏辫瘖鍙� "+tjOrder.getCardId()+" 浣撴鍙� "+tjOrder.getTjNumber());
- return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
}
+// String s = configService.selectConfigByKey("is_request_common_his_api");
+// if (null != s && s.equals("Y")) {
+// LambdaQueryWrapper<TjFlowingWater> wrapper1 = new LambdaQueryWrapper<>();
+// wrapper1.eq(TjFlowingWater::getOrderId, tjOrder.getOrderId());
+// wrapper1.eq(TjFlowingWater::getPayStasus, 0L);
+// List<TjFlowingWater> list = tjFlowingWaterService.list(wrapper1);
+// if (!list.isEmpty()) {
+// return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
+// }
+// }
}
- }else {
- log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 鏈鎺is鎺ュ彛 "+" 浣撴鍙� "+tjOrder.getTjNumber());
+ } else {
+ log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 鏈鎺is鎺ュ彛 " + " 浣撴鍙� " + tjOrder.getTjNumber());
return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
}
+
String config = configService.selectConfigByKey("qt_open_xdt");
String byKey = configService.selectConfigByKey("qt_kjksid");
List<Integer> split = new ArrayList<>(); // 瀛樻斁杞崲鍚庣殑integer绫诲瀷缁撴灉
- if("Y".equals(config)){
+ if ("Y".equals(config)) {
List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
- if(null !=roles && roles.size()>0){
+ if (null != roles && !roles.isEmpty()) {
List<SysRole> list = roles.stream().filter(item -> item.getRoleName().contains("鍓嶅彴")).collect(Collectors.toList());
- if(list.size()>0){
- if(null !=ksId && ksId==100){
- ksId=999;
- }
- if(null !=byKey && !"".equals(byKey)){
+ if (!list.isEmpty()) {
+// if (null != ksId && ksId == 100) {
+// ksId = 999;
+// }
+ if (null != byKey && !byKey.isEmpty()) {
String[] arr = byKey.split(","); // 鏍规嵁閫楀彿杩涜鍒囧壊
for (String s : arr) {
int num = Integer.parseInt(s); // 灏嗘瘡涓瓙瀛楃涓茶浆鎹负integer绫诲瀷
split.add(num); // 娣诲姞鍒板垪琛ㄤ腑
}
}
- }else {
+ } else {
split.add(ksId);
}
- }else {
+ } else {
split.add(ksId);
}
- }else {
+ } else {
split.add(ksId);
}
- //鍒ゆ柇褰撳墠鐧婚檰鐨勪汉鏄笉鏄鐞嗗憳銆傜鐞嗗憳鍙互鐪嬪綋鍓嶄綋妫�鍙蜂笅鎵�鏈夐」鐩�
-// if (sysUser.getUserName().equals("10001")) {
-// QueryWrapper<TjOrderRemark> wqq = new QueryWrapper<>();
-// wqq.eq("tj_number", tjNumber);
-// List<TjOrderRemark> listq = remarkService.list(wqq);
-// if (listq.size() == 0) {
-// return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
-// }
-// for (TjOrderRemark tjOrderRemark : listq) {
-// TjProject tjProjectq = projectService.getById(tjOrderRemark.getProId());
-// if (null != tjProjectq) {
-// tjOrderRemark.setProName(tjProjectq.getProName());
-// }
-// }
-// return AjaxResult.success(listq);
+// LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
+// if ((null != sysUser && !sysUser.getUserName().equals("10001")) && 100!=ksId) {
+// wq2.in(TjProject::getDeptId,split);
// }
- LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
- if ((null != sysUser && !sysUser.getUserName().equals("10001")) && 100!=ksId) {
- wq2.in(TjProject::getDeptId,split);
- }
- //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
- 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) {
- return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
- }
- LambdaQueryWrapper<TjOrder> wqqq = new LambdaQueryWrapper<>();
- wqqq.eq(TjOrder::getTjNumber, tjNumber);
- TjOrder one = orderService.getOne(wqqq);
- if (null != one) {
- LambdaQueryWrapper<TjOrderDetail> wqq = new LambdaQueryWrapper<>();
- wqq.eq(TjOrderDetail::getOrderId, one.getOrderId());
- wqq.isNotNull(TjOrderDetail::getFlowingWaterId);
- wqq.in(TjOrderDetail::getProId, proIdList);
- wqq.notIn(TjOrderDetail::getProId, proIdList,projectService.getNneedReprotProId());
- List<TjOrderDetail> detailList = detailService.list(wqq);
- if (detailList != null && detailList.size() > 0) {
- List<Long> collect = detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList());
- QueryWrapper<TjOrderRemark> wq = new QueryWrapper<>();
- wq.eq("tj_number", tjNumber);
- wq.in("pro_id", collect);
- wq.ne("type", 2);
- wq.ne("dept_id",241);
- wq.notIn("pro_id", proIdList,projectService.getNneedReprotProId());
- List<TjOrderRemark> list = remarkService.list(wq);
- if (list.size() == 0) {
- return AjaxResult.success("璇ョ瀹や笅鏃犻」鐩紒");
- }
- for (TjOrderRemark tjOrderRemark : list) {
- TjProject tjProject = projectService.getById(tjOrderRemark.getProId());
- if (null != tjProject) {
- tjOrderRemark.setProName(tjProject.getProName());
- }
- }
- return AjaxResult.success(list);
+// //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
+// wq2.eq(TjProject::getNeedReport,"Y");
+// List<TjProject> Deptlist = projectService.list(wq2);
+// List<Long> proIdList = Deptlist.stream().map(TjProject::getProId).collect(Collectors.toList());
+// if (Deptlist.isEmpty() || proIdList.isEmpty()) {
+// return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
+// }
+
+
+ List<TjOrderRemark> list;
+ if(null != sysUser && sysUser.getUserName().equals("10001")){
+ list=remarkService.yiShengJianChaGetPrentProCJGLY(tjNumber);
+ }else {
+ list= remarkService.yiShengJianChaGetPrentPro(tjNumber, split);
}
- return AjaxResult.success();
- }
- return AjaxResult.error();
+
+ if (null ==list || list.isEmpty()) {
+ return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
+ }
+ for (TjOrderRemark tjOrderRemark : list) {
+ TjProject tjProject = projectService.getById(tjOrderRemark.getProId());
+ if (null != tjProject) {
+ tjOrderRemark.setProName(tjProject.getProName());
+ }
+ }
+
+ return AjaxResult.success(list);
+
+
+// LambdaQueryWrapper<TjOrderDetail> wqq = new LambdaQueryWrapper<>();
+// wqq.eq(TjOrderDetail::getOrderId, one.getOrderId());
+// wqq.isNotNull(TjOrderDetail::getFlowingWaterId);
+// wqq.in(TjOrderDetail::getProId, proIdList);
+// wqq.notIn(TjOrderDetail::getProId, proIdList,projectService.getNneedReprotProId());
+// List<TjOrderDetail> detailList = detailService.list(wqq);
+// if (detailList != null && !detailList.isEmpty()) {
+// List<Long> collect = detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList());
+// QueryWrapper<TjOrderRemark> wq = new QueryWrapper<>();
+// wq.eq("tj_number", tjNumber);
+// wq.in("pro_id", collect);
+// wq.ne("type", 2);
+// wq.ne("dept_id",241);
+// wq.notIn("pro_id", proIdList,projectService.getNneedReprotProId());
+// List<TjOrderRemark> list = remarkService.list(wq);
+// if (list.isEmpty()) {
+// return AjaxResult.success("璇ョ瀹や笅鏃犻」鐩紒");
+// }
+// for (TjOrderRemark tjOrderRemark : list) {
+// TjProject tjProject = projectService.getById(tjOrderRemark.getProId());
+// if (null != tjProject) {
+// tjOrderRemark.setProName(tjProject.getProName());
+// }
+// }
+// return AjaxResult.success(list);
+// }
+// return AjaxResult.success();
+// }
+
+}
+
+@Transactional
+public void extracted(TjOrder tjOrder, TjFlowingWater tjFlowingWater) {
+ tjFlowingWater.setPayStasus(1L);
+ tjFlowingWater.setPayType(0L);
+ tjFlowingWater.setTollCollectorId("148");
+ tjFlowingWaterService.updateById(tjFlowingWater);
+ Long tjSerialNumber = tjFlowingWater.getTjSerialNumber();
+ LambdaQueryWrapper<TjOrderDetail> tjOrderDetailLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjOrderDetailLambdaQueryWrapper.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
+ List<TjOrderDetail> tjOrderDetails = detailService.list(tjOrderDetailLambdaQueryWrapper);
+ List<Long> detailIds = tjOrderDetails.stream().map(TjOrderDetail::getOrderDetailId).collect(Collectors.toList());
+ LambdaUpdateWrapper<TjOrderDetail> tjOrderDetailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ tjOrderDetailLambdaUpdateWrapper.set(TjOrderDetail::getFlowingWaterId, tjSerialNumber);
+ tjOrderDetailLambdaUpdateWrapper.in(TjOrderDetail::getOrderDetailId, detailIds);
+ detailService.update(tjOrderDetailLambdaUpdateWrapper);
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString());
+}
+
+/**
+ * 鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏
+ *
+ * @return
+ */
+@GetMapping("/getOrderDetailByProParentId")
+@ApiOperation("鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏")
+public AjaxResult getOrderDetailByProParentId(@ApiParam(value = "鐖堕」鐩甶d") @RequestParam String proParentId,
+ @ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
+ if (null == SecurityUtils.getLoginUser().getUserId() || null == userService.getById(SecurityUtils.getLoginUser().getUserId())) {
+ return AjaxResult.error("鑾峰彇鐢ㄦ埛淇℃伅閿欒");
}
- @Transactional
- public void extracted(TjOrder tjOrder, TjFlowingWater tjFlowingWater) {
- tjFlowingWater.setPayStasus(1L);
- tjFlowingWater.setPayType(0L);
- tjFlowingWater.setTollCollectorId("148");
- tjFlowingWaterService.updateById(tjFlowingWater);
- Long tjSerialNumber = tjFlowingWater.getTjSerialNumber();
- LambdaQueryWrapper<TjOrderDetail> tjOrderDetailLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tjOrderDetailLambdaQueryWrapper.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
- List<TjOrderDetail> tjOrderDetails = detailService.list(tjOrderDetailLambdaQueryWrapper);
- List<Long> detailIds = tjOrderDetails.stream().map(TjOrderDetail::getOrderDetailId).collect(Collectors.toList());
- LambdaUpdateWrapper<TjOrderDetail> tjOrderDetailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
- tjOrderDetailLambdaUpdateWrapper.set(TjOrderDetail::getFlowingWaterId,tjSerialNumber);
- tjOrderDetailLambdaUpdateWrapper.in(TjOrderDetail::getOrderDetailId,detailIds);
- detailService.update(tjOrderDetailLambdaUpdateWrapper);
+ TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
+
+ List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId, tjNumber);
+
+ if (null == proParentList || proParentList.isEmpty()) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("xiaoJieIds", null);
+ map.put("sons", projectService.list(new LambdaQueryWrapper<TjProject>().eq(TjProject::getProId, proParentId)));
+ map.put("xiaoJie", null);
+ map.put("remark", remark.getRemark());
+ return AjaxResult.success(map);
}
-
- /**
- * 鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏
- *
- * @return
- */
- @GetMapping("/getOrderDetailByProParentId")
- @ApiOperation("鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏")
- public AjaxResult getOrderDetailByProParentId(@ApiParam(value = "鐖堕」鐩甶d") @RequestParam String proParentId,
- @ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
- if (null == SecurityUtils.getLoginUser().getUserId() || null == userService.getById(SecurityUtils.getLoginUser().getUserId())) {
- return AjaxResult.error("鑾峰彇鐢ㄦ埛淇℃伅閿欒");
- }
-
- TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
-
- List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId,tjNumber);
-
- if (null == proParentList || proParentList.isEmpty()) {
- Map<String, Object> map = new HashMap<>();
- map.put("xiaoJieIds", null);
- map.put("sons", projectService.list(new LambdaQueryWrapper<TjProject>().eq(TjProject::getProId,proParentId)));
- map.put("xiaoJie", null);
- map.put("remark", remark.getRemark());
- return AjaxResult.success(map);
- }
- List<Long> proParentIdList = proParentList.stream().map(TjProject::getProId).collect(Collectors.toList());
- TjOrder one = orderService.getOrderByTjNum(tjNumber);
- if (null == one) {
- return AjaxResult.success("璇ョ敤鎴锋殏鏃舵病鏈変綋妫�鏁版嵁");
- }
- List<TjOrderDetail> tjOrderDetails = detailService.getTjOrderDetailListInProParentIdList(String.valueOf(one.getOrderId()), proParentIdList);
- List<TjOrderDetail> tjOrderDetailList=new ArrayList<>();
- TjCustomer customer = tjCustomerService.getById(one.getUserId());
- if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
- for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
- TjProject project = projectService.getById(tjOrderDetail.getProId());
+ List<Long> proParentIdList = proParentList.stream().map(TjProject::getProId).collect(Collectors.toList());
+ TjOrder one = orderService.getOrderByTjNum(tjNumber);
+ if (null == one) {
+ return AjaxResult.success("璇ョ敤鎴锋殏鏃舵病鏈変綋妫�鏁版嵁");
+ }
+ List<TjOrderDetail> tjOrderDetails = detailService.getTjOrderDetailListInProParentIdList(String.valueOf(one.getOrderId()), proParentIdList);
+ List<TjOrderDetail> tjOrderDetailList = new ArrayList<>();
+// TjCustomer customer = tjCustomerService.getById(one.getUserId());
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
+ for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+ TjProject project = projectService.getById(tjOrderDetail.getProId());
+ if(null != project){
//鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
- if ("N".equals(project.getNeedReport())){
+ if ("N".equals(project.getNeedReport())) {
continue;
}
List<TjRules> rulesList = tjRulesService.getTjRulesListByTjNumAndProId(tjNumber, tjOrderDetail.getProId());
tjOrderDetail.setRulesList(rulesList);
tjOrderDetail.setProject(project);
+ tjOrderDetail.setResultType(project.getResultType());
if (null != remark.getDoctorName()) {
SysUser byId = userService.getById(remark.getDoctorName());
if (byId != null) {
@@ -1609,141 +1650,208 @@
} else {
tjOrderDetail.setDoctorName(null);
}
+ if(StringUtil.isBlank(tjOrderDetail.getProResult())){
+ tjOrderDetail.setProResult(project.getProDefault());
+ }
tjOrderDetailList.add(tjOrderDetail);
}
}
- Map<String, Object> map = new HashMap<>();
- List<TjAdvice> adviceList = new ArrayList<>();
- if (null != remark) {
- String[] strings = StringUtils.split(remark.getSummary(), ";");
- if(null !=strings && strings.length>0){
- List<TjAdvice> list = tjAdviceService.getAdviceStringByIds(strings);
- adviceList.addAll(list);
- }
- map.put("xiaoJieIds", StringUtils.split(remark.getSummary(), ";"));
- } else {
- map.put("xiaoJieIds", null);
+ }
+ Map<String, Object> map = new HashMap<>();
+ List<TjAdvice> adviceList = new ArrayList<>();
+ if (null != remark) {
+ String[] strings = StringUtils.split(remark.getSummary(), ";");
+ if (null != strings && strings.length > 0) {
+ List<TjAdvice> list = tjAdviceService.getAdviceStringByIds(strings);
+ adviceList.addAll(list);
}
- map.put("sons", tjOrderDetailList);
- map.put("xiaoJie", adviceList);
- map.put("remark", remark.getRemark());
+ map.put("xiaoJieIds", StringUtils.split(remark.getSummary(), ";"));
+ } else {
+ map.put("xiaoJieIds", null);
+ }
+ map.put("sons", tjOrderDetailList);
+ map.put("xiaoJie", adviceList);
+ map.put("remark", remark.getRemark());
// asyncService.getOrderDetailByProParentId(tjNumber,map,proParentId);
- return AjaxResult.success(map);
+ return AjaxResult.success(map);
+}
+
+/**
+ * 鐘舵�佷慨鏀�
+ */
+@PutMapping("/changeStatus")
+@ApiOperation("閮ㄩ棬鐘舵�佷慨鏀�")
+public AjaxResult changeStatus(@RequestBody SysDept dept) {
+ //鍒ゆ柇鏄惎鐢ㄨ繕鏄�
+ if ("1".equals(dept.getStatus())) {
+ //鍒ゆ柇鐢ㄦ埛琛ㄤ腑鏈夋病鏈変汉鍦ㄨ绉戝涓�
+ LambdaQueryWrapper<SysUser> wq = new LambdaQueryWrapper<>();
+ wq.eq(SysUser::getDeptId, dept.getDeptId());
+ List<SysUser> list = userService.list(wq);
+ if (!list.isEmpty()) {
+ return AjaxResult.error("璇ョ瀹や笅鏈夊伐浣滀汉鍛橈紝涓嶈兘鍋滅敤锛�");
+ }
}
-
- /**
- * 鐘舵�佷慨鏀�
- */
- @PutMapping("/changeStatus")
- @ApiOperation("閮ㄩ棬鐘舵�佷慨鏀�")
- public AjaxResult changeStatus(@RequestBody SysDept dept) {
- //鍒ゆ柇鏄惎鐢ㄨ繕鏄�
- if ("1".equals(dept.getStatus())) {
- //鍒ゆ柇鐢ㄦ埛琛ㄤ腑鏈夋病鏈変汉鍦ㄨ绉戝涓�
- LambdaQueryWrapper<SysUser> wq = new LambdaQueryWrapper<>();
- wq.eq(SysUser::getDeptId, dept.getDeptId());
- List<SysUser> list = userService.list(wq);
- if (list.size() != 0) {
- return AjaxResult.error("璇ョ瀹や笅鏈夊伐浣滀汉鍛橈紝涓嶈兘鍋滅敤锛�");
- }
- }
- dept.setUpdateBy(getUsername());
- int i = deptService.updateDeptStatus(dept);
- if (i == 0) {
- return AjaxResult.error("淇敼澶辫触");
- }
- return AjaxResult.success("淇敼鎴愬姛");
-
+ dept.setUpdateBy(getUsername());
+ int i = deptService.updateDeptStatus(dept);
+ if (i == 0) {
+ return AjaxResult.error("淇敼澶辫触");
}
+ return AjaxResult.success("淇敼鎴愬姛");
+
+}
- /**
- * 鏍规嵁椤圭洰id鑾峰彇寤鸿
- */
- @GetMapping("/getDeptAdvice")
- @ApiOperation(value = "鏍规嵁椤圭洰id鑾峰彇寤鸿")
- public AjaxResult getDeptAdvice(@ApiParam(value = "鐖堕」鐩」鐩甶d") @RequestParam(required = false) String proId,
- @ApiParam(value = "鍐呭") @RequestParam(required = false) String nr,
- @ApiParam(value = "鎷奸煶鐮�") @RequestParam(required = false) String pym,
- @ApiParam(value = "椤电爜") @RequestParam(defaultValue ="1") int page,
- @ApiParam(value = "姣忛〉灞曠ず鏉℃暟") @RequestParam(defaultValue ="10") int pageSize) {
- LambdaQueryWrapper<TjAdvice> wq1 = new LambdaQueryWrapper<>();
- if(null !=proId){
- wq1.eq(TjAdvice::getProId, proId);
- }
- if(null !=nr && !nr.isEmpty()){
- wq1.like(TjAdvice::getTitle,nr);
- }else if (null !=pym && !pym.isEmpty()){
- wq1.like(TjAdvice::getTitle,pym);
- }
+/**
+ * 鏍规嵁椤圭洰id鑾峰彇寤鸿
+ */
+@GetMapping("/getDeptAdvice")
+@ApiOperation(value = "鏍规嵁椤圭洰id鑾峰彇寤鸿")
+public AjaxResult getDeptAdvice(@ApiParam(value = "鐖堕」鐩」鐩甶d") @RequestParam(required = false) String proId,
+ @ApiParam(value = "鍐呭") @RequestParam(required = false) String nr,
+ @ApiParam(value = "鎷奸煶鐮�") @RequestParam(required = false) String pym,
+ @ApiParam(value = "椤电爜") @RequestParam(defaultValue = "1") int page,
+ @ApiParam(value = "姣忛〉灞曠ず鏉℃暟") @RequestParam(defaultValue = "10") int pageSize) {
+ LambdaQueryWrapper<TjAdvice> wq1 = new LambdaQueryWrapper<>();
+ if (null != proId) {
+ wq1.eq(TjAdvice::getProId, proId);
+ }
+ if (null != nr && !nr.isEmpty()) {
+ wq1.like(TjAdvice::getTitle, nr);
+ } else if (null != pym && !pym.isEmpty()) {
+ wq1.like(TjAdvice::getTitle, pym);
+ }
// else {
// wq1.last("limit 20");
// }
- Page<TjAdvice> pages=new Page<>(page,pageSize);
- Page<TjAdvice> advicePage = tjAdviceService.page(pages, wq1);
- Map<String,Object> map=new HashMap<>();
- map.put("list",advicePage.getRecords());
- map.put("total",advicePage.getTotal());
+ Page<TjAdvice> pages = new Page<>(page, pageSize);
+ Page<TjAdvice> advicePage = tjAdviceService.page(pages, wq1);
+ Map<String, Object> map = new HashMap<>();
+ map.put("list", advicePage.getRecords());
+ map.put("total", advicePage.getTotal());
// List<TjAdvice> list = tjAdviceService.list(wq1);
- return AjaxResult.success(map);
+ return AjaxResult.success(map);
+}
+
+
+@GetMapping("/getAdviceByTjNumAndPro")
+@ApiOperation(value = "鏍规嵁椤圭洰id鍜屼綋妫�鍙疯幏鍙栧缓璁�")
+public AjaxResult getAdviceByTjNumAndPro(@ApiParam(value = "鐖堕」鐩」鐩甶d") @RequestParam String proId,
+ @ApiParam(value = "浣撴鍙�") @RequestParam String tjNum) {
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getProId, proId);
+ wq.eq(TjOrderRemark::getTjNumber, tjNum);
+ TjOrderRemark remark = remarkService.getOne(wq);
+ List<TjAdvice> list = null;
+ if (null != remark && !StringUtils.isBlank(remark.getSummary())) {
+ String[] strings = StringUtils.split(remark.getSummary(), ";");
+ if (null != strings && strings.length > 0) {
+ list = tjAdviceService.getAdviceStringByIds(strings);
+ }
}
+ return AjaxResult.success(list);
+}
+/**
+ * 鑾峰彇閮ㄩ棬鏍戝垪琛�
+ */
+//@PreAuthorize("@ss.hasPermi('system:dept:list')")
+@GetMapping("/deptTree")
+@ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�")
+public AjaxResult deptTree(SysDept dept) {
+ return success(deptService.selectDeptTreeList(dept));
+}
- @GetMapping("/getAdviceByTjNumAndPro")
- @ApiOperation(value = "鏍规嵁椤圭洰id鍜屼綋妫�鍙疯幏鍙栧缓璁�")
- public AjaxResult getAdviceByTjNumAndPro(@ApiParam(value = "鐖堕」鐩」鐩甶d") @RequestParam String proId,
- @ApiParam(value = "浣撴鍙�") @RequestParam String tjNum) {
- LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderRemark::getProId, proId);
- wq.eq(TjOrderRemark::getTjNumber,tjNum);
- TjOrderRemark remark = remarkService.getOne(wq);
- List<TjAdvice> list =null;
- if (null != remark && !StringUtils.isBlank(remark.getSummary())) {
- String[] strings = StringUtils.split(remark.getSummary(), ";");
- if(null !=strings && strings.length>0){
- list = tjAdviceService.getAdviceStringByIds(strings);
+@GetMapping("/deptTree111")
+@ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�1111111111")
+public AjaxResult deptTree111(SysDept dept) {
+ final List<TreeSelect> treeSelects = deptService.selectDeptTreeList1(dept);
+ return success(treeSelects);
+}
+
+
+/**
+ * 鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�
+ */
+@GetMapping("/getChildList")
+@ApiOperation(value = "鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�")
+public AjaxResult getChildList(String deptName) {
+ LambdaQueryWrapper<SysDept> wq = new LambdaQueryWrapper<>();
+ wq.ne(SysDept::getParentId, 0);
+ if (deptName != null) {
+ wq.like(SysDept::getDeptName, deptName);
+ }
+ List<SysDept> depts = deptService.list(wq);
+ return success(depts);
+}
+
+ @GetMapping("/getxmjgz")
+ @ApiOperation(value = "鍖荤敓妫�鏌ュ鑾峰彇椤圭洰瑙勫垯鍊�")
+ public AjaxResult getxmjgz(@RequestParam String proId,@RequestParam(required = false) String xmgz) {
+ LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjRules::getProId, proId);
+ if(StringUtil.isNotBlank(xmgz))wq.like(TjRules::getRuleStr,xmgz);
+ List<TjRules> list = tjRulesService.list(wq);
+ if(null !=list && !list.isEmpty()){
+ for (TjRules tjRules : list) {
+ if(null !=tjRules){
+ tjRules.setJm(PinyinUtil.getFirstLetter(tjRules.getRuleStr(),""));
+ }
}
}
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();
+// }
+// });
+// }
- /**
- * 鑾峰彇閮ㄩ棬鏍戝垪琛�
- */
- //@PreAuthorize("@ss.hasPermi('system:dept:list')")
- @GetMapping("/deptTree")
- @ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�")
- public AjaxResult deptTree(SysDept dept) {
- return success(deptService.selectDeptTreeList(dept));
+ List<CsProVo> list = getysjcProVos(tjNumber);
+ return AjaxResult.success(list);
}
-
- @GetMapping("/deptTree111")
- @ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�1111111111")
- public AjaxResult deptTree111(SysDept dept) {
- final List<TreeSelect> treeSelects = deptService.selectDeptTreeList1(dept);
- return success(treeSelects);
- }
-
-
- /**
- * 鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�
- */
- @GetMapping("/getChildList")
- @ApiOperation(value = "鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�")
- public AjaxResult getChildList(String deptName) {
- LambdaQueryWrapper<SysDept> wq=new LambdaQueryWrapper<>();
- wq.ne(SysDept::getParentId,0);
- if (deptName!=null){
- wq.like(SysDept::getDeptName,deptName);
+ 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();
+ }
+ });
}
- List<SysDept> depts = deptService.list(wq);
- return success(depts);
+ return list;
}
}
--
Gitblit v1.8.0