From afb813eece2ad30f5002fe896db6fb1449670722 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 18 十二月 2023 11:42:11 +0800
Subject: [PATCH] zjh 2023/12/18--2
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 8 ++--
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java | 4 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 23 +++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 62 ++++++++++++++++++-------------
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java | 6 +++
5 files changed, 73 insertions(+), 30 deletions(-)
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 d29fced..96f1748 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
@@ -215,33 +215,43 @@
@GetMapping("/cSWebGetProByTjNumAndOrderId")
@ApiOperation(value = "(鍒濆椤甸潰)鐐瑰嚮浣撴浜哄憳灞曠ず浣撴椤圭洰鎺ュ彛")
public AjaxResult cSWebGetProByTjNumAndOrderId(@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<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();
+// }
+// });
+// }
- Collections.sort(list, new Comparator<CsProVo>() {
- @Override
- public int compare(CsProVo o1, CsProVo o2) {
- return o1.getType() - o2.getType();
- }
- });
- }
+ List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber);
+ if(null !=list && list.size()>0){
+ list.sort(new Comparator<CsProVo>() {
+ @Override
+ public int compare(CsProVo o1, CsProVo o2) {
+ return o1.getType() - o2.getType();
+ }
+ });
+ }
return AjaxResult.success(list);
}
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 ad6d7df..1896fef 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjOrderRemark;
+import com.ltkj.hosp.vodomain.CsProVo;
import org.apache.ibatis.annotations.*;
/**
@@ -84,4 +85,26 @@
"LEFT JOIN tj_order_remark b ON a.pro_id=b.pro_id " +
"WHERE b.type !=2 AND b.pro_id != a.pro_id AND a.pac_id=#{pacId} AND b.tj_number=#{tjNumber}")
List<Long> getTjProIdsByTjNumAndPacIc1(@Param("tjNumber") String tjNumber,@Param("pacId") String pacId);
+
+
+ @Select("SELECT\n" +
+ "\tdep.dept_name,\n" +
+ "\tpro.pro_name,\n" +
+ "\tre.type,\n" +
+ "\tus.nick_name doctor_name,\n" +
+ "\tus.nick_name bcdoctor_name,\n" +
+ "\t'缁熸敹' sffs,\n" +
+ "\t'宸叉敹璐�' is_pay,\n" +
+ "\tre.create_time qdcreate_time,\n" +
+ "\tre.update_time bcupdate_time,\n" +
+ "\tre.update_time zhupdate_time \n" +
+ "FROM\n" +
+ "\ttj_order_remark re\n" +
+ "\tLEFT JOIN sys_dept dep ON re.dept_id = dep.dept_id\n" +
+ "\tLEFT JOIN tj_project pro ON re.pro_id = pro.pro_id\n" +
+ "\tLEFT JOIN sys_user us ON us.user_id = re.doctor_name \n" +
+ "WHERE\n" +
+ "\tre.type != 2 \n" +
+ "\tAND re.tj_number =#{tjNumber}")
+ List<CsProVo> cSWebGetProByTjNumAndOrderId(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 de80ece..21f1f3f 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.domain.TjOrderDetail;
import com.ltkj.hosp.domain.TjOrderRemark;
+import com.ltkj.hosp.vodomain.CsProVo;
import java.util.List;
@@ -38,4 +39,7 @@
List<Long> getTjProIdsByTjNumAndPacIc(String tjNumber,String pacId);
List<Long> getTjProIdsByTjNumAndPacIc1(String tjNumber,String pacId);
+
+ List<CsProVo> cSWebGetProByTjNumAndOrderId(String 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 c3503f6..d33b2b3 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
@@ -5,6 +5,7 @@
import com.ltkj.hosp.domain.TjOrderRemark;
import com.ltkj.hosp.mapper.TjOrderRemarkMapper;
import com.ltkj.hosp.service.ITjOrderRemarkService;
+import com.ltkj.hosp.vodomain.CsProVo;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -76,4 +77,9 @@
return mapper.getTjProIdsByTjNumAndPacIc1(tjNumber,pacId);
}
+ @Override
+ public List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber) {
+ return mapper.cSWebGetProByTjNumAndOrderId(tjNumber);
+ }
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
index cc91e72..da50d42 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -231,8 +231,8 @@
map.put("tjNumber",tjNumber);
map.put("compId",compId);
map.put("tjname",tjname);
- map.put("beginTime", DateUtil.beginOfDay(DateUtil.parse(beginTime)));
- map.put("endTime",DateUtil.beginOfDay(DateUtil.parse(endTime)));
+ map.put("beginTime",beginTime);
+ map.put("endTime",endTime);
List<List<?>> list = tjOrderMapper.getCunChuGuoChengCustomerList(map);
Map<String,Object> map1=new HashMap<>();
map1.put("customers",list);
@@ -250,8 +250,8 @@
map.put("tjNumber",tjNumber);
map.put("compId",compId);
map.put("tjname",tjname);
- map.put("beginTime", DateUtil.beginOfDay(DateUtil.parse(beginTime)));
- map.put("endTime",DateUtil.beginOfDay(DateUtil.parse(endTime)));
+ map.put("beginTime",beginTime);
+ map.put("endTime",endTime);
List<List<?>> list = tjOrderMapper.getCsCunChuGuoChengCustomerList(map);
Map<String,Object> map1=new HashMap<>();
map1.put("customers",list);
--
Gitblit v1.8.0