From 1967693c5d760ade002f8a5fbea10b51aef5693f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 10 四月 2025 13:39:32 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateCategoryServiceImpl.java | 8 ++--
smartor/src/main/java/com/smartor/service/impl/SvyCategoryServiceImpl.java | 8 ++--
smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetAssortServiceImpl.java | 10 ++--
smartor/src/main/java/com/smartor/service/impl/SvyLibScriptCategoryServiceImpl.java | 10 ++--
smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptAssortServiceImpl.java | 8 ++--
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 2 +
smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml | 2 +
smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateAssortServiceImpl.java | 8 ++--
smartor/src/main/java/com/smartor/service/impl/HeLibraryAssortServiceImpl.java | 6 +-
9 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/HeLibraryAssortServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/HeLibraryAssortServiceImpl.java
index d7e66af..a7adeaf 100644
--- a/smartor/src/main/java/com/smartor/service/impl/HeLibraryAssortServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/HeLibraryAssortServiceImpl.java
@@ -61,9 +61,9 @@
//閬嶅巻鏌ュ嚭鏉ョ殑鏁版嵁锛岄�氳繃 id=pid 鑾峰彇浠栦滑鐨勫瓙鏁版嵁
List<HeLibraryAssortVO> heLibraryAssortVOArrayList = new ArrayList<>();
for (HeLibraryAssortVO heLibraryAssortVO : heLibraryAssortVOS) {
- if (heLibraryAssortVO.getPid() != null) {
- continue;
- }
+// if (heLibraryAssortVO.getPid() != null) {
+// continue;
+// }
HeLibraryAssort heLibraryAssort1 = new HeLibraryAssort();
heLibraryAssort1.setPid(heLibraryAssortVO.getId());
List<HeLibraryAssort> heLibraryAssortList = heLibraryAssortMapper.selectHeLibraryAssortList(heLibraryAssort1);
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptAssortServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptAssortServiceImpl.java
index e84d877..54d1250 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptAssortServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptAssortServiceImpl.java
@@ -179,14 +179,14 @@
public List<IvrLibaScriptAssortVO> selectIvrLibaScriptAssortList(IvrLibaScriptAssort ivrLibaScriptAssort) {
List<IvrLibaScriptAssort> ivrLibaScriptAssorts = ivrLibaScriptAssortMapper.selectIvrLibaScriptAssortList(ivrLibaScriptAssort);
//灏唒id涓虹┖鐨勶紝杩囨护鎺�
- ivrLibaScriptAssorts = ivrLibaScriptAssorts.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
+// ivrLibaScriptAssorts = ivrLibaScriptAssorts.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
List<IvrLibaScriptAssortVO> ivrLibaScriptAssortVOS = DtoConversionUtils.sourceToTarget(ivrLibaScriptAssorts, IvrLibaScriptAssortVO.class);
//閬嶅巻鏌ュ嚭鏉ョ殑鏁版嵁锛岄�氳繃 id=pid 鑾峰彇浠栦滑鐨勫瓙鏁版嵁
for (IvrLibaScriptAssortVO ivrLibaScriptAssortVO : ivrLibaScriptAssortVOS) {
- if (ivrLibaScriptAssortVO.getPid() != null) {
- continue;
- }
+// if (ivrLibaScriptAssortVO.getPid() != null) {
+// continue;
+// }
IvrLibaScriptAssort ivrLibaTargetAssort1 = new IvrLibaScriptAssort();
ivrLibaTargetAssort1.setPid(ivrLibaScriptAssortVO.getId());
List<IvrLibaScriptAssort> ivrLibaScriptAssorts1 = ivrLibaScriptAssortMapper.selectIvrLibaScriptAssortList(ivrLibaTargetAssort1);
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetAssortServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetAssortServiceImpl.java
index 2245b0c..9a1ff53 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetAssortServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetAssortServiceImpl.java
@@ -52,18 +52,18 @@
//灏唒id涓虹┖鐨勶紝杩囨护鎺�
List<IvrLibaTargetAssort> ivrLibaTargetAssortList = new ArrayList<>();
for (IvrLibaTargetAssort ivrLibaTargetAssort1 : ivrLibaTargetAssorts) {
- if (ivrLibaTargetAssort1.getPid() != null) {
+// if (ivrLibaTargetAssort1.getPid() != null) {
ivrLibaTargetAssortList.add(ivrLibaTargetAssort1);
- }
+// }
}
List<IvrLibaTargetAssortVO> ivrLibaTargetAssortVOS = DtoConversionUtils.sourceToTarget(ivrLibaTargetAssortList, IvrLibaTargetAssortVO.class);
//閬嶅巻鏌ュ嚭鏉ョ殑鏁版嵁锛岄�氳繃 id=pid 鑾峰彇浠栦滑鐨勫瓙鏁版嵁
List<IvrLibaTargetAssortVO> ivrLibaTargetAssortVOS1 = new ArrayList<>();
for (IvrLibaTargetAssortVO ivrLibaTargetAssortVO : ivrLibaTargetAssortVOS) {
- if (ivrLibaTargetAssortVO.getPid() != -1) {
- continue;
- }
+// if (ivrLibaTargetAssortVO.getPid() != -1) {
+// continue;
+// }
IvrLibaTargetAssort ivrLibaTargetAssort1 = new IvrLibaTargetAssort();
ivrLibaTargetAssort1.setPid(ivrLibaTargetAssortVO.getId());
List<IvrLibaTargetAssort> ivrLibaTargetAssorts2 = ivrLibaTargetAssortMapper.selectIvrLibaTargetAssortList(ivrLibaTargetAssort1);
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateAssortServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateAssortServiceImpl.java
index fb2a11e..7545c2f 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateAssortServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateAssortServiceImpl.java
@@ -50,14 +50,14 @@
public List<IvrLibaTemplateAssortVO> selectIvrLibaTemplateAssortList(IvrLibaTemplateAssort ivrLibaScriptAssort) {
List<IvrLibaTemplateAssort> ivrLibaTemplateAssorts = ivrLibaTemplateAssortMapper.selectIvrLibaTemplateAssortList(ivrLibaScriptAssort);
//灏唒id涓虹┖鐨勶紝杩囨护鎺�
- ivrLibaTemplateAssorts = ivrLibaTemplateAssorts.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
+// ivrLibaTemplateAssorts = ivrLibaTemplateAssorts.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
List<IvrLibaTemplateAssortVO> ivrLibaTemplateAssortVOS = DtoConversionUtils.sourceToTarget(ivrLibaTemplateAssorts, IvrLibaTemplateAssortVO.class);
//閬嶅巻鏌ュ嚭鏉ョ殑鏁版嵁锛岄�氳繃 id=pid 鑾峰彇浠栦滑鐨勫瓙鏁版嵁
for (IvrLibaTemplateAssortVO ivrLibaTemplateAssortVO : ivrLibaTemplateAssortVOS) {
- if (ivrLibaTemplateAssortVO.getPid() != null) {
- continue;
- }
+// if (ivrLibaTemplateAssortVO.getPid() != null) {
+// continue;
+// }
IvrLibaTemplateAssort ivrLibaTemplateAssort = new IvrLibaTemplateAssort();
ivrLibaTemplateAssort.setPid(ivrLibaTemplateAssortVO.getId());
List<IvrLibaTemplateAssort> ivrLibaTemplateAssorts1 = ivrLibaTemplateAssortMapper.selectIvrLibaTemplateAssortList(ivrLibaTemplateAssort);
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
index 2eedd31..575bca8 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -586,6 +586,8 @@
patMedOuthosp.setMainsuit(externalWZInfo.getNeiRong());
}
}
+ patMedOuthosp.setCreateTime(new Date());
+ patMedOuthosp.setUpdateTime(new Date());
int i = patMedOuthospMapper.insertPatMedOuthosp(patMedOuthosp);
if (i > 0) {
return true;
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyCategoryServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyCategoryServiceImpl.java
index 5088e4d..ccb7ed3 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyCategoryServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyCategoryServiceImpl.java
@@ -52,14 +52,14 @@
public List<SvyCategoryVO> selectSvyCategoryList(SvyCategory svyCategory) {
List<SvyCategory> svyCategories = svyCategoryMapper.selectSvyCategoryList(svyCategory);
//灏唒id涓虹┖鐨勶紝杩囨护鎺�
- svyCategories = svyCategories.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
+// svyCategories = svyCategories.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
List<SvyCategoryVO> svyCategoryVOS = DtoConversionUtils.sourceToTarget(svyCategories, SvyCategoryVO.class);
//閬嶅巻鏌ュ嚭鏉ョ殑鏁版嵁锛岄�氳繃 id=pid 鑾峰彇浠栦滑鐨勫瓙鏁版嵁
for (SvyCategoryVO svyCategoryVO : svyCategoryVOS) {
- if (svyCategoryVO.getPid() != null) {
- continue;
- }
+// if (svyCategoryVO.getPid() != null) {
+// continue;
+// }
SvyCategory svyCategory1 = new SvyCategory();
svyCategory1.setPid(svyCategoryVO.getId());
List<SvyCategory> svyCategoryList = svyCategoryMapper.selectSvyCategoryList(svyCategory1);
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptCategoryServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptCategoryServiceImpl.java
index 1bcf5e7..dada19c 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptCategoryServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptCategoryServiceImpl.java
@@ -52,15 +52,15 @@
@Override
public List<SvyLibScriptCategoryVO> selectSvyLibScriptCategoryList(SvyLibScriptCategory svyLibScriptCategory) {
List<SvyLibScriptCategory> svyLibScriptCategories = svyLibScriptCategoryMapper.selectSvyLibScriptCategoryList(svyLibScriptCategory);
- //灏唒id涓虹┖鐨勶紝杩囨护鎺�
- svyLibScriptCategories = svyLibScriptCategories.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
+// //灏唒id涓虹┖鐨勶紝杩囨护鎺�
+// svyLibScriptCategories = svyLibScriptCategories.stream().filter(assort -> assort.getPid() != null).collect(Collectors.toList());
List<SvyLibScriptCategoryVO> SvyLibScriptCategoryVO = DtoConversionUtils.sourceToTarget(svyLibScriptCategories, SvyLibScriptCategoryVO.class);
//閬嶅巻鏌ュ嚭鏉ョ殑鏁版嵁锛岄�氳繃 id=pid 鑾峰彇浠栦滑鐨勫瓙鏁版嵁
for (SvyLibScriptCategoryVO svyLibScriptCategoryVO : SvyLibScriptCategoryVO) {
- if (svyLibScriptCategoryVO.getPid() != null) {
- continue;
- }
+// if (svyLibScriptCategoryVO.getPid() != null) {
+// continue;
+// }
SvyLibScriptCategory svyLibScriptCategory1 = new SvyLibScriptCategory();
svyLibScriptCategory1.setPid(svyLibScriptCategoryVO.getId());
List<SvyLibScriptCategory> svyLibScriptCategories1 = svyLibScriptCategoryMapper.selectSvyLibScriptCategoryList(svyLibScriptCategory1);
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateCategoryServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateCategoryServiceImpl.java
index de07294..4173e4d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateCategoryServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateCategoryServiceImpl.java
@@ -50,14 +50,14 @@
public List<SvyLibTemplateCategoryVO> selectSvyLibTemplateCategoryList(SvyLibTemplateCategory svyLibTemplateCategory) {
List<SvyLibTemplateCategory> svyLibTemplateCategories = svyLibTemplateCategoryMapper.selectSvyLibTemplateCategoryList(svyLibTemplateCategory);
//灏唒id涓虹┖鐨勶紝杩囨护鎺�
- svyLibTemplateCategories = svyLibTemplateCategories.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
+// svyLibTemplateCategories = svyLibTemplateCategories.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
List<SvyLibTemplateCategoryVO> svyLibTemplateCategoryVOList = DtoConversionUtils.sourceToTarget(svyLibTemplateCategories, SvyLibTemplateCategoryVO.class);
//閬嶅巻鏌ュ嚭鏉ョ殑鏁版嵁锛岄�氳繃 id=pid 鑾峰彇浠栦滑鐨勫瓙鏁版嵁
for (SvyLibTemplateCategoryVO svyLibTemplateCategoryVO : svyLibTemplateCategoryVOList) {
- if (svyLibTemplateCategoryVO.getPid() != null) {
- continue;
- }
+// if (svyLibTemplateCategoryVO.getPid() != null) {
+// continue;
+// }
SvyLibTemplateCategory svyLibTemplateCategory1 = new SvyLibTemplateCategory();
svyLibTemplateCategory1.setPid(svyLibTemplateCategoryVO.getId());
List<SvyLibTemplateCategory> svyLibTemplateCategoryList = svyLibTemplateCategoryMapper.selectSvyLibTemplateCategoryList(svyLibTemplateCategory1);
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
index 8d02294..1c84549 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
@@ -109,7 +109,9 @@
</if>
<if test="deptname != null and deptname != ''">and pmo.deptname like concat('%', #{deptname}, '%')</if>
<if test="drname != null and drname != ''">and pmo.drname like concat('%', #{drname}, '%')</if>
+ <if test="patname != null and patname != ''">and pmo.patname like concat('%', #{patname}, '%')</if>
<if test="admitdate != null ">and pmo.admitdate = #{admitdate}</if>
+ <if test="patid != null ">and pmo.patid = #{patid}</if>
<if test="orgid != null and orgid != ''">and pmo.orgid = #{orgid}</if>
<if test="outhospno != null and outhospno != ''">and pmo.outhospno = #{outhospno}</if>
</where>
--
Gitblit v1.9.3