From a3721222ee4ef79211db6a4c5738205c4a381f7c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 19 三月 2025 10:08:43 +0800
Subject: [PATCH] zjh20250319
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 368 ----------------------------------------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 6
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjRules.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 124 +++++++------
4 files changed, 71 insertions(+), 429 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 b7214e4..869a18e 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
@@ -465,382 +465,14 @@
@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;
-// if (null != userId) {
-// sysUser = userService.getById(Long.valueOf(userId));
-// if (null != sysUser) {
-// ksId = Math.toIntExact(sysUser.getDeptId());
-// }
-// }
-// if (ksId == null) {
-// return AjaxResult.error("璇疯緭鍏ョ瀹d");
-// }
- //A30鍖栭獙
- //鏍规嵁褰撳墠鐧婚檰鐨勪汉鐨勭瀹d锛岃幏鍙栬绉戝涓嬬殑鎵�鏈夐」鐩�
-// List<Long> postIds = sysUser.getPostIds();
- List<Long> ksproList = null;
-// if (postIds != null) {
-// for (Long postId : postIds) {
-// LambdaQueryWrapper<SysUserPost> wq111 = new LambdaQueryWrapper<>();
-// wq111.eq(SysUserPost::getPostId, postId);
-// SysUserPost one = userPostService.getOne(wq111);
-// if (one != null) {
-// SysPost byId = postService.getById(one.getPostId());
-// if (byId.getPostName().equals("褰曞叆鍛�")) {
-// ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId));
-// }
-// }
-// }
-// } else {
-// ksproList = projectService.getKsTjProjectIdList();
-// }
-
-// if(sysUser.getUserName().equals("10001")){
- ksproList = projectService.getHuaYanProId();
-// }
-// else {
-// ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId));
-// }
-
- if (ksproList == null || ksproList.size() == 0) {
- return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
- }
- //绛涢�夊寲楠岀殑椤圭洰銆�
-// ksproList = ksproList.stream()
-// .filter(element -> element ==1633660948860522629L)
-// .collect(Collectors.toList());
-
- List<TjCustomer> customerLis = new ArrayList<>();
-
-/* //鏍规嵁浣撴鍙锋煡
- if (null != tjNumber) {
- List<TjOrder> orderList = orderService.getOrderListByLikeTjNum(tjNumber);
- if (null == orderList) {
- return AjaxResult.success("鏆傛椂娌℃湁鏁版嵁");
- }
- for (TjOrder order : orderList) {
- List<TjOrderDetail> list = Optional.ofNullable(detailService.getTjOrderDetailListByOrderId(String.valueOf(order.getOrderId()))).get();
- if (list.size() == 0) {
- continue;
- }
- LambdaQueryWrapper<TjOrderRemark> wqs = new LambdaQueryWrapper<>();
- wqs.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
- wqs.in(TjOrderRemark::getType, 0,3);
- List<TjOrderRemark> lists = remarkService.list(wqs);
- TjCustomer customer = customerService.getById(order.getUserId());
- //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
- for (TjOrderDetail tjOrderDetail11 : list) {
- customer.setIsPositive(tjOrderDetail11.getIsPositive());
- if (tjOrderDetail11.getIsPositive()==1){
- break;
- }
- }
- customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
- customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
- if (null != lists && lists.size() > 0) {
- StringBuilder stringBuilder = new StringBuilder();
- for (TjOrderRemark remark : lists) {
- TjProject byId = projectService.selectTjProjectByProId(remark.getProId());
- TjOrderDetail one = detailService.getTjOrderDetailByOrderId(String.valueOf(order.getOrderId()), String.valueOf(byId.getProId()));
- if (one.getFlowingWaterId() != null) {
- stringBuilder.append(byId.getProName()).append(";");
- }
-
- }
- customer.setNotCheckeds(String.valueOf(stringBuilder));
- customer.setTjStatus(0L);
- } else {
- customer.setTjStatus(1L);
- customer.setNotCheckeds("鏃�");
- }
- if (order.getTjType().equals("1")) {
- customer.setTjType("鍥綋");
- }
- if (order.getTjType().equals("2")) {
- customer.setTjType("涓汉");
- }
- customer.setTjTime(order.getCreateTime());
- customer.setTjNumber(order.getTjNumber());
- customer.setOrderId(order.getOrderId());
- customer.setIsHz(order.getIsHz());
- customerLis.add(customer);
-
- }
- if (customerLis.size() > 0) {
- List<TjCustomer> customerList = customerLis.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- Collections.reverse(customerList);
- Map<String, Object> map = new HashMap<>();
- map.put("date", customerList);
- map.put("total", customerLis.size());
- return AjaxResult.success(map);
- } else {
- return AjaxResult.success("鏆傛棤鏁版嵁");
- }
- }
-
- //鏍规嵁濮撳悕鏌ヨ
- if (null != name && !"".equals(name)) {
- LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
- wq.like(TjCustomer::getCusName, name);
- List<TjCustomer> list = customerService.list(wq);
- List<TjCustomer> list11111 = new ArrayList<>();
- if (null != list && list.size() > 0) {
- for (TjCustomer customer : list) {
- customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
- customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
- List<TjOrder> orderList = orderService.getOrderListByCusId(String.valueOf(customer.getCusId()));
- if (null != orderList && orderList.size() > 0) {
- for (TjOrder order : orderList) {
- List<TjOrderDetail> list111 = Optional.ofNullable(detailService.getTjOrderDetailListByOrderId(String.valueOf(order.getOrderId()))).get();
- if (list111.size() == 0) {
- continue;
- }
- //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
- for (TjOrderDetail tjOrderDetail11 : list111) {
- customer.setIsPositive(tjOrderDetail11.getIsPositive());
- if (tjOrderDetail11.getIsPositive()==1){
- break;
- }
- }
- List<TjOrderRemark> lists = remarkService.getTjOrderRemarkListByYjNum(order.getTjNumber());
- if (null != lists && lists.size() > 0) {
- StringBuilder stringBuilder = new StringBuilder();
- for (TjOrderRemark remark : lists) {
- TjProject byId = projectService.selectTjProjectByProId(remark.getProId());
- TjOrderDetail one = detailService.getTjOrderDetailByOrderId(String.valueOf(order.getOrderId()), String.valueOf(byId.getProId()));
- if (one.getFlowingWaterId() != null) {
- stringBuilder.append(byId.getProName()).append(";");
- }
- }
- customer.setNotCheckeds(String.valueOf(stringBuilder));
- if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉");
- customer.setTjStatus(0L);
- } else {
- customer.setNotCheckeds("鏃�");
- customer.setTjStatus(1L);
- }
- if (order.getTjType().equals("1")) {
- customer.setTjType("鍥綋");
- }
- if (order.getTjType().equals("2")) {
- customer.setTjType("涓汉");
- }
- customer.setTjTime(order.getCreateTime());
- customer.setTjNumber(order.getTjNumber());
- customer.setOrderId(order.getOrderId());
- customer.setIsHz(order.getIsHz());
- list11111.add(customer);
- }
- }
- }
- if (list11111.size() == 0) {
- return AjaxResult.success("鏆傛棤鏁版嵁");
- }
- Map<String, Object> map = new HashMap<>();
- List<TjCustomer> customers = list11111.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- Collections.reverse(customers);
- map.put("customers", customers);
- map.put("total", list11111.size());
- return AjaxResult.success(map);
- } else {
- return AjaxResult.success("鏆傛棤鏁版嵁");
- }
- }
- List<TjCustomer> customerLists = null;*/
-// //鏍规嵁浣撴鍙锋煡
-// if (null != tjNumber) {
-// List<TjOrder> orderList = orderService.getOrderListByLikeTjNum(tjNumber);
-// if (null == orderList) {
-// return AjaxResult.success("鏆傛椂娌℃湁鏁版嵁");
-// }
-// for (TjOrder order : orderList) {
-// List<TjOrderDetail> list = Optional.ofNullable(detailService.getTjOrderDetailListByOrderId(String.valueOf(order.getOrderId()))).get();
-// if (list.size() == 0) {
-// continue;
-// }
-// LambdaQueryWrapper<TjOrderRemark> wqs = new LambdaQueryWrapper<>();
-// wqs.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
-// wqs.in(TjOrderRemark::getType, 0,3);
-// List<TjOrderRemark> lists = remarkService.list(wqs);
-// TjCustomer customer = customerService.getById(order.getUserId());
-//
-// //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
-// for (TjOrderDetail tjOrderDetail11 : list) {
-// customer.setIsPositive(tjOrderDetail11.getIsPositive());
-// if (tjOrderDetail11.getIsPositive()==1){
-// break;
-// }
-// }
-//
-// customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
-// customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
-// customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
-// if (null != lists && lists.size() > 0) {
-// StringBuilder stringBuilder = new StringBuilder();
-// for (TjOrderRemark remark : lists) {
-// TjProject byId = projectService.selectTjProjectByProId(remark.getProId());
-// TjOrderDetail one = detailService.getTjOrderDetailByOrderId(String.valueOf(order.getOrderId()), String.valueOf(byId.getProId()));
-// if (one.getFlowingWaterId() != null) {
-// stringBuilder.append(byId.getProName()).append(";");
-// }
-//
-// }
-// customer.setNotCheckeds(String.valueOf(stringBuilder));
-// customer.setTjStatus(0L);
-// } else {
-// customer.setTjStatus(1L);
-// customer.setNotCheckeds("鏃�");
-// }
-// if (order.getTjType().equals("1")) {
-// customer.setTjType("鍥綋");
-// }
-// if (order.getTjType().equals("2")) {
-// customer.setTjType("涓汉");
-// }
-// customer.setTjTime(order.getCreateTime());
-// customer.setTjNumber(order.getTjNumber());
-// customer.setOrderId(order.getOrderId());
-// customer.setIsHz(order.getIsHz());
-// customer.setTjCategory(order.getTjCategory());
-// customerLis.add(customer);
-// }
-// if (customerLis.size() > 0) {
-// List<TjCustomer> customerList = customerLis.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-// Collections.reverse(customerList);
-// Map<String, Object> map = new HashMap<>();
-// map.put("date", customerList);
-// map.put("total", customerLis.size());
-// return AjaxResult.success(map);
-// } else {
-// return AjaxResult.success("鏆傛棤鏁版嵁");
-// }
-// }
-//
-// //鏍规嵁濮撳悕鏌ヨ
-// if (null != name && !"".equals(name)) {
-// LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
-// wq.like(TjCustomer::getCusName, name);
-// List<TjCustomer> list = customerService.list(wq);
-// List<TjCustomer> list11111 = new ArrayList<>();
-// if (null != list && list.size() > 0) {
-// for (TjCustomer customer : list) {
-// customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
-// customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
-// customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
-// List<TjOrder> orderList = orderService.getOrderListByCusId(String.valueOf(customer.getCusId()));
-// if (null != orderList && orderList.size() > 0) {
-// for (TjOrder order : orderList) {
-// List<TjOrderDetail> list111 = Optional.ofNullable(detailService.getTjOrderDetailListByOrderId(String.valueOf(order.getOrderId()))).get();
-// if (list111.size() == 0) {
-// continue;
-// }
-// //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
-// for (TjOrderDetail tjOrderDetail11 : list111) {
-// customer.setIsPositive(tjOrderDetail11.getIsPositive());
-// if (tjOrderDetail11.getIsPositive()==1){
-// break;
-// }
-// }
-// List<TjOrderRemark> lists = remarkService.getTjOrderRemarkListByYjNum(order.getTjNumber());
-// if (null != lists && lists.size() > 0) {
-// StringBuilder stringBuilder = new StringBuilder();
-// for (TjOrderRemark remark : lists) {
-// TjProject byId = projectService.selectTjProjectByProId(remark.getProId());
-// TjOrderDetail one = detailService.getTjOrderDetailByOrderId(String.valueOf(order.getOrderId()), String.valueOf(byId.getProId()));
-// if (one.getFlowingWaterId() != null) {
-// stringBuilder.append(byId.getProName()).append(";");
-// }
-// }
-// customer.setNotCheckeds(String.valueOf(stringBuilder));
-// if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉");
-// customer.setTjStatus(0L);
-// } else {
-// customer.setNotCheckeds("鏃�");
-// customer.setTjStatus(1L);
-// }
-// if (order.getTjType().equals("1")) {
-// customer.setTjType("鍥綋");
-// }
-// if (order.getTjType().equals("2")) {
-// customer.setTjType("涓汉");
-// }
-// customer.setTjTime(order.getCreateTime());
-// customer.setTjNumber(order.getTjNumber());
-// customer.setOrderId(order.getOrderId());
-// customer.setIsHz(order.getIsHz());
-// customer.setTjCategory(order.getTjCategory());
-// list11111.add(customer);
-// }
-// }
-// }
-// if (list11111.size() == 0) {
-// return AjaxResult.success("鏆傛棤鏁版嵁");
-// }
-// Map<String, Object> map = new HashMap<>();
-// List<TjCustomer> customers = list11111.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-// Collections.reverse(customers);
-// map.put("customers", customers);
-// map.put("total", list11111.size());
-// return AjaxResult.success(map);
-// } else {
-// return AjaxResult.success("鏆傛棤鏁版嵁");
-// }
-// }
-// List<TjCustomer> customerLists = new ArrayList<>();
-
-// String key="*";
-// if(sysUser.isAdmin()){
-// key="ks"+":*";
-// }else {
-// key="ks:"+ksId+":*";
-// }
-// ScanOptions options = ScanOptions.scanOptions()
-// //杩欓噷鎸囧畾姣忔鎵弿key鐨勬暟閲�(寰堝鍗氬鐬庤瑕佹寚瀹欼nteger.MAX_VALUE锛岃繖鏍风殑璇濊窡 keys鏈変粈涔堝尯鍒紵)
-// .count(10000)
-// .match(key).build();
-// RedisSerializer<String> redisSerializer = (RedisSerializer<String>) redisTemplate.getKeySerializer();
-// 0鏈,1宸叉
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<>();
-// while(cursor.hasNext()){
-// String s = cursor.next().toString();
-// TjCustomer wj = redisCache.getCacheMapValue(s,"0");
-// if(null !=wj){
-// customers.add(wj);
-// }
-// }
-//// //鍒囪杩欓噷涓�瀹氳鍏抽棴锛屽惁鍒欎細鑰楀敖杩炴帴鏁般�傛姤Cannot get Jedis connection; nested exception is redis.clients.jedis.exceptions.JedisException: Could not get a
-// cursor.close();
-// customerLists = redisCache.getCacheMapValue(ksId + "ks", "wj");
map = deptService.getSysDeptHyAndYxYjWjCustomerList13("A30", name, tjNumber, 0, page, pageSize);
-// customerLists = customers;
}
if (type == 1) {
-// Cursor cursor = redisTemplate.executeWithStickyConnection(redisConnection -> new ConvertingCursor<>(redisConnection.scan(options), redisSerializer::deserialize));
-// List<TjCustomer> customers = new ArrayList<>();
-// while(cursor.hasNext()){
-// String s = cursor.next().toString();
-// TjCustomer wj = redisCache.getCacheMapValue(s,"1");
-// if(null !=wj){
-// customers.add(wj);
-// }
-// }
-//// //鍒囪杩欓噷涓�瀹氳鍏抽棴锛屽惁鍒欎細鑰楀敖杩炴帴鏁般�傛姤Cannot get Jedis connection; nested exception is redis.clients.jedis.exceptions.JedisException: Could not get a
-// cursor.close();
-// customerLists = redisCache.getCacheMapValue(ksId + "ks", "yj");
map = deptService.getSysDeptHyAndYxYjWjCustomerList13("A30", name, tjNumber, 1, page, pageSize);
-// customerLists = customers;
}
-// asyncService.dockerSetCustomerLisByRedis(ksproList, String.valueOf(ksId));
-// AjaxResult map = getAjaxResult(type, page, pageSize, ksproList, customerLis);
-// if (map != null) return map;
return AjaxResult.success(map);
}
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 f5413de..a0f3052 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
@@ -815,7 +815,7 @@
resultMsg = "鍖栭獙椤圭洰鏆傛椂鏈嚭缁撴灉,璇风◢鍚庡悓姝�!!!";
}
//鍚屾鍖栭獙椤圭洰
-// testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
}
/*鍚屾妫�鏌� his鎺ュ彛*/
if (null != jianChaBaoGaoDan && !jianChaBaoGaoDan.isEmpty()) {
@@ -892,9 +892,9 @@
else return AjaxResult.error(resultMsg);
}
//鍖栭獙
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
+// testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
//妫�鏌�
- jcsqdService.saveLtkjExamJcsqd(order.getCardId());
+// jcsqdService.saveLtkjExamJcsqd(order.getCardId());
return AjaxResult.success("鍚屾鎴愬姛");
}
return AjaxResult.error("鏈煡鍒拌浜哄憳浣撴璁板綍");
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 e7c76b4..86c1650 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
@@ -35,6 +35,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.DigestUtils;
@@ -58,6 +59,7 @@
@RestController
@RequestMapping("/hosp/customer")
@Api(tags = "瀹㈡埛绠＄悊鎺ュ彛")
+@Slf4j
public class TjCustomerController extends BaseController {
@Resource
private ITjCustomerService tjCustomerService;
@@ -628,17 +630,18 @@
@RepeatSubmit
public AjaxResult edit(@RequestBody @ApiParam(value = "瀹㈡埛瀵硅薄") TjCustomer tjCustomer) {
- TjCustomer customer = tjCustomerService.getById(tjCustomer.getCusId());
- if(null==customer){
- return AjaxResult.error("璇ヤ汉鍛樹笉瀛樺湪!");
- }
+ try {
+ TjCustomer customer = tjCustomerService.getById(tjCustomer.getCusId());
+ if(null==customer){
+ return AjaxResult.error("璇ヤ汉鍛樹笉瀛樺湪!");
+ }
- String cusPhone = tjCustomer.getCusPhone();
- if (null == cusPhone) {
- return AjaxResult.error("鎵嬫満鍙蜂笉鑳戒负绌�");
- }
- String sfjysfzh = sysConfigService.selectConfigByKey("sfjysfzh");
- String sfjysjh = sysConfigService.selectConfigByKey("sfjysjh");
+ String cusPhone = tjCustomer.getCusPhone();
+ if (null == cusPhone) {
+ return AjaxResult.error("鎵嬫満鍙蜂笉鑳戒负绌�");
+ }
+ String sfjysfzh = sysConfigService.selectConfigByKey("sfjysfzh");
+ String sfjysjh = sysConfigService.selectConfigByKey("sfjysjh");
//鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
if(sfjysfzh.equalsIgnoreCase("Y")){
@@ -655,59 +658,64 @@
}
- //鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
- if(sfjysjh.equalsIgnoreCase("Y")){
- if (!(MatchUtils.isMobileNO(tjCustomer.getCusPhone())))
- return AjaxResult.error("鎵嬫満鍙烽敊璇�");
- }
+ //鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
+ if(sfjysjh.equalsIgnoreCase("Y")){
+ if (!(MatchUtils.isMobileNO(tjCustomer.getCusPhone())))
+ return AjaxResult.error("鎵嬫満鍙烽敊璇�");
+ }
- tjCustomer.setCusPhone(cusPhone);
- tjCustomer.setPym(PinyinUtil.getFirstLetter(tjCustomer.getCusName(),""));
- if (tjCustomerService.updateById(tjCustomer)) {
- String config = sysConfigService.selectConfigByKey("sfkqdyhis");
- if (null != config && config.equals("Y")) {
- AjaxResult result = controller.Outpincreateapply(tjCustomer);
- String result1 = getAjaxResult(result);
- JSONObject object = getJSONObject(result1);
- String code = object.getStr("ResultCode");
- if (code.equals("0")) {
+ tjCustomer.setCusPhone(cusPhone);
+ tjCustomer.setPym(PinyinUtil.getFirstLetter(tjCustomer.getCusName(),""));
+ tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd"));
+ if (tjCustomerService.updateById(tjCustomer)) {
+ String config = sysConfigService.selectConfigByKey("sfkqdyhis");
+ if (null != config && config.equals("Y")) {
+ AjaxResult result = controller.Outpincreateapply(tjCustomer);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if (code.equals("0")) {
+ return AjaxResult.success();
+ }
+ return AjaxResult.error(object.getStr("ResultContent"));
+ }else {
+ String s = sysConfigService.selectConfigByKey("is_request_common_his_api");
+ if (null != s && s.equals("Y")){
+ String apiUrl = sysConfigService.selectConfigByKey("common_api_url");
+ String hospbm = sysConfigService.selectConfigByKey("common_api_service_hospbm");
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("pationId",tjCustomer.getPationId());
+ map.put("cardId",tjCustomer.getCardId());
+ map.put("cusName",tjCustomer.getCusName());
+ map.put("cusSex",tjCustomer.getCusSex());
+ map.put("cusIdCard",tjCustomer.getCusIdcard());
+ 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","");
+ String isCreat = HttpClientUtils.sendPost(apiUrl+"/api/his/"+hospbm+"/update", map);
+ JSONObject isCreatjsonObject = JSONUtil.parseObj(isCreat);
+ if (isCreatjsonObject.getStr("code").equals("200")){
+ // JSONObject data = isCreatjsonObject.getJSONObject("data");
+ // tjCustomer.setPationId(data.getStr("pationId"));
+ // tjCustomer.setCardId(data.getStr("cardId"));
+ // tjCustomer.setHisJzkh(data.getStr("cardId"));
+ // if (tjCustomerService.updateById(tjCustomer)) {
+ return AjaxResult.success(tjCustomer);
+ // }
+ }else {
+ return AjaxResult.error();
+ }
+ }
return AjaxResult.success();
}
- return AjaxResult.error(object.getStr("ResultContent"));
- }else {
- String s = sysConfigService.selectConfigByKey("is_request_common_his_api");
- if (null != s && s.equals("Y")){
- String apiUrl = sysConfigService.selectConfigByKey("common_api_url");
- String hospbm = sysConfigService.selectConfigByKey("common_api_service_hospbm");
- HashMap<String, Object> map = new HashMap<>();
- map.put("pationId",tjCustomer.getPationId());
- map.put("cardId",tjCustomer.getCardId());
- map.put("cusName",tjCustomer.getCusName());
- map.put("cusSex",tjCustomer.getCusSex());
- map.put("cusIdCard",tjCustomer.getCusIdcard());
- 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","");
- String isCreat = HttpClientUtils.sendPost(apiUrl+"/api/his/"+hospbm+"/update", map);
- JSONObject isCreatjsonObject = JSONUtil.parseObj(isCreat);
- if (isCreatjsonObject.getStr("code").equals("200")){
-// JSONObject data = isCreatjsonObject.getJSONObject("data");
-// tjCustomer.setPationId(data.getStr("pationId"));
-// tjCustomer.setCardId(data.getStr("cardId"));
-// tjCustomer.setHisJzkh(data.getStr("cardId"));
-// if (tjCustomerService.updateById(tjCustomer)) {
- return AjaxResult.success(tjCustomer);
-// }
- }else {
- return AjaxResult.error();
- }
- }
- return AjaxResult.success();
}
+ return AjaxResult.error();
+ } catch (Exception e) {
+ log.error(e.toString());
+ throw new RuntimeException(e);
}
- return AjaxResult.error();
}
/**
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjRules.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjRules.java
index a3810df..b281839 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjRules.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjRules.java
@@ -158,6 +158,8 @@
//寤鸿鏍囬
private String adviceBt;
+ private String yxbx;
+
@TableField(exist = false)
private String jm;
--
Gitblit v1.8.0