From 1b7ed7edb09aaecf68ddf3396ee007bc6eadf52a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 30 十二月 2024 17:04:09 +0800
Subject: [PATCH] zjh202412030
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 10 ++---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java | 6 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java | 3 +
ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml | 12 ++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 1
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 30 +++++++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 4 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 10 ++--
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java | 14 +++++++
9 files changed, 77 insertions(+), 13 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 8b4b1ff..99b3545 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
@@ -1239,6 +1239,7 @@
TjCustomer customer = customerService.getById(tjOrder.getUserId());
if (null != customer) {
customer.setCusNumber(customer.getCusNumber() + 1);
+ customer.setCardId("0");
if (customerService.updateById(customer)) {
asyncService.updateCheckType(tjNumber);
return AjaxResult.success("鎿嶄綔鎴愬姛");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index 0922451..31009db 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -496,7 +496,7 @@
String hospbm = sysConfigService.selectConfigByKey("common_api_service_hospbm");
HashMap<String, Object> isjd = new HashMap<>();
isjd.put("cusIdCard",tjCustomer.getCusIdcard());
-// isjd.put("compId",tjCustomer.getCompId());
+ isjd.put("compId","");
String isCreat = HttpClientUtils.sendPost(apiUrl+"/api/his/"+hospbm+"/isCreat", isjd);
JSONObject isCreatjsonObject = JSONUtil.parseObj(isCreat);
if (isCreatjsonObject.getStr("code").equals("200")){
@@ -513,11 +513,11 @@
map.put("cusName",tjCustomer.getCusName());
map.put("cusSex",tjCustomer.getCusSex());
map.put("cusIdCard",tjCustomer.getCusIdcard());
- map.put("compId",tjCustomer.getCompId());
+ map.put("compId","");
map.put("cusBrithday",tjCustomer.getCusBrithday() != null ? DateUtil.format(tjCustomer.getCusBrithday(), "yyyy-MM-dd") : "");
map.put("cusAddr",tjCustomer.getCusAddr());
map.put("cusPhone",tjCustomer.getCusPhone());
- map.put("compName",tjCustomer.getCompName());
+ map.put("compName","");
String post = HttpClientUtils.sendPost(apiUrl+"/api/his/"+hospbm+"/creat", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("code").equals("200")){
@@ -637,11 +637,11 @@
map.put("cusName",tjCustomer.getCusName());
map.put("cusSex",tjCustomer.getCusSex());
map.put("cusIdCard",tjCustomer.getCusIdcard());
- map.put("compId",tjCustomer.getCompId());
+ map.put("compId","");
map.put("cusBrithday",tjCustomer.getCusBrithday() != null ? DateUtil.format(tjCustomer.getCusBrithday(), "yyyy-MM-dd") : "");
map.put("cusAddr",tjCustomer.getCusAddr());
map.put("cusPhone",tjCustomer.getCusPhone());
- map.put("compName",tjCustomer.getCompName());
+ map.put("compName","");
String isCreat = HttpClientUtils.sendPost(apiUrl+"/api/his/"+hospbm+"/update", map);
JSONObject isCreatjsonObject = JSONUtil.parseObj(isCreat);
if (isCreatjsonObject.getStr("code").equals("200")){
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index 67163a4..1c856e1 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -23,6 +23,10 @@
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 net.sf.ehcache.constructs.scheduledrefresh.OverseerJob;
+import org.apache.ibatis.session.SqlSession;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
@@ -42,6 +46,7 @@
@RestController
@RequestMapping("/hosp/project")
@Api(tags = "浣撴椤圭洰绠＄悊")
+@Slf4j
public class TjProjectController extends BaseController {
@Resource
private ITjProjectService tjProjectService;
@@ -593,4 +598,29 @@
return AjaxResult.success(map);
}
+
+ @GetMapping("/plxgpym")
+ @ApiOperation(value = "鎵归噺淇敼鎷奸煶鐮�")
+ public AjaxResult plxgpym(@RequestParam String tbname,@RequestParam String zd,@RequestParam String pymzd) {
+ String sql="SELECT 1";
+ try {
+ sql="SELECT "+ zd +","+ pymzd +" FROM "+tbname;
+
+ List<Map<String,Object>> projectList = tjProjectService.zdysqlcx(sql);
+ if(null !=projectList && !projectList.isEmpty()){
+ for (Map<String, Object> map : projectList) {
+ Object zd1 = map.get("zd");
+ if(null !=zd1 && StringUtil.isNotBlank(zd1.toString())){
+ String letter = PinyinUtil.getFirstLetter(zd1.toString(), "");
+ sql="UPDATE "+ tbname +" "+ " set " +pymzd+" = "+ letter;
+ tjProjectService.zdysqlxg(sql);
+ }
+ }
+ }
+ return AjaxResult.success(projectList);
+ } catch (Exception e) {
+ log.info("sql鏌ヨ澶辫触"+ sql);
+ throw new RuntimeException(e);
+ }
+ }
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index b3a5d2b..ecdeb4e 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -2580,16 +2580,14 @@
@GetMapping("/tuanDuiYiChangBySex")
@ApiOperation(value = "鐢熸垚鍥㈤槦浣撴鎶ュ憡鈥斺�旂敺濂冲紓甯哥粨鏋滅粺璁�")
- public Map<String, List<Map<String, Object>>> tuanDuiYiChangBySex(@ApiParam(value = "鍗曚綅") @RequestParam String firmId,
- @ApiParam(value = "閮ㄩ棬") @RequestParam String firmDeptId) {
+ public Map<String, List<Map<String, Object>>> tuanDuiYiChangBySex(@ApiParam(value = "鍗曚綅") @RequestParam String dwname) {
Map<String, List<Map<String, Object>>> all = new HashMap<>();
LambdaQueryWrapper<TjOrder> wq2 = new LambdaQueryWrapper<>();
- wq2.eq(TjOrder::getFirmId, firmId);
- wq2.eq(TjOrder::getFirmDeptId, firmDeptId);
- wq2.eq(TjOrder::getTjType, "1");
- wq2.in(TjOrder::getStatus, 401, 402);
+ wq2.eq(TjOrder::getFirmName,dwname);
+ wq2.ne(TjOrder::getTjType, "2");
+// wq2.in(TjOrder::getStatus, 401, 402);
final List<TjOrder> list = tjOrderService.list(wq2);
List<String> tjNumberList = list.stream().map(TjOrder::getTjNumber).collect(Collectors.toList());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index a9c46f2..8a384d3 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -743,11 +743,11 @@
LambdaQueryWrapper<TjGroupingPro> wq = new LambdaQueryWrapper<>();
wq.eq(TjGroupingPro::getGroupingId, groupingId);
List<TjGroupingPro> proList = groupingProService.list(wq);
- if (null != proList && proList.size() > 0) {
+ if (null != proList && !proList.isEmpty()) {
for (TjGroupingPro groupingPro : proList) {
TjProject project = projectService.getById(groupingPro.getProId());
if (null != project) {
- if (project.getProType() == null || project.getProType().equals("")) {
+ if (project.getProType() == null || project.getProType().isEmpty()) {
groupingPro.setProType("2");
} else {
groupingPro.setProType(project.getProType());
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
index af82a22..b28c15b 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
@@ -191,4 +191,10 @@
List<List<?>> getTjHyBgList(Map<String,Object> map);
+
+// @Select("SELECT #{sql}")
+ List<Map<String, Object>> zdysqlcx(Map<String,Object> map);
+
+ void zdysqlxg(Map<String,Object> map);
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
index 06260c2..0a514fe 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
@@ -139,4 +139,7 @@
Map<String,Object> getTjHyBgList(Integer page,Integer pageSize,String pname,String pid,String pym,String checktype);
+
+ List<Map<String, Object>> zdysqlcx(String sql);
+ void zdysqlxg(String sql);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
index 8cbd698..d72358b 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
@@ -330,4 +330,18 @@
return map1;
}
+ @Override
+ public List<Map<String, Object>> zdysqlcx(String sql) {
+ Map<String,Object> map=new HashMap<>();
+ map.put("aaa",sql);
+ return tjProjectMapper.zdysqlcx(map);
+ }
+
+ @Override
+ public void zdysqlxg(String sql) {
+ Map<String,Object> map=new HashMap<>();
+ map.put("aaa",sql);
+ tjProjectMapper.zdysqlxg(map);
+ }
+
}
diff --git a/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml b/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
index b777a9a..c16e5b3 100644
--- a/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
@@ -176,6 +176,7 @@
where pro_id = #{proId}
</update>
+
<delete id="deleteTjProjectByProId" parameterType="Long">
delete
from tj_project
@@ -215,4 +216,15 @@
#{total,mode=OUT,jdbcType=INTEGER}
)}
</select>
+ <select id="zdysqlcx" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map">
+ {call tj_zdysqlcx(
+ #{aaa,mode=IN,jdbcType=VARCHAR}
+ )}
+
+ </select>
+ <select id="zdysqlxg" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map">
+ {call tj_zdysqlxg(
+ #{aaa,mode=IN,jdbcType=VARCHAR}
+ )}
+ </select>
</mapper>
--
Gitblit v1.8.0