From e0d63096c613106d3aa149ca80552a444ac820a0 Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期五, 27 六月 2025 10:10:45 +0800
Subject: [PATCH] 06-27 zhs
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 6 +++++-
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 1 +
smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java | 6 ++++++
3 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
index 4b7783d..05abda3 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
@@ -564,6 +564,12 @@
@Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
private String leavehospitaldistrictname;
+ /**
+ * 璇婃柇鍚嶇О
+ */
+ @Excel(name = " 绂婚櫌璇婃柇鍚嶇О")
+ @ApiModelProperty(value = "绂婚櫌璇婃柇鍚嶇О")
+ private String leavediagname;
/**
* 璐ｄ换鎶ゅ＋缂栫爜
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 f1d7bcf..40885f9 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -1352,7 +1352,11 @@
PatArchive patArchive = addPatArchive(externalInHospPatientInfo, externalInHospPatientAddrInfo, externalInHospPatientLiaisonInfo);
PatMedInspection patMedInspection = new PatMedInspection();
- patMedInspection.setProjecttype(1);
+ if(xiaoXiTou.get("XiaoXiLX").equals("JC_SQ_ShenQing") || xiaoXiTou.get("XiaoXiLX").equals("JC_SQ_XiuGai")){
+ patMedInspection.setProjecttype(1);
+ }else if(xiaoXiTou.get("XiaoXiLX").equals("JY_SQ_ShenQing") || xiaoXiTou.get("XiaoXiLX").equals("JY_SQ_XiuGai")){
+ patMedInspection.setProjecttype(0);
+ }
patMedInspection.setOrgid(externalInHospPatientInfo.getZuZhiJGID());
patMedInspection.setInhospno(externalInHospPatientInfo.getBingAnHao());
patMedInspection.setPatidHis(externalInHospPatientInfo.getBingRenID());
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 98673e3..6b379f6 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -187,6 +187,7 @@
<if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">and
leavehospitaldistrictname = #{leavehospitaldistrictname}
</if>
+ <if test="leavediagname != null and leavediagname != ''">and leavediagname like concat('%', #{leavediagname}, '%')</if>
<if test="sex != null and sex != ''">and sex = #{sex}</if>
<if test="age != null ">and age = #{age}</if>
<if test="patguid != null ">and patguid = #{patguid}</if>
--
Gitblit v1.9.3