From 6552e6cc5a0fc80decbbdc4455e232f88748f9ce Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 21 三月 2025 18:07:33 +0800
Subject: [PATCH] zjh20250321
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 18 ++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java | 3
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 144 ++++++++++++++++++++++++++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 3
ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml | 16 ++++
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java | 6 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java | 3
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 4 +
9 files changed, 199 insertions(+), 0 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
index 78d6b3e..ed0d806 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
@@ -13,12 +13,14 @@
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
+import com.ltkj.hosp.vodomain.CsProVo;
import com.ltkj.system.service.ISysConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
import com.ltkj.common.core.controller.BaseController;
@@ -189,4 +191,146 @@
public AjaxResult remove(@PathVariable String[] ids) {
return toAjax(tjXdPictureService.deleteTjXdPictureByIds(ids));
}
+
+
+
+ @GetMapping ("/getYxJcList")
+ @ApiOperation (value = "褰卞儚妫�鏌ュ垪琛�(楠ㄥ瘑搴﹀拰蹇冪數鍥�)")//0寰�1宸�
+ @Transactional
+ public AjaxResult getYxJcList(@ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer page,
+ @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
+ @ApiParam (value = "浣撴鍗曞彿") @RequestParam (required = false) String tjNumber,
+ @ApiParam (value = "鍗曚綅") @RequestParam (required = false) Long compId,
+ @ApiParam (value = "濮撳悕)") @RequestParam (required = false) String name,
+ @ApiParam (value = "濂楅鍚�)") @RequestParam (required = false) String tcm,
+ @ApiParam (value = "寮�濮嬫椂闂�") @RequestParam (required = false) String beginTime,
+ @ApiParam (value = "缁撴潫鏃堕棿") @RequestParam (required = false) String endTime) {
+
+// DateTime beginTimes = null;
+// DateTime endTimes = null;
+// if (null != beginTime && null != endTime) {
+// beginTimes = DateUtil.beginOfDay(DateUtil.parse(beginTime));
+// endTimes = DateUtil.endOfDay(DateUtil.parse(endTime));
+// }
+// //鍒濆鍖栦綋妫�璁㈠崟琛�
+// List<TjOrder> orderList = null;
+// List<TjCustomer> customerList = new ArrayList<>();
+// Map<String, Object> map = new HashMap<>();
+//
+// if (checkStatus == 0)
+// asyncService.wCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes));
+// if (checkStatus == 1)
+// asyncService.yCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes));
+//
+// //鏍规嵁濮撳悕鏌ヨ
+// if (null != name && !"".equals(name)) {
+// List<TjCustomer> list = customerService.getTjCustomerList(name);
+// if (null != list && list.size() > 0) {
+// List<TjCustomer> lists = new ArrayList<>();
+// for (TjCustomer customer : list) {
+// orderList = orderService.getCsTjOrderListByCusId(customer.getCusId());
+// if (null != orderList && orderList.size() > 0) {
+// for (TjOrder tjOrder : orderList) {
+// customer.setTjNumber(tjOrder.getTjNumber());
+// customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
+// customer.setOrderId(tjOrder.getOrderId());
+// customer.setTjTime(tjOrder.getCreateTime());
+// customer.setFinishTime(tjOrder.getFinishTime());
+// customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
+// customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+// customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
+// customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
+// if (tjOrder.getFirmId().equals("0")) {
+// customer.setTjCompName(null);
+// } else {
+// customer.setTjCompName(compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId()).getCnName());
+// }
+// lists.add(customer);
+// }
+// }
+// }
+// List<TjCustomer> customers = null;
+// if (lists.size() > 0) {
+// customers = lists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+// }
+// map.put("customers", customers);
+// map.put("total", lists.size());
+// return AjaxResult.success(map);
+// }
+// return AjaxResult.success("鏆傛棤鏁版嵁");
+// }
+//
+// //鏉′欢鏌ヨ
+// if (null != tjNumber || null != compId || (null != beginTime && null != endTime)) {
+// orderList = orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
+// return getResult(page, pageSize, orderList, customerList, map);
+// }
+//
+// List<TjCustomer> customers = null;
+// if (checkStatus == 0) {
+// customers = redisCache.getCacheMapValue("cScheck", "ws");
+// }
+// if (checkStatus == 1) {
+// customers = redisCache.getCacheMapValue("cScheck", "ys");
+// }
+// if (customers != null && customers.size() > 0) {
+// List<TjCustomer> customerLists = customers.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+// map.put("customers", customerLists);
+// map.put("total", customers.size());
+// return AjaxResult.success(map);
+// } else {
+// orderList = orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
+// return getResult(page, pageSize, orderList, customerList, map);
+// }
+ String value = String.valueOf(compId);
+ if (tjNumber == null) tjNumber = "";
+ if (compId == null) value = "";
+ if (name == null) name = "";
+ if (beginTime == null) beginTime = "";
+ if (endTime == null) endTime = "";
+ if (tcm == null) tcm = "";
+ return AjaxResult.success(orderService.getYxJcList(tjNumber, page, pageSize, value, beginTime, endTime, name,tcm));
+ }
+
+ @GetMapping ("/getYxJcXx")
+ @ApiOperation (value = "褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥鹃〉闈㈢偣鍑讳綋妫�浜哄憳灞曠ず浣撴椤圭洰鎺ュ彛")
+ public AjaxResult getYxJcXx(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
+ List<CsProVo> list = remarkService.getYxJcXx(tjNumber);
+ return AjaxResult.success(list);
+ }
+
+ @GetMapping ("/addYxJcXx")
+ @ApiOperation (value = "鎻愪氦褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥剧粨鏋滄帴鍙�")
+ @Transactional
+ public AjaxResult addYxJcXx(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber,
+ @ApiParam (value = "椤圭洰id") @RequestParam String proId,
+ @ApiParam (value = "妫�鏌ユ墍瑙�") @RequestParam String jcsj,
+ @ApiParam (value = "妫�鏌ョ粨璁�") @RequestParam String jcjl) {
+ TjOrder order = orderService.getOrderByTjNum(tjNumber);
+ if(null !=order){
+ TjProject project = projectService.getById(proId);
+ if(null !=project){
+ List<TjProject> projects = projectService.getTjProjectListBySoneId(proId);
+ LambdaQueryWrapper<TjOrderDetail>wq1=new LambdaQueryWrapper<>();
+ wq1.eq(TjOrderDetail::getProId,projects.get(0).getProParentId());
+ wq1.eq(TjOrderDetail::getOrderId,order.getOrderId());
+ TjOrderDetail detail = detailService.getOne(wq1);
+ if(null !=detail){
+ detail.setProResult(jcjl+"銆�"+jcsj);
+ detail.setTjStatus(1L);
+ detailService.updateById(detail);
+ LambdaQueryWrapper<TjOrderRemark>wq2=new LambdaQueryWrapper<>();
+ wq2.eq(TjOrderRemark::getProId,proId);
+ wq2.eq(TjOrderRemark::getTjNumber,tjNumber);
+ TjOrderRemark orderRemark = remarkService.getOne(wq2);
+ if(null !=orderRemark){
+ orderRemark.setType(1);
+ remarkService.updateById(orderRemark);
+ }
+ }
+ }
+ return AjaxResult.success();
+ }
+ return AjaxResult.error("鏆傛棤浣撴璁板綍");
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java
index 7e0992c..554487c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java
@@ -335,6 +335,8 @@
private String hisJzkh;
+ private String gl;
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
index ac7f7f5..494690f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -386,4 +386,7 @@
" a.deleted = 0 \n" +
" AND b.org_type = 2 \n")
List<String> getJianChaTjNum();
+
+
+ List<List<?>> getYxJcList(Map<String,Object> map);
}
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 871d133..fa65ef8 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
@@ -293,4 +293,7 @@
@Update("UPDATE tj_order_remark a SET a.deleted=1 WHERE a.remark_id=#{remarkId}")
void updateTjOrderRemarkdel(@Param("remarkId")String remarkId);
+
+ @Select("call tj_yxjcymxx(#{tjh,mode=IN})")
+ List<CsProVo> getYxJcXx(@Param("tjh")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 601dd80..a8ea5b7 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
@@ -11,6 +11,7 @@
import javax.validation.constraints.Size;
import java.util.List;
+import java.util.Map;
import java.util.Set;
/**
@@ -95,4 +96,6 @@
List<TjOrderRemark> shoufeiyemianyishoufei(String tjNumber,String jxbz);
List<TjOrderRemark> shoufeiyemianweishoufei(String tjNumber,String jxbz);
+
+ List<CsProVo> getYxJcXx(String tjNumber);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
index 4074d4c..018c85f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -188,4 +188,8 @@
void tjLispacstongbujianyi(String tjNumber, Long deptId,String nickName, Long userId);
Map<String, Object> getTjBgdyList(Integer pageNum, Integer pageSize, Integer dyzt, String tjNum, String name, String dw, String djbeginTime, String djendTime);
+
+
+ //瀛樺偍杩囩▼涓撶敤鎺ュ彛(鍒濆)
+ Map<String,Object> getYxJcList(String tjNumber,Integer page,Integer pageSize, String compId, String beginTime, String endTime,String tjname,String tcm);
}
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 48cdf7e..c117953 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
@@ -193,4 +193,10 @@
return mapper.shoufeiyemianweishoufei(tjNumber,jxbz);
}
+ @Override
+ public List<CsProVo> getYxJcXx(String tjNumber) {
+ List<CsProVo> yxJcXx = mapper.getYxJcXx(tjNumber);
+ return yxJcXx;
+ }
+
}
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 192e96a..2225356 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
@@ -451,4 +451,22 @@
map1.put("total",map.get("total"));
return map1;
}
+
+ @Override
+ public Map<String, Object> getYxJcList(String tjNumber, Integer page, Integer pageSize, String compId, String beginTime, String endTime, String tjname,String tcm) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("page",page);
+ map.put("pageSize",pageSize);
+ map.put("tjNumber",tjNumber);
+ map.put("compId",compId);
+ map.put("tjname",tjname);
+ map.put("tcm",tcm);
+ map.put("beginTime",beginTime);
+ map.put("endTime",endTime);
+ List<List<?>> list = tjOrderMapper.getYxJcList(map);
+ Map<String,Object> map1=new HashMap<>();
+ map1.put("customers",list);
+ map1.put("total",map.get("total"));
+ return map1;
+ }
}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
index ff5cba0..ad5e7f3 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
@@ -412,4 +412,20 @@
)}
</select>
+
+
+ <select id="getYxJcList" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map">
+ {call tj_xdtgmd_list(
+ #{page,mode=IN,jdbcType=INTEGER},
+ #{pageSize,mode=IN,jdbcType=INTEGER},
+ #{tjNumber,mode=IN,jdbcType=VARCHAR},
+ #{compId,mode=IN,jdbcType=VARCHAR},
+ #{tjname,mode=IN,jdbcType=VARCHAR},
+ #{beginTime,mode=IN,jdbcType=VARCHAR},
+ #{endTime,mode=IN,jdbcType=VARCHAR},
+ #{tcm,mode=IN,jdbcType=VARCHAR},
+ #{total,mode=OUT,jdbcType=INTEGER}
+ )}
+ </select>
+
</mapper>
--
Gitblit v1.8.0