From 5c71fd8ce9c6cd48add347da85cc28c2fd83eede Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 19 五月 2024 17:27:39 +0800
Subject: [PATCH] 修改bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
index a89c0df..ae0f88d 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
@@ -72,6 +72,11 @@
// return AjaxResult.success(data);
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
+ if(myself==null)
+ {
+ // System.out.println("ssssss");
+ return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ }
Long familyId = myself.getFamilyId();
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -150,10 +155,16 @@
}
log.info("鏁版嵁鍒楄〃涓猴細{}", dataList);
+ for (ZfDoctor symptom : dataList){
+ if (symptom.getSymptom().length() == 0) {
+ throw new RuntimeException("鐥囩姸涓虹┖锛屽鍏ユ暟鎹け璐�");
+ }
+ }
+
+
for (ZfDoctor zfDoctor : dataList) {
zfDoctorService.addData(zfDoctor);
}
-
return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
}
@@ -204,6 +215,7 @@
esModel.setBy6(zfDoctor.getCmedical());
esModel.setBy7(zfDoctor.getWmedical());
esModel.setRemark(zfDoctor.getRemark());
+ esModel.setFid(familyId);
//杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
esService.insertTable(esModel);
return AjaxResult.success();
@@ -244,6 +256,10 @@
//鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "瀹跺涵灏忓尰鐢�");
+
+ if (esResult == null){
+ return AjaxResult.success();
+ }
//鎿嶄綔es淇敼鏁版嵁
EsModel newModel = new EsModel();
@@ -336,11 +352,15 @@
//鍒犻櫎es涓殑鏁版嵁
zfDoctors.stream().forEach(zfDoctor -> {
EsModel esModel = esService.findByCtId(zfDoctor.getId().intValue(), "瀹跺涵灏忓尰鐢�");
- DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
- try {
- restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
- } catch (IOException e) {
- throw new RuntimeException(e);
+
+ if (esModel != null){
+ DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
+ try {
+ restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
}
});
return AjaxResult.success();
--
Gitblit v1.9.1