From 6d09f4ac6ee4718acd131f234f24ad1ac3c2ce3c Mon Sep 17 00:00:00 2001 From: zjh <zjh@888> Date: 星期三, 19 六月 2024 12:11:36 +0800 Subject: [PATCH] zjh 本地 2024/06/19 --1 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 53 insertions(+), 6 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 420fc90..a518969 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,19 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; 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.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 +60,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; @@ -352,7 +358,6 @@ LambdaQueryWrapper<TjCustomer> customerLambdaQueryWrapper1 = new LambdaQueryWrapper<>(); customerLambdaQueryWrapper1.eq(TjCustomer::getCusIdcard, cusIdcard); TjCustomer one = tjCustomerService.getOne(customerLambdaQueryWrapper1); - System.out.println("------------------"+one.getCusBrithday()); return AjaxResult.success("鏆傛棤棰勭害淇℃伅", tjCustomerServiceOne); } } @@ -509,7 +514,14 @@ if (null != pationid) { tjCustomer.setPationId(pationid); tjCustomerService.updateById(tjCustomer); -/* OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto(); + //淇濆瓨娉ㄥ唽鍏ュ弬鍑哄弬 + 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("00029"); outpinregapplyDto.setMzksbm("0101"); @@ -559,10 +571,15 @@ * 淇敼瀹㈡埛淇℃伅 */ //@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) { @@ -575,7 +592,37 @@ return AjaxResult.error("璇ユ墜鏈哄彿宸茶浣跨敤!"); }*/ tjCustomer.setCusPhone(cusPhone); - return toAjax(tjCustomerService.updateTjCustomer(tjCustomer)); + 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(); + } + return AjaxResult.success(); + } + return AjaxResult.error(); } /** -- Gitblit v1.8.0