From cc479e6a056785103996cc7ea67dbd5faa3e800e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 19 十月 2026 18:07:22 +0800
Subject: [PATCH] 数据采集模块
---
ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/domain/row/VisitInhospRow.java | 181 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 178 insertions(+), 3 deletions(-)
diff --git a/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/domain/row/VisitInhospRow.java b/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/domain/row/VisitInhospRow.java
index 67d83db..dad720e 100644
--- a/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/domain/row/VisitInhospRow.java
+++ b/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/domain/row/VisitInhospRow.java
@@ -16,6 +16,12 @@
* {@code sql/_probe/verify_inhospvisit_mapper.py}锛堟帴鍙ｂ啍XML 涓�鑷存�э級涓�
* {@code sql/_probe/verify_inhospvisit_sql_expansion.py}锛堝睍寮�鍚庨�愭潯姣斿锛孉ND 椤哄簭鏃犲叧锛�
* 鍙屽悜鎶婂叧銆傛敼浠讳竴杈归兘蹇呴』鍚屾鏀瑰彟涓�杈瑰苟閲嶈窇杩欎袱涓帰閽堛��</li>
+ * <li>鈿狅笍 杩樻湁涓�鏉℃洿纭殑绾緥锛�<b>XML 閲屽嚭鐜扮殑姣忎釜灞炴�э紝鏈被閮藉繀椤绘湁 getter</b>銆�
+ * 鍥犱负"閫愭潯绛変环"鎰忓懗鐫� XML 淇濈暀浜嗗師鏂囦欢鐨勫叏閮� {@code <if test=...>}锛堝惈闅忚閾句笂
+ * 涓嶅彲杈剧殑閭ｄ簺锛夛紝鑰� MyBatis 鐢� OGNL 姹傚�艰繖浜� {@code test}鈥斺��
+ * 缂� getter 浼氱洿鎺ユ姏 {@code ReflectionException}锛堜笉鏄�"鏉′欢涓嶆垚绔�"锛夈��
+ * 2026-10 灏辨槸杩欎箞鎶� {@code dealOutHospInfo} 鏁存潯鎵撳仠鐨勶紙缂� {@code startOutHospTime}
+ * 绛� 15 涓繃婊ゅ睘鎬э級銆傚畧鍗細{@code sql/_probe/verify_mapper_ognl_params.py}锛堝叏浠擄級銆�</li>
* <li>鍙︿竴绉嶅仛娉曟槸鎶婃煡璇�"鍖呬竴灞傜鍙�"濮旀墭鍥� smartor锛屼絾閭ｆ牱鏈ā鍧楀氨鍙墿缂栨帓閫昏緫銆�
* CRUD 鍏ㄩ潬鍥炶皟锛屽弽鑰屾洿纰庛�傝繖閲岄�夋嫨浜�"閲嶅浣嗗彲楠岃瘉"銆�</li>
* </ul>
@@ -484,16 +490,31 @@
// 浠ヤ笅瀛楁銆愪笉鏄� pat_med_inhosp 鐨勫垪銆戯紝鍙綔涓� selectForScan 鐨勮繃婊ゆ潯浠�/鎺掑簭寮�鍏炽��
// 鏀惧湪鍚屼竴涓瀵硅薄閲岋紝鏄负浜嗚"鏌ヨ鏉′欢"涓�"缁撴灉琛�"鍏辩敤涓�濂楀睘鎬у悕 鈥斺��
// 涓庡師瀹炵幇"鐢� PatMedInhosp 褰撴煡璇㈠叆鍙�"鐨勫啓娉曚繚鎸佷竴鑷达紝閬垮厤涓ゅ绫绘潵鍥炴槧灏勫嚭閿欍��
+ //
+ // 鈿狅笍鈿狅笍 杩欎竴缁勩�愬繀椤绘湁 getter銆戯紝鍝�曢殢璁跨敓鎴愰摼涓婁竴涓兘涓嶈瀹冿細
+ // `VisitInhospMapper.xml#selectForScan` 鏄粠鍘� `PatMedInhospMapper.xml` 閫愭潯鐓ф妱鐨勶紝
+ // 閲岄潰淇濈暀浜嗗師鏂囦欢鐨勫叏閮� `<if test="xxx != null">`锛堝惈闅忚閾句笂涓嶅彲杈剧殑閭ｄ簺锛夈��
+ // MyBatis 鐢� OGNL 姹傚�� `test`锛�**璇讳笉鍒� getter 涓嶆槸"鏉′欢涓嶆垚绔�"锛岃�屾槸鐩存帴鎶�**锛�
+ // ReflectionException: There is no getter for property named 'startOutHospTime'
+ // in 'class com.ruoyi.inhospvisit.domain.row.VisitInhospRow'
+ // 鍚庢灉鏄� `InhospVisitTaskService#dealOutHospInfo` 鍦ㄧ涓�娆� `selectForScan` 灏变腑鏂紝
+ // 涓�鏉￠殢璁夸换鍔￠兘涓嶇敓鎴愶紙2026-10 瀹炴満韪╁埌锛宍sys_job_log` 閲岃〃鐜颁负
+ // `InvocationTargetException`锛屽緢瀹规槗璇垽鎴愭ā鍧楀紑鍏虫病寮�锛夈��
+ // 瀹堝崼锛歚sql/_probe/verify_mapper_ognl_params.py`锛堝叏浠擄級
+ // 锛圶ML 寮曠敤灞炴�� 鈯� 鍙傛暟绫� getter锛岀己涓�涓氨 FAIL锛夈��
// ==========================================================================
/**
* 鍑洪櫌/鍦ㄩ櫌缁村害寮�鍏筹紙鍘� {@code PatMedInhosp.cry}锛夛細
* 0=鍦ㄩ櫌锛坽@code endtime is null}锛夈��1=宸插嚭闄€��2=杞銆�3=棰勫叆闄€��
* <p>
+ * 鈿狅笍 绫诲瀷涓庡師瀹炰綋涓�鑷存槸 {@code Integer}锛屽洜涓� XML 閲屾槸**鏁板�兼瘮杈�**
+ * 锛坽@code cry == 0/1/2/3}锛夆�斺�� 鍐欐垚 String 浼氳 OGNL 闈犻殣寮忚浆鎹㈠幓姣旓紝璇箟涓嶆槑纭��
+ * <p>
* 鈿狅笍 瀹冨悓鏃跺喅瀹氭帓搴忥細{@code cry=1/2/3} 鈫� {@code order by endtime desc}锛�
* {@code cry=0} 鈫� 鎸� {@link #bedSort} 涓夐�変竴銆�
*/
- private String cry;
+ private Integer cry;
/**
* 鍦ㄩ櫌鎮ｈ�咃紙{@code cry=0}锛夌殑搴婁綅鎺掑簭鏂瑰悜锛�"asc" / "desc"锛涘叾瀹冨�艰蛋榛樿鎺掑簭銆�
@@ -502,6 +523,40 @@
* 搴婁綅鎸夎嚜鐒跺簭鎺掞紙绌哄簥浣嶆渶鍚� 鈫� 绾暟瀛楁寜鏁板�� 鈫� 甯﹀瓧姣嶆寜闀垮害+瀛楃涓� 鈫� inhospid 鍏滃簳锛夈��
*/
private String bedSort;
+
+ // ---- 鏃堕棿鍖洪棿杩囨护锛堝師 PatMedInhospMapper.xml 鐨� 4 涓� <if>锛� ----
+ /** 杩囨护锛氬嚭闄㈡椂闂村尯闂翠笅鐣� */
+ private Date startOutHospTime;
+ /** 杩囨护锛氬嚭闄㈡椂闂村尯闂翠笂鐣� */
+ private Date endOutHospTime;
+ /** 杩囨护锛氬叆闄㈡椂闂村尯闂翠笅鐣� */
+ private Date startInHospTime;
+ /** 杩囨护锛氬叆闄㈡椂闂村尯闂翠笂鐣� */
+ private Date endInHospTime;
+
+ // ---- 鍗曞�艰繃婊わ紙闅忚閾句笉鍙揪锛屼絾 XML 閲屼繚鐣欎簡鏉′欢锛� ----
+ /** 杩囨护锛氬璇婃寕鍙锋爣璇嗭紙鍘� {@code inhosp_myd_flag}锛� */
+ private String inhospMydFlag;
+ /** 杩囨护锛氬簥浣嶅彿锛堝師 {@code bed_no}锛� */
+ private String bedNo;
+ /** 杩囨护锛氱闄㈡柟寮廔D */
+ private String outWayId;
+ /** 杩囨护锛氱闄㈡柟寮忓悕绉� */
+ private String outWayName;
+ /** 杩囨护锛氬氨璇婃潵婧怚D */
+ private String encounterSourceId;
+ /** 杩囨护锛氶噸瑕佺▼搴︿唬鐮� */
+ private String importanceFlagCode;
+ /** 杩囨护锛氭�ヨ瘖鍒嗙骇浠ｇ爜 */
+ private String emergencyLevelCode;
+ /** 杩囨护锛氬尰闄㈠悕绉帮紙鍘� XML 閲岃鍒楁湭鍔犺〃鍒悕锛� */
+ private String hospitalname;
+ /** 杩囨护锛氳嵂鍝佸悕绉帮紙鐪佺珛鍚屽痉鑽搧瀹ｆ暀锛� */
+ private String medicalName;
+ /** 杩囨护锛氳嵂鍝佸叕鍙革紙鐪佺珛鍚屽痉鑽搧瀹ｆ暀锛� */
+ private String medicalCompany;
+ /** 杩囨护锛氭帓鐝姸鎬侊紙鍘熺被鍨� {@code Long}锛� */
+ private Long schemestatus;
/** 杩囨护锛氱闄㈢瀹ょ紪鐮佸垪琛紙鍘� {@code leaveldeptcodes}锛� */
private java.util.List<String> leaveldeptcodes;
@@ -514,11 +569,11 @@
/** 杩囨护锛氱闄� ICD10 缂栫爜鍒楄〃锛堝師 {@code icd10codeList}锛� */
private java.util.List<String> icd10codeList;
- public String getCry() {
+ public Integer getCry() {
return cry;
}
- public void setCry(String cry) {
+ public void setCry(Integer cry) {
this.cry = cry;
}
@@ -530,6 +585,126 @@
this.bedSort = bedSort;
}
+ public Date getStartOutHospTime() {
+ return startOutHospTime;
+ }
+
+ public void setStartOutHospTime(Date startOutHospTime) {
+ this.startOutHospTime = startOutHospTime;
+ }
+
+ public Date getEndOutHospTime() {
+ return endOutHospTime;
+ }
+
+ public void setEndOutHospTime(Date endOutHospTime) {
+ this.endOutHospTime = endOutHospTime;
+ }
+
+ public Date getStartInHospTime() {
+ return startInHospTime;
+ }
+
+ public void setStartInHospTime(Date startInHospTime) {
+ this.startInHospTime = startInHospTime;
+ }
+
+ public Date getEndInHospTime() {
+ return endInHospTime;
+ }
+
+ public void setEndInHospTime(Date endInHospTime) {
+ this.endInHospTime = endInHospTime;
+ }
+
+ public String getInhospMydFlag() {
+ return inhospMydFlag;
+ }
+
+ public void setInhospMydFlag(String inhospMydFlag) {
+ this.inhospMydFlag = inhospMydFlag;
+ }
+
+ public String getBedNo() {
+ return bedNo;
+ }
+
+ public void setBedNo(String bedNo) {
+ this.bedNo = bedNo;
+ }
+
+ public String getOutWayId() {
+ return outWayId;
+ }
+
+ public void setOutWayId(String outWayId) {
+ this.outWayId = outWayId;
+ }
+
+ public String getOutWayName() {
+ return outWayName;
+ }
+
+ public void setOutWayName(String outWayName) {
+ this.outWayName = outWayName;
+ }
+
+ public String getEncounterSourceId() {
+ return encounterSourceId;
+ }
+
+ public void setEncounterSourceId(String encounterSourceId) {
+ this.encounterSourceId = encounterSourceId;
+ }
+
+ public String getImportanceFlagCode() {
+ return importanceFlagCode;
+ }
+
+ public void setImportanceFlagCode(String importanceFlagCode) {
+ this.importanceFlagCode = importanceFlagCode;
+ }
+
+ public String getEmergencyLevelCode() {
+ return emergencyLevelCode;
+ }
+
+ public void setEmergencyLevelCode(String emergencyLevelCode) {
+ this.emergencyLevelCode = emergencyLevelCode;
+ }
+
+ public String getHospitalname() {
+ return hospitalname;
+ }
+
+ public void setHospitalname(String hospitalname) {
+ this.hospitalname = hospitalname;
+ }
+
+ public String getMedicalName() {
+ return medicalName;
+ }
+
+ public void setMedicalName(String medicalName) {
+ this.medicalName = medicalName;
+ }
+
+ public String getMedicalCompany() {
+ return medicalCompany;
+ }
+
+ public void setMedicalCompany(String medicalCompany) {
+ this.medicalCompany = medicalCompany;
+ }
+
+ public Long getSchemestatus() {
+ return schemestatus;
+ }
+
+ public void setSchemestatus(Long schemestatus) {
+ this.schemestatus = schemestatus;
+ }
+
public java.util.List<String> getLeaveldeptcodes() {
return leaveldeptcodes;
}
--
Gitblit v1.9.3