From ac1d836efbd5f5c8707ed0bf33b4631025d165c6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 29 七月 2024 18:12:27 +0800
Subject: [PATCH] zjh 2024/07/29-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java | 119 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 60 insertions(+), 59 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
index ecd0852..d38bd36 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
@@ -43,8 +43,8 @@
* @Date: 2023/1/12 11:08
*/
@RestController
-@RequestMapping("/cus/hospital")
-@Api(tags = "灏忕▼搴�-瀹㈡埛淇℃伅")
+@RequestMapping ("/cus/hospital")
+@Api (tags = "灏忕▼搴�-瀹㈡埛淇℃伅")
public class CustomerController extends BaseController {
@Resource
@@ -69,8 +69,8 @@
/**
* 灏忕▼搴忓氨璇婁汉鍒楄〃
*/
- @GetMapping("/getListByOpenId")
- @ApiOperation(value = "灏忕▼搴�-灏辫瘖浜哄垪琛�")
+ @GetMapping ("/getListByOpenId")
+ @ApiOperation (value = "灏忕▼搴�-灏辫瘖浜哄垪琛�")
public AjaxResult getListByOpenId(@RequestParam String openId) {
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
wq.eq(TjCustomer::getConnect, openId);
@@ -81,9 +81,9 @@
/**
* 瑙ｇ粦灏辫瘖浜�
*/
- @PostMapping("/delCustomer")
- @ApiOperation(value = "灏忕▼搴�-瑙ｇ粦灏辫瘖浜�")
- public AjaxResult delCustomer(@RequestBody @ApiParam(value = "瀹㈡埛瀵硅薄淇℃伅") TjCustomer tjCustomer) {
+ @PostMapping ("/delCustomer")
+ @ApiOperation (value = "灏忕▼搴�-瑙ｇ粦灏辫瘖浜�")
+ public AjaxResult delCustomer(@RequestBody @ApiParam (value = "瀹㈡埛瀵硅薄淇℃伅") TjCustomer tjCustomer) {
if (tjCustomer == null) {
return AjaxResult.error();
}
@@ -105,11 +105,11 @@
/**
* 鏂板骞剁粦瀹氬氨璇婁汉
*/
- @PostMapping("/addNew")
- @ApiOperation(value = "灏忕▼搴�-鏂板骞剁粦瀹氬氨璇婁汉")
+ @PostMapping ("/addNew")
+ @ApiOperation (value = "灏忕▼搴�-鏂板骞剁粦瀹氬氨璇婁汉")
@Transactional
@RepeatSubmit
- public AjaxResult addNew(@RequestBody @ApiParam(value = "瀹㈡埛瀵硅薄淇℃伅") TjCustomer tjCustomer) {
+ public AjaxResult addNew(@RequestBody @ApiParam (value = "瀹㈡埛瀵硅薄淇℃伅") TjCustomer tjCustomer) {
if (tjCustomer == null) {
return AjaxResult.error("娣诲姞澶辫触");
}
@@ -121,12 +121,12 @@
if (!MatchUtils.isMobileNO(tjCustomer.getCusPhone()))
return AjaxResult.error("鎵嬫満鍙烽敊璇�");
- if(cusIdcard.length()==18){
+ if (cusIdcard.length() == 18) {
if (!MatchUtils.isIdCard(cusIdcard)) {
return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
}
}
- if(cusIdcard.length()==9){
+ if (cusIdcard.length() == 9) {
if (!MatchUtils.cardValidates(cusIdcard)) {
return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
}
@@ -140,15 +140,7 @@
if (customer != null) {
customer.setConnect(tjCustomer.getConnect());
- if (customerService.updateById(customer)) {
- if(null !=key && key.equals("Y")){
- AjaxResult xinXi = suijieHisXinXi(tjCustomer);
- if(!xinXi.get("code").toString().equals("200")){
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("娉ㄥ唽澶辫触,璇峰埌鍓嶅彴鐧昏!" + xinXi.get("msg").toString());
- }
- }
- }
+ customerService.updateById(customer);
return AjaxResult.success(customer);
}
String substring = cusIdcard.substring(cusIdcard.length() - 6);
@@ -156,7 +148,6 @@
tjCustomer.setCusPassword(substring);
tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(cusIdcard), "yyyy-MM-dd"));
tjCustomer.setCusSex(Long.valueOf(MatchUtils.getSexByIdCard(cusIdcard)));
- //tjCustomer.setAddr(MatchUtils.getNativePlace(Integer.parseInt((cusIdcard))));
tjCustomer.setAge(String.valueOf(MatchUtils.getAgeByIdCard(cusIdcard)));
tjCustomer.setIdType("1");
tjCustomer.setAgeUnit("0");
@@ -164,34 +155,35 @@
tjCustomer.setCusIntroduce("鏃�");
tjCustomer.setCusNumber(0L);
tjCustomer.setCusIsvip("N");
- if (customerService.save(tjCustomer)) {
- if(null !=key && key.equals("Y")){
- AjaxResult xinXi = suijieHisXinXi(tjCustomer);
- if(!xinXi.get("code").toString().equals("200")){
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("娉ㄥ唽澶辫触,璇峰埌鍓嶅彴鐧昏!" + xinXi.get("msg").toString());
- }
+ if (null != key && key.equals("Y")) {
+ AjaxResult xinXi = suijieHisXinXi(tjCustomer);
+ if (!xinXi.get("code").toString().equals("200")) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("娉ㄥ唽澶辫触,璇峰埌鍓嶅彴鐧昏!" + xinXi.get("msg").toString());
}
+ } else {
+ customerService.save(tjCustomer);
return AjaxResult.success(tjCustomer);
}
- return AjaxResult.error("娣诲姞澶辫触");
+
+ return AjaxResult.success(tjCustomer);
}
/**
* 灏忕▼搴忎綋妫�鎶ュ憡鍒楄〃
*/
- @GetMapping("/getReportList")
- @ApiOperation(value = "灏忕▼搴�-浣撴鎶ュ憡鍒楄〃")
- public AjaxResult getReportList(@RequestParam @ApiParam(value = "鎵嬫満鍙�") String cusPhone) {
+ @GetMapping ("/getReportList")
+ @ApiOperation (value = "灏忕▼搴�-浣撴鎶ュ憡鍒楄〃")
+ public AjaxResult getReportList(@RequestParam @ApiParam (value = "鎵嬫満鍙�") String cusPhone) {
return AjaxResult.success();
}
/**
* 鍥炴樉灏辫瘖浜�
*/
- @PostMapping("/showCustomer")
- @ApiOperation(value = "灏忕▼搴�-鍥炴樉灏辫瘖浜�")
- public AjaxResult showCustomer(@RequestBody @ApiParam(value = "瀹㈡埛瀵硅薄淇℃伅") TjCustomer tjCustomer) {
+ @PostMapping ("/showCustomer")
+ @ApiOperation (value = "灏忕▼搴�-鍥炴樉灏辫瘖浜�")
+ public AjaxResult showCustomer(@RequestBody @ApiParam (value = "瀹㈡埛瀵硅薄淇℃伅") TjCustomer tjCustomer) {
if (tjCustomer == null) {
return AjaxResult.error();
}
@@ -206,8 +198,8 @@
/**
* 灏忕▼搴忓垽鏂槸鍚﹁兘缂栬緫
*/
- @PostMapping("/canUpdate")
- @ApiOperation(value = "灏忕▼搴忓垽鏂槸鍚﹁兘缂栬緫")
+ @PostMapping ("/canUpdate")
+ @ApiOperation (value = "灏忕▼搴忓垽鏂槸鍚﹁兘缂栬緫")
public AjaxResult canUpdate(@RequestBody TjCustomer tjCustomer) {
if (tjCustomer == null) {
return AjaxResult.error("鍑洪敊浜嗭紝璇疯仈绯诲伐浣滀汉鍛橈紒");
@@ -224,8 +216,8 @@
/**
* 灏忕▼搴忕紪杈戝氨璇婁汉淇℃伅
*/
- @PostMapping("/updateCustomerBy")
- @ApiOperation(value = "灏忕▼搴�-淇敼灏辫瘖浜轰俊鎭�")
+ @PostMapping ("/updateCustomerBy")
+ @ApiOperation (value = "灏忕▼搴�-淇敼灏辫瘖浜轰俊鎭�")
@Transactional
@RepeatSubmit
public AjaxResult updateCustomerBy(@RequestBody TjCustomer tjCustomer) {
@@ -239,30 +231,33 @@
one.setCusPhone(tjCustomer.getCusPhone());
one.setCusNational(tjCustomer.getCusNational());
one.setCusMarryStatus(tjCustomer.getCusMarryStatus());
- if (customerService.updateById(one)) {
- if(null !=key && key.equals("Y")){
- AjaxResult xinXi = suijieHisXinXi(one);
- if(!xinXi.get("code").toString().equals("200")){
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("娣诲姞灏辫瘖浜轰俊鎭け璐�!" + xinXi.get("msg").toString());
- }
+
+ if (null != key && key.equals("Y")) {
+ AjaxResult xinXi = suijieHisXinXi(one);
+ if (!xinXi.get("code").toString().equals("200")) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("淇敼灏辫瘖浜轰俊鎭け璐�!" + xinXi.get("msg").toString());
}
- return AjaxResult.success(one);
+ } else {
+ if (!customerService.updateById(one)) {
+ return AjaxResult.error("淇敼澶辫触");
+ }
}
- return AjaxResult.error("淇敼澶辫触");
+ return AjaxResult.success(one);
+
}
/**
* 灏忕▼搴忔牴鎹墜鏈哄彿鐮佽幏鍙栫敤鎴疯韩浠借瘉鍙风爜
*/
- @GetMapping(value = "/getIdCardByPhone")
- @ApiOperation(value = "灏忕▼搴忔牴鎹墜鏈哄彿鐮佽幏鍙栫敤鎴疯韩浠借瘉鍙风爜")
- public AjaxResult getIdCardByPhone(@RequestParam @ApiParam(value = "鎵嬫満鍙�") String phone) {
+ @GetMapping (value = "/getIdCardByPhone")
+ @ApiOperation (value = "灏忕▼搴忔牴鎹墜鏈哄彿鐮佽幏鍙栫敤鎴疯韩浠借瘉鍙风爜")
+ public AjaxResult getIdCardByPhone(@RequestParam @ApiParam (value = "鎵嬫満鍙�") String phone) {
if (!"".equals(phone) && phone != null && MatchUtils.isMobileNO(phone)) {
LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
qw.eq(TjCustomer::getCusPhone, phone);
List<TjCustomer> tjCustomer1 = customerService.list(qw);
- if (tjCustomer1 != null && tjCustomer1.size()>0) {
+ if (tjCustomer1 != null && tjCustomer1.size() > 0) {
List<String> num = new ArrayList<>();
for (TjCustomer tjCustomer : tjCustomer1) {
num.add(tjCustomer.getCusIdcard());
@@ -277,7 +272,7 @@
/**
* 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅
*/
- @GetMapping(value = "/type/{dictType}")
+ @GetMapping (value = "/type/{dictType}")
public AjaxResult dictType(@PathVariable String dictType) {
List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
if (StringUtils.isNull(data)) {
@@ -285,7 +280,6 @@
}
return success(data);
}
-
//灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
@@ -311,10 +305,17 @@
if (null != resultData && resultData.size() > 0) {
String pationid = resultData.get("PationId").toString();
if (null != pationid) {
- tjCustomer.setPationId(pationid);
- customerService.updateById(tjCustomer);
+ try {
+ if (tjCustomer.getCusId() == null) {
+ tjCustomer.setPationId(pationid);
+ }
+ customerService.saveOrUpdate(tjCustomer);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return AjaxResult.error("鎿嶄綔澶辫触!");
+ }
//淇濆瓨娉ㄥ唽鍏ュ弬鍑哄弬
- resultData.put("cardId",pationid);
+ resultData.put("cardId", pationid);
JSONObject object4 = JSONUtil.parseObj(resultData);
LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpincreateapply");
@@ -323,7 +324,7 @@
}
}
- return AjaxResult.success();
+ return AjaxResult.success(tjCustomer);
}
return AjaxResult.error(object.getStr("ResultContent"));
}
--
Gitblit v1.8.0