From e37740bcaa6a0dfdef6e082e4d8136b81d453000 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 09 七月 2024 18:16:48 +0800
Subject: [PATCH] zjh 2024/07/9-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 91 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 74 insertions(+), 17 deletions(-)
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 b5132d1..03f17cd 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
@@ -3,15 +3,21 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.extra.pinyin.PinyinUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ltkj.common.annotation.Log;
+import com.ltkj.common.annotation.RepeatSubmit;
+import com.ltkj.common.enums.BusinessType;
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
+import com.ltkj.hosp.domain.HisApiConfig;
import com.ltkj.hosp.domain.TjCustomerBlack;
import com.ltkj.hosp.domain.TjReservation;
import com.ltkj.hosp.hisDto.OutpinregapplyDto;
@@ -56,10 +62,12 @@
public class TjCustomerController extends BaseController {
@Resource
private ITjCustomerService tjCustomerService;
-
+ @Autowired
+ private HisApiGetMethodService hisApiGetMethodService;
@Resource
private ITjReservationService tjReservationService;
-
+ @Autowired
+ private HisApiConfigService hisApiConfigService;
@Resource
private ISysConfigService sysConfigService;
@@ -211,11 +219,11 @@
// controller.Outpincreateapply(tjCustomer);
- Date dates = new Date();
+/* Date dates = new Date();
final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
outpinregapplyDto.setPationid(tjCustomerServiceOne.getPationId());
- outpinregapplyDto.setSqysbm(SecurityUtils.getUsername());
+ outpinregapplyDto.setSqysbm("00029");
outpinregapplyDto.setMzksbm("0101");
outpinregapplyDto.setCzybm("00029");
outpinregapplyDto.setSfjz("0");
@@ -235,10 +243,12 @@
String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
//闂ㄨ瘖鍖荤敓鎺ヨ瘖
controller.Outpinconapply(hisRegistrationId, date, SecurityUtils.getUsername());
- tjCustomerServiceOne.setCardId(hisRegistrationId);
- tjCustomerService.updateById(tjCustomerServiceOne);
+// tjCustomerServiceOne.setCardId(hisRegistrationId);
+// tjCustomerServiceOne.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomerServiceOne.getCusIdcard()),"yyyy-MM-dd"));
+// tjCustomerService.updateById(tjCustomerServiceOne);
+ tjCustomerService.updateCardId(tjCustomerServiceOne.getCusId(),hisRegistrationId);
}
- }
+ }*/
}
//end====2023.12.12
@@ -306,7 +316,7 @@
tjCustomer1.setAge(tjReservation.getAge());
tjCustomer1.setAgeUnit(tjReservation.getAgeUnit());
tjCustomer1.setCareer(tjReservation.getCareer());
-
+ tjCustomer1.setPym(PinyinUtil.getFirstLetter(tjReservation.getName(),""));
tjCustomerService.updateById(tjCustomer1);
tjCustomer1.setTeamNo(tjReservation.getTeamNo());
tjCustomer1.setCompId(tjReservation.getCompanyId());
@@ -339,6 +349,7 @@
substring = DigestUtils.md5DigestAsHex(substring.getBytes());
tjCustomer.setCusPassword(substring);
tjCustomer.setTjType(tjReservation.getTjType());
+ tjCustomer.setPym(PinyinUtil.getFirstLetter(tjReservation.getName(),""));
tjCustomerService.save(tjCustomer);
tjCustomer.setTeamNo(tjReservation.getTeamNo());
tjCustomer.setCompId(tjReservation.getCompanyId());
@@ -347,6 +358,9 @@
tjCustomer.setGroupingId(tjReservation.getGroupingId());
return success(tjCustomer);
} else {
+ LambdaQueryWrapper<TjCustomer> customerLambdaQueryWrapper1 = new LambdaQueryWrapper<>();
+ customerLambdaQueryWrapper1.eq(TjCustomer::getCusIdcard, cusIdcard);
+ TjCustomer one = tjCustomerService.getOne(customerLambdaQueryWrapper1);
return AjaxResult.success("鏆傛棤棰勭害淇℃伅", tjCustomerServiceOne);
}
}
@@ -431,6 +445,7 @@
@PostMapping
@ApiOperation(value = "鏂板瀹㈡埛")
@Transactional
+ @RepeatSubmit
public AjaxResult add(@RequestBody @ApiParam(value = "瀹㈡埛瀵硅薄淇℃伅") TjCustomer tjCustomer) {
if (null == tjCustomer.getCusIdcard() || null == tjCustomer.getCusPhone()) {
return AjaxResult.error("璇疯緭鍏ヨ韩浠借瘉鍙锋垨鎵嬫満鍙�");
@@ -475,9 +490,10 @@
substring = DigestUtils.md5DigestAsHex(substring.getBytes());
tjCustomer.setCusPassword(substring);
// if (tjCustomer.getIdType().equals("1")) {
-// tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd"));
+ tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd"));
// }
tjCustomer.setCusNumber(0L);
+ tjCustomer.setPym(PinyinUtil.getFirstLetter(tjCustomer.getCusName(),""));
String config = sysConfigService.selectConfigByKey("sfkqdyhis");
if (null != config && config.equals("Y")) {
AjaxResult tjCustomer1 = suijieHisXinXi(tjCustomer, date);
@@ -501,13 +517,18 @@
if (null != resultData && resultData.size() > 0) {
String pationid = resultData.get("PationId").toString();
if (null != pationid) {
-
tjCustomer.setPationId(pationid);
-// tjCustomerService.updateById(tjCustomer);
- /*
- OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
+ tjCustomerService.updateById(tjCustomer);
+ //淇濆瓨娉ㄥ唽鍏ュ弬鍑哄弬
+ resultData.put("cardId",pationid);
+ JSONObject object4 = JSONUtil.parseObj(resultData);
+ LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpincreateapply");
+ HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
+ hisApiGetMethodService.save(object4, "Outpincreateapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(tjCustomer)));
+ /* OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
outpinregapplyDto.setPationid(pationid);
- outpinregapplyDto.setSqysbm(SecurityUtils.getUsername());
+ outpinregapplyDto.setSqysbm("00029");
outpinregapplyDto.setMzksbm("0101");
outpinregapplyDto.setCzybm("00029");
outpinregapplyDto.setSfjz("0");
@@ -548,17 +569,22 @@
return AjaxResult.success(tjCustomer);
}
}
- return null;
+ return AjaxResult.error(object.getStr("ResultContent"));
}
/**
* 淇敼瀹㈡埛淇℃伅
*/
//@PreAuthorize("@ss.hasPermi('hosp:customer:edit')")
- //@Log(title = "瀹㈡埛淇℃伅", businessType = BusinessType.UPDATE)
+ @Log(title = "瀹㈡埛淇℃伅", businessType = BusinessType.UPDATE)
@PutMapping
@ApiOperation(value = "淇敼瀹㈡埛淇℃伅")
public AjaxResult edit(@RequestBody @ApiParam(value = "瀹㈡埛瀵硅薄") TjCustomer tjCustomer) {
+
+ TjCustomer customer = tjCustomerService.getById(tjCustomer.getCusId());
+ if(null==customer){
+ return AjaxResult.error("璇ヤ汉鍛樹笉瀛樺湪!");
+ }
String cusPhone = tjCustomer.getCusPhone();
if (null == cusPhone) {
@@ -571,7 +597,38 @@
return AjaxResult.error("璇ユ墜鏈哄彿宸茶浣跨敤!");
}*/
tjCustomer.setCusPhone(cusPhone);
- return toAjax(tjCustomerService.updateTjCustomer(tjCustomer));
+ tjCustomer.setPym(PinyinUtil.getFirstLetter(tjCustomer.getCusName(),""));
+ if (tjCustomerService.updateById(tjCustomer)) {
+ String config = sysConfigService.selectConfigByKey("sfkqdyhis");
+ if (null != config && config.equals("Y")) {
+ tjCustomer.setPationId(customer.getPationId());
+ AjaxResult result = controller.Outpincreateapply(tjCustomer);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if (code.equals("0")) {
+ /* JSONArray resultDatass = object.getJSONArray("ResultData");
+ Map<String, Object> resultData = (Map<String, Object>) resultDatass.get(0);
+ if (null != resultData && resultData.size() > 0) {
+ String pationid = resultData.get("PationId").toString();
+ if (null != pationid) {
+ tjCustomer.setPationId(pationid);
+ tjCustomerService.updateById(tjCustomer);
+ }
+ }*/
+ //淇濆瓨淇敼鍏ュ弬鍑哄弬
+// object.putOpt("cardId",customer.getPationId());
+// LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+// lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpincreateapply");
+// HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
+// hisApiGetMethodService.save(object, "Outpincreateapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(tjCustomer)));
+ return AjaxResult.success();
+ }
+ return AjaxResult.error(object.getStr("ResultContent"));
+ }
+ return AjaxResult.success();
+ }
+ return AjaxResult.error();
}
/**
--
Gitblit v1.8.0