From 148a7f11b0ead8539cae824f02dda19a703f4d0b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期六, 07 十二月 2024 16:54:02 +0800
Subject: [PATCH] zjh20241207
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 362 +++++++++++++++++++++++++--------------------------
1 files changed, 179 insertions(+), 183 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 df5f223..7a07548 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
@@ -4,6 +4,7 @@
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
import cn.hutool.json.JSONArray;
@@ -11,6 +12,7 @@
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;
@@ -139,24 +141,27 @@
// @Log(title = "瀹㈡埛韬唤淇℃伅", businessType = BusinessType.EXPORT)
public AjaxResult getInfoByIdCard(@RequestParam @ApiParam(value = "瀹㈡埛韬唤璇佸彿") String cusIdcard) {
if (!"".equals(cusIdcard) && cusIdcard != null) {
+
+ String sfjysfzh = sysConfigService.selectConfigByKey("sfjysfzh");
+// String sfjysjh = configService.selectConfigByKey("sfjysjh");
+
//鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
-// if(cusIdcard.length()==18){
-// if (! MatchUtils.isIdCard(cusIdcard)) {
-// return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
-// }
-// }
-// if(cusIdcard.length()==9){
-// if (!MatchUtils.cardValidates(cusIdcard)) {
-// return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
-// }
-// }
- //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
- LambdaQueryWrapper<TjCustomer> customerLambdaQueryWrapper = new LambdaQueryWrapper<>();
- customerLambdaQueryWrapper.eq(TjCustomer::getCusIdcard, cusIdcard);
- TjCustomer tjCustomerServiceOne = tjCustomerService.getOne(customerLambdaQueryWrapper);
- if (null == tjCustomerServiceOne) {
- return AjaxResult.error("璇ヤ汉鍛樹俊鎭笉瀛樺湪璇峰厛杩涜鐧昏!!!");
+ if(sfjysfzh.equalsIgnoreCase("Y")){
+ if(cusIdcard.length()==18){
+ if (! MatchUtils.isIdCard(cusIdcard)) {
+ return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
+ }
+ }
+ if(cusIdcard.length()==9){
+ if (!MatchUtils.cardValidates(cusIdcard)) {
+ return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
+ }
+ }
}
+
+// Date dates = new Date();
+// final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
+
final String getInfoFromSqlData = sysConfigService.selectConfigByKey("getInfoFromSqlData");
if ("Y".equals(getInfoFromSqlData)) {
//鏍规嵁韬唤璇佸彿浠巋is鏌ヤ俊鎭�
@@ -207,48 +212,7 @@
}
String key = sysConfigService.selectConfigByKey("sfkqdyhis");
- if (null != key && key.equals("Y")) {
- String cardId = tjCustomerServiceOne.getCardId();
- if (null != cardId && !cardId.equals("0")) {
- int i = tjOrderService.selectTjOrderByCardId(cardId);
- if (i > 0) {
- return AjaxResult.error("涓嶅彲閲嶅绛惧埌");
- }
- }
-// controller.Outpincreateapply(tjCustomer);
-
-/* 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("00029");
- outpinregapplyDto.setMzksbm("0101");
- outpinregapplyDto.setCzybm("00029");
- outpinregapplyDto.setSfjz("0");
- outpinregapplyDto.setGhzlbm("01");
- outpinregapplyDto.setYwckbm("0001");
- outpinregapplyDto.setSflstd("0");
- outpinregapplyDto.setGhrq(date);
- //闂ㄨ瘖鎸傚彿
- AjaxResult ajaxResult = controller.Outpinregapply(outpinregapplyDto);
- String result2 = getAjaxResult(ajaxResult);
- JSONObject object1 = getJSONObject(result2);
- String code1 = object1.getStr("ResultCode");
- if (code1.equals("0")) {
- JSONArray resultDatas = object1.getJSONArray("ResultData");
- if (null != resultDatas && resultDatas.size() > 0) {
- Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0);
- String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
- //闂ㄨ瘖鍖荤敓鎺ヨ瘖
- controller.Outpinconapply(hisRegistrationId, date, SecurityUtils.getUsername());
-// 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
LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
@@ -256,55 +220,23 @@
wq.eq(TjReservation::getIsExpire, 2);
TjReservation tjReservation = tjReservationService.getOne(wq);
if (tjReservation != null) {
- if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
- return AjaxResult.error("鏈埌棰勭害鏃堕棿");
- }
- if (null != tjReservation.getReservationTime() && DateUtil.endOfDay(tjReservation.getReservationTime()).before(new Date())) {
+// if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
+// return AjaxResult.error("鏈埌棰勭害鏃堕棿");
+// }
+ if (null != tjReservation.getReservationTime() && DateUtil.endOfDay(DateUtil.offsetDay(tjReservation.getReservationTime(),
+ tjReservation.getYxts())).before(new Date())) {
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
}
-
-
LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
qw.eq(TjCustomer::getCusIdcard, cusIdcard);
TjCustomer tjCustomer1 = tjCustomerService.getOne(qw);
if (tjCustomer1 != null) {
- /* String key = sysConfigService.selectConfigByKey("sfkqdyhis");
- if (null != key && key.equals("Y")) {
- Date dates = new Date();
- final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
- OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
- outpinregapplyDto.setPationid(tjCustomer1.getPationId());
- outpinregapplyDto.setSqysbm(SecurityUtils.getUsername());
- outpinregapplyDto.setMzksbm("0101");
- outpinregapplyDto.setCzybm("00029");
- outpinregapplyDto.setSfjz("0");
- outpinregapplyDto.setGhzlbm("01");
- outpinregapplyDto.setYwckbm("0001");
- outpinregapplyDto.setSflstd("0");
- outpinregapplyDto.setGhrq(date);
- //闂ㄨ瘖鎸傚彿
- AjaxResult ajaxResult = controller.Outpinregapply(outpinregapplyDto);
- String result2 = getAjaxResult(ajaxResult);
- JSONObject object1 = getJSONObject(result2);
- String code1 = object1.getStr("ResultCode");
- if (code1.equals("0")) {
- JSONArray resultDatas = object1.getJSONArray("ResultData");
- if (null != resultDatas && resultDatas.size() > 0) {
- Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0);
- String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
- //闂ㄨ瘖鍖荤敓鎺ヨ瘖
- controller.Outpinconapply(hisRegistrationId, date, SecurityUtils.getUsername());
- tjCustomer1.setCardId(hisRegistrationId);
- }
- }
- }*/
-
tjCustomer1.setTjType(tjReservation.getTjType());
tjCustomer1.setCusName(tjReservation.getName());
tjCustomer1.setCusSex(Long.valueOf(tjReservation.getSex()));
- tjCustomer1.setCusBrithday(tjReservation.getBirthday());
+ tjCustomer1.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
tjCustomer1.setCusPhone(tjReservation.getPhoe());
tjCustomer1.setCusEmail(tjReservation.getEmail());
tjCustomer1.setCusAddr(tjReservation.getAddress());
@@ -316,52 +248,124 @@
tjCustomer1.setAgeUnit(tjReservation.getAgeUnit());
tjCustomer1.setCareer(tjReservation.getCareer());
tjCustomer1.setPym(PinyinUtil.getFirstLetter(tjReservation.getName(),""));
- tjCustomerService.updateById(tjCustomer1);
+/* if (null != key && key.equals("Y"))
+ {
+ AjaxResult result = controller.Outpincreateapply(tjCustomer1);
+ 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) {
+// tjCustomer1.setPationId(pationid);
+ tjCustomerService.updateById(tjCustomer1);
+ //淇濆瓨娉ㄥ唽鍏ュ弬鍑哄弬
+ 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(tjCustomer1)));
+ }
+ }
+ }
+ }else {
+ tjCustomerService.updateById(tjCustomer1);
+ }*/
tjCustomer1.setTeamNo(tjReservation.getTeamNo());
tjCustomer1.setCompId(tjReservation.getCompanyId());
tjCustomer1.setReservationId(tjReservation.getId());
tjCustomer1.setDiscount(tjReservation.getDiscount());
tjCustomer1.setGroupingId(tjReservation.getGroupingId());
return success(tjCustomer1);
+ }else {
+ TjCustomer tjCustomer = new TjCustomer();
+ tjCustomer.setCusIdcard(tjReservation.getIdCard());
+ tjCustomer.setCusName(tjReservation.getName());
+ tjCustomer.setCusSex(Long.valueOf(tjReservation.getSex()));
+ tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
+ tjCustomer.setCusPhone(tjReservation.getPhoe());
+ tjCustomer.setCusEmail(tjReservation.getEmail());
+ tjCustomer.setCusAddr(tjReservation.getAddress());
+ tjCustomer.setCusMarryStatus(String.valueOf(tjReservation.getMarriage()));
+ tjCustomer.setCusNational(String.valueOf(tjReservation.getNation()));
+
+ tjCustomer.setIdType(tjReservation.getIdType());
+ tjCustomer.setAge(tjReservation.getAge());
+ tjCustomer.setAgeUnit(tjReservation.getAgeUnit());
+ tjCustomer.setCareer(tjReservation.getCareer());
+ tjCustomer.setDwPhone(tjReservation.getDwPhone());
+// tjCustomer.setCardId(tjReservation.getCardId());
+ tjCustomer.setIndexCard(tjReservation.getIndexCard());
+ //鎴彇瀵嗙爜鑷姩鐢熸垚set杩涘幓
+ String substring = cusIdcard.substring(cusIdcard.length() - 6);
+ substring = DigestUtils.md5DigestAsHex(substring.getBytes());
+ tjCustomer.setCusPassword(substring);
+ tjCustomer.setTjType(tjReservation.getTjType());
+ tjCustomer.setPym(PinyinUtil.getFirstLetter(tjReservation.getName(),""));
+ if (null != key && key.equals("Y"))
+ {
+ 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.save(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)));
+ }
+ }
+ }
+ }else {
+ tjCustomerService.save(tjCustomer);
+ }
+ tjCustomer.setTeamNo(tjReservation.getTeamNo());
+ tjCustomer.setCompId(tjReservation.getCompanyId());
+ tjCustomer.setReservationId(tjReservation.getId());
+ tjCustomer.setDiscount(tjReservation.getDiscount());
+ tjCustomer.setGroupingId(tjReservation.getGroupingId());
+ return success(tjCustomer);
}
- TjCustomer tjCustomer = new TjCustomer();
- tjCustomer.setCusIdcard(tjReservation.getIdCard());
- tjCustomer.setCusName(tjReservation.getName());
- tjCustomer.setCusSex(Long.valueOf(tjReservation.getSex()));
- tjCustomer.setCusBrithday(tjReservation.getBirthday());
- tjCustomer.setCusPhone(tjReservation.getPhoe());
- tjCustomer.setCusEmail(tjReservation.getEmail());
- tjCustomer.setCusAddr(tjReservation.getAddress());
- tjCustomer.setCusMarryStatus(String.valueOf(tjReservation.getMarriage()));
- tjCustomer.setCusNational(String.valueOf(tjReservation.getNation()));
- tjCustomer.setIdType(tjReservation.getIdType());
- tjCustomer.setAge(tjReservation.getAge());
- tjCustomer.setAgeUnit(tjReservation.getAgeUnit());
- tjCustomer.setCareer(tjReservation.getCareer());
- tjCustomer.setDwPhone(tjReservation.getDwPhone());
- tjCustomer.setCardId(tjReservation.getCardId());
- tjCustomer.setIndexCard(tjReservation.getIndexCard());
-
- //鎴彇瀵嗙爜鑷姩鐢熸垚set杩涘幓
- String substring = cusIdcard.substring(cusIdcard.length() - 6);
- 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());
- tjCustomer.setReservationId(tjReservation.getId());
- tjCustomer.setDiscount(tjReservation.getDiscount());
- 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);
}
+
+ //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
+ LambdaQueryWrapper<TjCustomer> customerLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ customerLambdaQueryWrapper.eq(TjCustomer::getCusIdcard, cusIdcard);
+ TjCustomer tjCustomerServiceOne = tjCustomerService.getOne(customerLambdaQueryWrapper);
+ if (null == tjCustomerServiceOne) {
+ return AjaxResult.error("璇ヤ汉鍛樹俊鎭笉瀛樺湪璇峰厛杩涜鐧昏!!!");
+ }
+// if (null != key && key.equals("Y")) {
+ String cardId = tjCustomerServiceOne.getCardId();
+ if (null != cardId && !cardId.equals("0")) {
+ int i = tjOrderService.selectTjOrderByCardId(cardId);
+ if (i > 0) {
+ return AjaxResult.error("涓嶅彲閲嶅绛惧埌");
+ }
+ }
+
+// }
+ if(!tjCustomerServiceOne.getAge().equals(String.valueOf(DateUtil.ageOfNow(tjCustomerServiceOne.getCusBrithday())))){
+ tjCustomerServiceOne.setAge(String.valueOf(DateUtil.ageOfNow(tjCustomerServiceOne.getCusBrithday())));
+ tjCustomerService.updateById(tjCustomerServiceOne);
+ }
+ return AjaxResult.success(tjCustomerServiceOne);
+
}
return error("韬唤璇佸彿涓嶅瓨鍦�");
}
@@ -444,11 +448,11 @@
@PostMapping
@ApiOperation(value = "鏂板瀹㈡埛")
@Transactional
+ @RepeatSubmit
public AjaxResult add(@RequestBody @ApiParam(value = "瀹㈡埛瀵硅薄淇℃伅") TjCustomer tjCustomer) {
if (null == tjCustomer.getCusIdcard() || null == tjCustomer.getCusPhone()) {
return AjaxResult.error("璇疯緭鍏ヨ韩浠借瘉鍙锋垨鎵嬫満鍙�");
}
- HisApiGetMethodService hisApiGetMethodService = new HisApiGetMethodService();
Date dates = new Date();
final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
@@ -456,21 +460,32 @@
String cusIdcard = tjCustomer.getCusIdcard();
boolean b = true;
+ String sfjysfzh = sysConfigService.selectConfigByKey("sfjysfzh");
+ String sfjysjh = sysConfigService.selectConfigByKey("sfjysjh");
if (null != tjCustomer.getIdType()) {
if (tjCustomer.getIdType().equals("1")) {
- b = MatchUtils.isIdCard(cusIdcard);
+ //鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
+ if(sfjysfzh.equalsIgnoreCase("Y")){
+ if(cusIdcard.length()==18){
+ b = MatchUtils.isIdCard(cusIdcard);
+ }
+ }
+ } else {
+ if(cusIdcard.length()==9){
+ b = MatchUtils.cardValidate(cusIdcard, tjCustomer.getIdType());
+ }
+
}
-// else {
-// b = MatchUtils.cardValidate(cusIdcard, tjCustomer.getIdType());
-// }
} else {
return AjaxResult.error("璇烽�夋嫨璇佷欢绫诲瀷");
}
if (!b) return AjaxResult.error("璇佷欢鍙锋湁璇�");
//鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
- if (!(MatchUtils.isMobileNO(tjCustomer.getCusPhone())))
- return AjaxResult.error("鎵嬫満鍙烽敊璇�");
+ if(sfjysjh.equalsIgnoreCase("Y")){
+ if (!(MatchUtils.isMobileNO(tjCustomer.getCusPhone())))
+ return AjaxResult.error("鎵嬫満鍙烽敊璇�");
+ }
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
wq.eq(TjCustomer::getCusIdcard, cusIdcard);
@@ -516,7 +531,7 @@
String pationid = resultData.get("PationId").toString();
if (null != pationid) {
tjCustomer.setPationId(pationid);
- tjCustomerService.updateById(tjCustomer);
+// tjCustomerService.updateById(tjCustomer);
//淇濆瓨娉ㄥ唽鍏ュ弬鍑哄弬
resultData.put("cardId",pationid);
JSONObject object4 = JSONUtil.parseObj(resultData);
@@ -524,42 +539,6 @@
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");
- outpinregapplyDto.setCzybm("00029");
- outpinregapplyDto.setSfjz("0");
- outpinregapplyDto.setGhzlbm("01");
- outpinregapplyDto.setYwckbm("0001");
- outpinregapplyDto.setSflstd("0");
- outpinregapplyDto.setGhrq(date);
- //闂ㄨ瘖鎸傚彿
- AjaxResult ajaxResult = controller.Outpinregapply(outpinregapplyDto);
- String result2 = getAjaxResult(ajaxResult);
- JSONObject object1 = getJSONObject(result2);
- String code1 = object1.getStr("ResultCode");
- if (code1.equals("0")) {
- JSONArray resultDatas = object1.getJSONArray("ResultData");
- if (null != resultDatas && resultDatas.size() > 0) {
- Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0);
- String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
- if (null != hisRegistrationId) {
- //闂ㄨ瘖鍖荤敓鎺ヨ瘖
- AjaxResult result3 = controller.Outpinconapply(hisRegistrationId, date,"00029");
- String result4 = getAjaxResult(result3);
- JSONObject object2 = getJSONObject(result4);
- String code2 = object2.getStr("ResultCode");
- if (code2.equals("0")) {
- Map<String, Object> data = object2.getJSONObject("ResultData");
- String hisRegistrationId1 = data.get("his_registration_id").toString();
- tjCustomer.setPationId(pationid);
- tjCustomer.setCardId(hisRegistrationId1);
-// tjCustomerService.updateById(tjCustomer);
- }
- }
- }
- }*/
}
}
@@ -588,18 +567,35 @@
if (null == cusPhone) {
return AjaxResult.error("鎵嬫満鍙蜂笉鑳戒负绌�");
}
- /*LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
- wq.eq(TjCustomer::getCusPhone, cusPhone);
- TjCustomer customer = tjCustomerService.getOne(wq);
- if (customer != null) {
- return AjaxResult.error("璇ユ墜鏈哄彿宸茶浣跨敤!");
- }*/
+ String sfjysfzh = sysConfigService.selectConfigByKey("sfjysfzh");
+ String sfjysjh = sysConfigService.selectConfigByKey("sfjysjh");
+
+ //鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
+ if(sfjysfzh.equalsIgnoreCase("Y")){
+ if(tjCustomer.getCusIdcard().length()==18){
+ if (!(MatchUtils.isIdCard(tjCustomer.getCusIdcard())))
+ return AjaxResult.error("韬唤璇佸彿閿欒");
+ }
+
+ if(tjCustomer.getCusIdcard().length()==9){
+ if (!MatchUtils.cardValidates(tjCustomer.getCusIdcard())) {
+ 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")) {
- tjCustomer.setPationId(customer.getPationId());
AjaxResult result = controller.Outpincreateapply(tjCustomer);
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
--
Gitblit v1.8.0