From 15cff7198e70b26b8b97779430e0b1bcce23e2de Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 28 四月 2025 18:12:27 +0800
Subject: [PATCH] zjh20250428
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProAdvicerulesMapper.java | 4
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java | 5
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 19 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjCustomerService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProAdvicerulesService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProAdvicerulesServiceImpl.java | 4
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java | 3
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 445 +++++++++++++++++++++++++------------------------
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java | 3
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 10
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 7
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCustomerServiceImpl.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java | 6
14 files changed, 281 insertions(+), 239 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 3084389..8c95eaa 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
@@ -2995,12 +2995,7 @@
* @param customer
*/
private void notHuaYanData(String tjNumber, Map<TjOrderRemark, List<TjPdfVO>> printReport, TjOrder one, TjCustomer customer) {
-// LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
-// wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
-// wqq.ne(TjOrderRemark::getDeptId, "241");
-// wqq.in(TjOrderRemark::getDeptId, "269", "270", "253", "254", "255", "257");
-// wqq.notIn(TjOrderRemark::getProId, projectService.getNneedReprotProId());
-// List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
+
List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.notHuaYanData(tjNumber);
for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
printReport.put(tjOrderRemark, null);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index f59895e..6054b1b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -594,6 +594,7 @@
} else {
deptname = dept.getDeptName();
}
+ String xb= tjCustomerService.getSexByTjh(order.getTjNumber());
StringBuilder ssyszys = new StringBuilder();
StringBuilder ssyszyjgs = new StringBuilder();
@@ -628,7 +629,7 @@
for (String s : split) {
s = s.replaceAll("\n", "");
// Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
- Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0");
+ Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0",xb);
if (null != mapss && !mapss.isEmpty()) {
Object bt = mapss.get("bt");
Object nr = mapss.get("nr");
@@ -678,7 +679,7 @@
for (String s : split) {
s = s.replaceAll("\n", "");
// Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
- Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0");
+ Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0",xb);
if (null != mapss && !mapss.isEmpty()) {
Object bt = mapss.get("bt");
Object nr = mapss.get("nr");
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 2e47633..1467b3f 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
@@ -210,14 +210,6 @@
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
-// List<Long> ksproList = null;
-//
-// ksproList = projectService.getHuaYanProId();
-//
-// if (ksproList == null || ksproList.isEmpty()) {
-// return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
-// }
-
Map<String, Object> map = null;
if (type == 0) {
map = deptService.getSysDeptHyAndYxYjWjCustomerList13("A30", name, tjNumber, 0, page, pageSize);
@@ -264,8 +256,6 @@
List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname, sex, null);
return AjaxResult.success(tjYxjcList);
}
-
-
/**
@@ -528,7 +518,7 @@
// }
logger.info("鎺ュ彛 DataSourceContextHolder ->{}", DataSourceContextHolder.getDataSourceKey());
logger.info("鎺ュ彛 DynamicDataSourceContextHolder ->{}", DynamicDataSourceContextHolder.getDataSourceType());
- asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order,orderRemark);
+ asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order, orderRemark);
LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
qww.eq(TjOrderDetail::getProId, orderRemark.getProId());
@@ -653,241 +643,264 @@
}
}
}
- List<TjOrderRemark> list;
- if(null != sysUser && sysUser.getUserName().equals("10001")){
- list=remarkService.yiShengJianChaGetPrentProCJGLY(tjNumber);
- }else {
- list= remarkService.yiShengJianChaGetPrentPro(tjNumber, split);
+ List<TjOrderRemark> list;
+ if (null != sysUser && sysUser.getUserName().equals("10001")) {
+ list = remarkService.yiShengJianChaGetPrentProCJGLY(tjNumber);
+ } else {
+ list = remarkService.yiShengJianChaGetPrentPro(tjNumber, split);
+ }
+ 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());
}
- 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);
-}
-
-@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("鑾峰彇鐢ㄦ埛淇℃伅閿欒");
+ }
+ return AjaxResult.success(list);
}
- TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
- List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId, tjNumber);
+ @GetMapping("/getParentListWs")
+ @ApiOperation(value = "鍖荤敓鐣岄潰澶栭�佽彍鍗�(鍙樉绀虹埗椤圭洰鍒楄〃)")
+// 淇敼鎸夌収绉戝鏌ヨ
+ public AjaxResult getParentListWs(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
+ TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
+ if (null == tjOrder) {
+ return AjaxResult.error("鏈壘鍒颁綋妫�璁板綍");
+ }
+ List<TjOrderRemark> list = remarkService.yiShengJianChaGetPrentProWs(tjNumber);
+ 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);
+ }
- if (null == proParentList || proParentList.isEmpty()) {
+ @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("鑾峰彇鐢ㄦ埛淇℃伅閿欒");
+ }
+
+ 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).orderByAsc(TjProject::getXh)));
+ 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<>();
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
+ for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+ TjProject project = projectService.getById(tjOrderDetail.getProId());
+ if (null != project) {
+ //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
+ 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) {
+ tjOrderDetail.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
+ }
+ } else {
+ tjOrderDetail.setDoctorName(null);
+ }
+ if (StringUtil.isBlank(tjOrderDetail.getProResult())) {
+ tjOrderDetail.setProResult(project.getProDefault());
+ }
+ tjOrderDetail.setXh(project.getXh());
+ tjOrderDetailList.add(tjOrderDetail);
+ }
+ }
+ }
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);
+ 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.put("sons", tjOrderDetailList.stream().sorted(Comparator.comparing(TjOrderDetail::getXh)).collect(Collectors.toList()));
+ map.put("xiaoJie", adviceList);
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<>();
- if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
- for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
- TjProject project = projectService.getById(tjOrderDetail.getProId());
- if(null != project){
- //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
- 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) {
- tjOrderDetail.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
- }
- } else {
- tjOrderDetail.setDoctorName(null);
- }
- if(StringUtil.isBlank(tjOrderDetail.getProResult())){
- tjOrderDetail.setProResult(project.getProDefault());
- }
- tjOrderDetailList.add(tjOrderDetail);
+
+ /**
+ * 鐘舵�佷慨鏀�
+ */
+ @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("璇ョ瀹や笅鏈夊伐浣滀汉鍛橈紝涓嶈兘鍋滅敤锛�");
}
}
- }
- 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);
+ dept.setUpdateBy(getUsername());
+ int i = deptService.updateDeptStatus(dept);
+ if (i == 0) {
+ return AjaxResult.error("淇敼澶辫触");
}
- 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());
- return AjaxResult.success(map);
-}
+ return AjaxResult.success("淇敼鎴愬姛");
-/**
- * 鐘舵�佷慨鏀�
- */
-@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("璇ョ瀹や笅鏈夊伐浣滀汉鍛橈紝涓嶈兘鍋滅敤锛�");
+ }
+
+
+ /**
+ * 鏍规嵁椤圭洰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);
}
- }
- 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);
- }
+ 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);
+ @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);
}
- return AjaxResult.success(list);
-}
-/**
- * 鑾峰彇閮ㄩ棬鏍戝垪琛�
- */
+ /**
+ * 鑾峰彇閮ㄩ棬鏍戝垪琛�
+ */
//@PreAuthorize("@ss.hasPermi('system:dept:list')")
-@GetMapping("/deptTree")
-@ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�")
-public AjaxResult deptTree(SysDept dept) {
- return success(deptService.selectDeptTreeList(dept));
-}
-
-
-@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);
+ @GetMapping("/deptTree")
+ @ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�")
+ public AjaxResult deptTree(SysDept dept) {
+ return success(deptService.selectDeptTreeList(dept));
}
- List<SysDept> depts = deptService.list(wq);
- return success(depts);
-}
+
+
+ @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) {
+ 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);
+ if (StringUtil.isNotBlank(xmgz)) wq.like(TjRules::getRuleStr, xmgz);
List<TjRules> list = tjRulesService.list(wq);
- if(null !=list && !list.isEmpty()){
+ if (null != list && !list.isEmpty()) {
for (TjRules tjRules : list) {
- if(null !=tjRules){
- tjRules.setJm(PinyinUtil.getFirstLetter(tjRules.getRuleStr(),""));
+ if (null != tjRules) {
+ tjRules.setJm(PinyinUtil.getFirstLetter(tjRules.getRuleStr(), ""));
}
}
}
@@ -895,9 +908,9 @@
}
- @GetMapping ("/ysjcbGetProByTjNumAndOrderId")
- @ApiOperation (value = "鍖荤敓妫�鏌ラ〉闈㈡煡璇㈡楠屾鏌ラ」鐩帴鍙�")
- public AjaxResult ysjcbGetProByTjNumAndOrderId(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
+ @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) {
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 308051e..76d1235 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
@@ -1559,12 +1559,13 @@
if (dels.isEmpty()) {
continue;
}
- dels = dels.stream().sorted(Comparator.comparing(TjOrderDetail::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
- dels = dels.stream()
- .sorted(Comparator.comparingInt(
- tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
- ))
- .collect(Collectors.toList());
+// dels = dels.stream().sorted(Comparator.comparing(TjOrderDetail::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
+// dels = dels.stream()
+// .sorted(Comparator.comparingInt(
+// tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
+// ))
+// .collect(Collectors.toList());
+ dels = dels.stream().sorted(Comparator.comparing(TjOrderDetail::getXh)).collect(Collectors.toList());
parent.put("sons", dels);
parent.put("remark", remark.getRemark());
parent.put("jgbx", remark.getJgbx());
@@ -1744,6 +1745,7 @@
List<TjOrderYcxm> tjOrderYcxms = new ArrayList<>();
TjOrder order = orderService.getOrderByTjNum(tjNumber);
if (null != order) {
+ String xb= customerService.getSexByTjh(order.getTjNumber());
List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
@@ -1777,7 +1779,7 @@
for (String s : split) {
s = s.replaceAll("\n", "");
// Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
- Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0");
+ Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s.replaceAll(" ",""), "0",xb);
if (null != maps && !maps.isEmpty()) {
Object bt = maps.get("bt");
Object nr = maps.get("nr");
@@ -1837,6 +1839,7 @@
List<Map<String, Object>> list = new ArrayList<>();
TjOrder order = orderService.getOrderByTjNum(tjNumber);
if (null != order) {
+ String xb= customerService.getSexByTjh(order.getTjNumber());
List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
if (null != remarkList && !remarkList.isEmpty()) {
@@ -1865,7 +1868,7 @@
List<Map<String, Object>> mapList = new ArrayList<>();
for (String s : split) {
s = s.replaceAll("\n", "");
- Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0");
+ Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0",xb);
if (null != maps && !maps.isEmpty()) {
Object bt = maps.get("bt");
Object nr = maps.get("nr");
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
index aa08c6e..e35bae6 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
@@ -242,6 +242,9 @@
@TableField(exist = false)
private String orgType;
+ @TableField(exist = false)
+ private Integer xh;
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java
index 457e893..217f5a4 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java
@@ -110,4 +110,9 @@
List<Map<String ,Object >> getCusInfoList(String card);
List<Map<String ,Object >> getCusInfoListByCardAndName(@Param("card") String card,@Param("name") String name);
+
+
+ @Select("SELECT IF(b.cus_sex=0,'鐢�','濂�') xb FROM tj_order a JOIN tj_customer b ON b.cus_id=a.user_id \n" +
+ "WHERE a.tj_number=#{tjNumber}")
+ String getSexByTjh(String tjNumber);
}
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 05f88de..e7809ba 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
@@ -172,13 +172,12 @@
@Select("SELECT a.* FROM tj_order_remark a LEFT JOIN sys_dept b ON b.dept_id=a.dept_id LEFT JOIN tj_project c ON c.pro_id=a.pro_id\n" +
"\n" +
"WHERE a.deleted=0 AND b.org_type = 3 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
-// AND c.need_report='Y' guo
+
List<TjOrderRemark> notHuaYanData(String tjnumber);
@Select("SELECT a.* FROM tj_order_remark a LEFT JOIN sys_dept b ON b.dept_id=a.dept_id LEFT JOIN tj_project c ON c.pro_id=a.pro_id\n" +
"\n" +
"WHERE a.deleted=0 AND b.org_type = 2 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
-// AND c.need_report='Y' guo
List<TjOrderRemark> pacsJianChaData(String tjnumber);
@@ -289,4 +288,11 @@
@Select("call tj_yxjcymxx(#{tjh,mode=IN},#{ks,mode=IN})")
List<CsProVo> getYxJcXx(@Param("tjh")String tjNumber,@Param("ks")String ks);
+
+
+
+ @Select("SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id \n" +
+ " WHERE b.need_report='Y' AND b.pro_delivery=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} ")
+ List<TjOrderRemark> yiShengJianChaGetPrentProWs(String tjNumber);
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProAdvicerulesMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProAdvicerulesMapper.java
index bf6dabe..eeab6c9 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProAdvicerulesMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProAdvicerulesMapper.java
@@ -67,6 +67,6 @@
@Select("call tj_new_advicerules(\n" +
- " #{ks,mode=IN,jdbcType=VARCHAR},#{jg,mode=IN,jdbcType=VARCHAR},#{kslx,mode=IN,jdbcType=VARCHAR} )")
- Map<String, Object> getyichangxiangmujianyiguizeJianCha(@Param("ks") String ks,@Param("jg") String s,@Param("kslx") String kslx);
+ " #{ks,mode=IN,jdbcType=VARCHAR},#{jg,mode=IN,jdbcType=VARCHAR},#{kslx,mode=IN,jdbcType=VARCHAR},#{xb,mode=IN,jdbcType=VARCHAR} )")
+ Map<String, Object> getyichangxiangmujianyiguizeJianCha(@Param("ks") String ks,@Param("jg") String s,@Param("kslx") String kslx,@Param("xb") String xb);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjCustomerService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjCustomerService.java
index 4f17f35..b363cd3 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjCustomerService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjCustomerService.java
@@ -75,4 +75,6 @@
List<Map<String, Object>> vcustomerlist(String name, String sjh, String sfzh);
List<TjCustomer> getcusList(TjCustomer tjCustomer);
+
+ String getSexByTjh(String tjNumber);
}
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 1a8c57b..a7c678f 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
@@ -97,4 +97,7 @@
List<TjOrderRemark> shoufeiyemianweishoufei(String tjNumber,String jxbz);
List<CsProVo> getYxJcXx(String tjNumber, String string);
+
+
+ List<TjOrderRemark> yiShengJianChaGetPrentProWs(String tjNumber);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProAdvicerulesService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProAdvicerulesService.java
index 26a7f55..7bb10c2 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProAdvicerulesService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProAdvicerulesService.java
@@ -61,5 +61,5 @@
*/
public int deleteTjProAdvicerulesById(Long id);
- Map<String, Object> getyichangxiangmujianyiguizeJianCha(String ks, String s, String kslx);
+ Map<String, Object> getyichangxiangmujianyiguizeJianCha(String ks, String s, String kslx,String xb);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCustomerServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCustomerServiceImpl.java
index a352801..8f0210a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCustomerServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCustomerServiceImpl.java
@@ -128,4 +128,9 @@
public List<TjCustomer> getcusList(TjCustomer tjCustomer) {
return tjCustomerMapper.getcusList(tjCustomer);
}
+
+ @Override
+ public String getSexByTjh(String tjNumber) {
+ return tjCustomerMapper.getSexByTjh(tjNumber);
+ }
}
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 a9a82d8..526aab0 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
@@ -199,4 +199,10 @@
return yxJcXx;
}
+
+ @Override
+ public List<TjOrderRemark> yiShengJianChaGetPrentProWs(String tjNumber) {
+ return mapper.yiShengJianChaGetPrentProWs(tjNumber);
+ }
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProAdvicerulesServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProAdvicerulesServiceImpl.java
index 05c41d9..362ad16 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProAdvicerulesServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProAdvicerulesServiceImpl.java
@@ -92,7 +92,7 @@
}
@Override
- public Map<String, Object> getyichangxiangmujianyiguizeJianCha(String ks, String s, String kslx) {
- return tjProAdvicerulesMapper.getyichangxiangmujianyiguizeJianCha(ks,s,kslx);
+ public Map<String, Object> getyichangxiangmujianyiguizeJianCha(String ks, String s, String kslx,String xb) {
+ return tjProAdvicerulesMapper.getyichangxiangmujianyiguizeJianCha(ks,s,kslx,xb);
}
}
--
Gitblit v1.8.0