From aa0ae041b29f0c95dcdbdd237cd0351d0c9f979f Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 18 八月 2026 15:11:02 +0800
Subject: [PATCH] 【丽水】手术随访-住院记录调整
---
smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java | 5 ++
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 5 ++
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java | 2 +
smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java | 13 ++++++
smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml | 41 +++++++++++++++++++-
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 3 +
smartor/src/main/java/com/smartor/domain/CommonTaskcallMQ.java | 2
7 files changed, 68 insertions(+), 3 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
index bc6375d..b20634c 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
@@ -388,6 +388,8 @@
log.info("鍚屾鎵嬫湳璇︽儏淇℃伅鏁伴噺" + patMedOperationItems.size());
for (PatMedOperationItem operationItem : patMedOperationItems) {
try {
+ operationItem.setInhospstate(operation.getInhospstate());
+ operationItem.setSerialnum(operation.getSerialnum());
PatMedOperationItem operItem = new PatMedOperationItem();
operItem.setOpid(operationItem.getOpid());
operItem.setOperationid(operationItem.getOperationid());
diff --git a/smartor/src/main/java/com/smartor/domain/CommonTaskcallMQ.java b/smartor/src/main/java/com/smartor/domain/CommonTaskcallMQ.java
index 8e4c328..eb3568e 100644
--- a/smartor/src/main/java/com/smartor/domain/CommonTaskcallMQ.java
+++ b/smartor/src/main/java/com/smartor/domain/CommonTaskcallMQ.java
@@ -36,7 +36,7 @@
* 浠诲姟鍙戦�佹柟寮忥細鈥滅數璇濓紝鐭俊锛屽叕浼楀彿锛岄摼鎺�...鈥濅互閫楀彿鍒嗛殧
*/
@Excel(name = "浠诲姟鍙戦�佹柟寮忥細1,浜哄伐 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹濆皬绋嬪簭 8.鏅鸿兘鏈哄櫒浜� 9.閽夐拤")
- @ApiModelProperty(value = "鍔″彂閫佹柟寮忥細1,浜哄伐 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹濆皬绋嬪簭 8.鏅鸿兘鏈哄櫒浜� 9.閽夐拤")
+ @ApiModelProperty(value = "浠诲姟鍙戦�佹柟寮忥細1,浜哄伐 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹濆皬绋嬪簭 8.鏅鸿兘鏈哄櫒浜� 9.閽夐拤")
private String preachform;
diff --git a/smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java b/smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java
index 9449226..154ff2b 100644
--- a/smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java
+++ b/smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java
@@ -191,4 +191,9 @@
@ApiModelProperty(value = "鐭彿淇℃伅")
private String DuanHaoXX;
+ @ApiModelProperty(value = "鐥呬汉绫诲瀷浠ｇ爜")
+ private String BingRenLXDM;
+
+ @ApiModelProperty(value = "鐥呬汉绫诲瀷鍚嶇О")
+ private String BingRenLXMC;
}
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java b/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
index 49f000e..90ddbbf 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
@@ -250,5 +250,18 @@
*/
@ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
private String leavehospitaldistrictname;
+
+ /**
+ * 浣忛櫌鏍囪瘑锛�0锛氬湪闄� 1锛氬嚭闄� 2锛氳浆绉� 3寰呭叆闄�
+ */
+ @ApiModelProperty(value = "浣忛櫌鏍囪瘑锛� 0锛氬湪闄� 1锛氬嚭闄� 2锛氳浆绉� 3寰呭叆闄�")
+ private String inhospstate;
+
+ /**
+ * 浣忛櫌璁板綍娴佹按鍙�
+ */
+ @ApiModelProperty("浣忛櫌璁板綍娴佹按鍙�")
+ @Excel(name = "浣忛櫌璁板綍娴佹按鍙�")
+ private String serialnum;
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
index 16672c7..f72f6a8 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -875,6 +875,10 @@
patMedInhosp.setPatid((patMedOperationItem.getPatid()));
patMedInhosp.setInhospstate("1");
patMedInhosp.setFuflag("1");
+ //鎵嬫湳闅忚
+ if(!active.equals("hzszlyy")){
+ patMedInhosp.setSerialnum(patMedOperationItem.getSerialnum());
+ }
List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
if (CollectionUtils.isEmpty(patMedInhospList)) {
@@ -1261,6 +1265,7 @@
// 鎵嬫湳闅忚
PatMedOperationItem pmoi = new PatMedOperationItem();
//鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
+// pmoi.setInhospstate("1");
pmoi.setOpercheckFlag("0");
pmoi.setMainFlag("1");
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 9276652..e94c773 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -1409,6 +1409,7 @@
//涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
patMedOperation.setCampusid("1");
patMedOperation.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID());
+ patMedOperation.setInhospstate(externalInHospPatientInfo.getBingRenLXDM());
patMedOperation.setInhospno(externalInHospPatientInfo.getBingAnHao());
patMedOperation.setHospitalname(externalInHospPatientInfo.getZuZhiJGMC());
patMedOperation.setHospitalcode(externalInHospPatientInfo.getZuZhiJGID());
@@ -1473,6 +1474,8 @@
patMedOperationItem.setOpposition(externalOperationDetail.getShouShuBW());
patMedOperationItem.setDelFlag("0");
patMedOperationItem.setOrgid(patMedOperation.getOrgid());
+ patMedOperationItem.setInhospstate(patMedOperation.getInhospstate());
+ patMedOperationItem.setSerialnum(patMedOperation.getSerialnum());
//涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
patMedOperationItem.setCampusid("1");
if (externalOperationDetail.getZhuShouSBZ().equals("1") && addMianTableFalg == true) {
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
index ce9ba38..cd970f4 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
@@ -29,6 +29,8 @@
<result property="pid" column="pid"/>
<result property="opercheckFlag" column="opercheck_flag"/>
<result property="longTaskReason" column="long_task_reason"/>
+ <result property="inhospstate" column="inhospstate"/>
+ <result property="serialnum" column="serialnum"/>
<result property="deptcode" column="deptcode"/>
<result property="deptname" column="deptname"/>
@@ -46,7 +48,7 @@
</resultMap>
<sql id="selectPatMedOperationItemVo">
- select id, operationid, opid, opcode, opdesc, main_flag, incitypecode, incitypedesc, oplevelcode, opleveldesc, opposition, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pguid, guid, pid, opercheck_flag, long_task_reason
+ select id, operationid, opid, opcode, opdesc, main_flag, incitypecode, incitypedesc, oplevelcode, opleveldesc, opposition, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pguid, guid, pid, opercheck_flag, long_task_reason, inhospstate, serialnum
from pat_med_operation_item
</sql>
@@ -101,6 +103,12 @@
</if>
<if test="pid != null ">
and pid = #{pid}
+ </if>
+ <if test="inhospstate != null and inhospstate != ''">
+ and inhospstate = #{inhospstate}
+ </if>
+ <if test="serialnum != null and serialnum != ''">
+ and serialnum = #{serialnum}
</if>
</select>
@@ -159,6 +167,10 @@
</if>
<if test="longTaskReason != null">long_task_reason,
</if>
+ <if test="inhospstate != null">inhospstate,
+ </if>
+ <if test="serialnum != null">serialnum,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="operationid != null">#{operationid},
@@ -206,6 +218,10 @@
<if test="opercheckFlag != null">#{opercheckFlag},
</if>
<if test="longTaskReason != null">#{longTaskReason},
+ </if>
+ <if test="inhospstate != null">#{inhospstate},
+ </if>
+ <if test="serialnum != null">#{serialnum},
</if>
</trim>
</insert>
@@ -282,6 +298,12 @@
<if test="longTaskReason != null">long_task_reason =
#{longTaskReason},
</if>
+ <if test="inhospstate != null">inhospstate =
+ #{inhospstate},
+ </if>
+ <if test="serialnum != null">serialnum =
+ #{serialnum},
+ </if>
</trim>
where id = #{id}
</update>
@@ -335,6 +357,10 @@
</if>
<if test="longTaskReason != null">long_task_reason,
</if>
+ <if test="inhospstate != null">inhospstate,
+ </if>
+ <if test="serialnum != null">serialnum,
+ </if>
</trim>
values
<foreach item="item" index="index" collection="list" separator=",">
@@ -385,6 +411,10 @@
</if>
<if test="longTaskReason != null">#{item.longTaskReason},
</if>
+ <if test="inhospstate != null">#{item.inhospstate},
+ </if>
+ <if test="serialnum != null">#{item.serialnum},
+ </if>
</trim>
</foreach>
</insert>
@@ -421,7 +451,8 @@
pmoi.pguid, pmoi.guid, pmoi.pid, pmoi.opercheck_flag, pmoi.long_task_reason,
pmo.deptcode, pmo.deptname, pmo.hospitaldistrictcode, pmo.hospitaldistrictname,
pmo.leaveldeptcode, pmo.leaveldeptname, pmo.leavehospitaldistrictcode, pmo.leavehospitaldistrictname, pmo.patid,
- pmo.drcode, pmo.drname, pmo.nurse_id, pmo.nurse_name
+ pmo.drcode, pmo.drname, pmo.nurse_id, pmo.nurse_name,
+ pmo.inhospstate, pmo.serialnum
from pat_med_operation pmo
join pat_med_operation_item pmoi
on pmoi.opid = pmo.opid
@@ -478,6 +509,12 @@
<if test="pid != null ">
and pmoi.pid = #{pid}
</if>
+ <if test="inhospstate != null and inhospstate != ''">
+ and pmo.inhospstate = #{inhospstate}
+ </if>
+ <if test="serialnum != null and serialnum != ''">
+ and pmo.serialnum = #{serialnum}
+ </if>
<if test="deptcode != null and deptcode != ''">
and pmo.deptcode = #{deptcode}
</if>
--
Gitblit v1.9.3