From 41e33285c63abda0ab5dfeaeef586177908b0484 Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Mon, 16 Mar 2026 11:20:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=8A=9B=E5=90=8C=E6=AD=A5=E6=97=B6?= =?UTF-8?q?=E5=A4=84=E7=90=86=E9=83=A8=E9=97=A8id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mbg.xml | 18 +++--- .../system/domain/po/PmsPatientBody.java | 11 ++++ .../domain/po/PmsPatientBodyExample.java | 60 +++++++++++++++++++ .../system/service/impl/DockServiceImpl.java | 3 + .../mapper/system/PmsPatientBodyMapper.xml | 25 ++++++-- .../resources/mapper/dao/PmsPatientDao.xml | 59 ------------------ 6 files changed, 103 insertions(+), 73 deletions(-) diff --git a/ruisi_java/ruisi-cc-generator/src/main/resources/mbg.xml b/ruisi_java/ruisi-cc-generator/src/main/resources/mbg.xml index 3125ed2..695ce47 100644 --- a/ruisi_java/ruisi-cc-generator/src/main/resources/mbg.xml +++ b/ruisi_java/ruisi-cc-generator/src/main/resources/mbg.xml @@ -20,9 +20,9 @@ + password="123456"> @@ -70,12 +70,12 @@ - -
-
-
-
-
+ + + + + + @@ -121,7 +121,7 @@ -
+ diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/PmsPatientBody.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/PmsPatientBody.java index 49690bb..9f81c46 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/PmsPatientBody.java +++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/PmsPatientBody.java @@ -98,6 +98,8 @@ public class PmsPatientBody implements Serializable { private String visitType; + private Long deptId; + private static final long serialVersionUID = 1L; public Long getId() { @@ -476,6 +478,14 @@ public class PmsPatientBody implements Serializable { this.visitType = visitType == null ? null : visitType.trim(); } + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -529,6 +539,7 @@ public class PmsPatientBody implements Serializable { sb.append(", diagnosisDate=").append(diagnosisDate); sb.append(", bmi=").append(bmi); sb.append(", visitType=").append(visitType); + sb.append(", deptId=").append(deptId); sb.append("]"); return sb.toString(); } diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/PmsPatientBodyExample.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/PmsPatientBodyExample.java index 938da8c..e6c8267 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/PmsPatientBodyExample.java +++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/PmsPatientBodyExample.java @@ -3314,6 +3314,66 @@ public class PmsPatientBodyExample { addCriterion("visit_type not between", value1, value2, "visitType"); return (Criteria) this; } + + public Criteria andDeptIdIsNull() { + addCriterion("dept_id is null"); + return (Criteria) this; + } + + public Criteria andDeptIdIsNotNull() { + addCriterion("dept_id is not null"); + return (Criteria) this; + } + + public Criteria andDeptIdEqualTo(Long value) { + addCriterion("dept_id =", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdNotEqualTo(Long value) { + addCriterion("dept_id <>", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdGreaterThan(Long value) { + addCriterion("dept_id >", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdGreaterThanOrEqualTo(Long value) { + addCriterion("dept_id >=", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdLessThan(Long value) { + addCriterion("dept_id <", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdLessThanOrEqualTo(Long value) { + addCriterion("dept_id <=", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdIn(List values) { + addCriterion("dept_id in", values, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdNotIn(List values) { + addCriterion("dept_id not in", values, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdBetween(Long value1, Long value2) { + addCriterion("dept_id between", value1, value2, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdNotBetween(Long value1, Long value2) { + addCriterion("dept_id not between", value1, value2, "deptId"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/service/impl/DockServiceImpl.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/service/impl/DockServiceImpl.java index 1a59499..045f44a 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/service/impl/DockServiceImpl.java +++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/service/impl/DockServiceImpl.java @@ -581,6 +581,7 @@ public class DockServiceImpl implements DockService { List sysDepts = sysDeptMapper.selectDeptList(sysDept); if (CollUtil.isNotEmpty(sysDepts)) { deptName = sysDepts.get(0).getDeptName(); + deptId = sysDepts.get(0).getDeptId(); } } @@ -628,6 +629,7 @@ public class DockServiceImpl implements DockService { pmsPatientBody.setPatientId(pmsPatient.getId()); disposePmsPatientBody(dockPatientVisitInfo, pmsPatientBody); pmsPatientBody.setDepartment(deptName); + pmsPatientBody.setDeptId(deptId); pmsPatientBodyMapper.updateByPrimaryKeySelective(pmsPatientBody); } else { pmsPatientBody = new PmsPatientBody(); @@ -635,6 +637,7 @@ public class DockServiceImpl implements DockService { pmsPatientBody.setPatientId(pmsPatient.getId()); disposePmsPatientBody(dockPatientVisitInfo, pmsPatientBody); pmsPatientBody.setDepartment(deptName); + pmsPatientBody.setDeptId(deptId); pmsPatientBodyMapper.insertSelective(pmsPatientBody); } return pmsPatientBody; diff --git a/ruisi_java/ruisi-system/src/main/resources/mapper/system/PmsPatientBodyMapper.xml b/ruisi_java/ruisi-system/src/main/resources/mapper/system/PmsPatientBodyMapper.xml index b6652e9..70f6b6d 100644 --- a/ruisi_java/ruisi-system/src/main/resources/mapper/system/PmsPatientBodyMapper.xml +++ b/ruisi_java/ruisi-system/src/main/resources/mapper/system/PmsPatientBodyMapper.xml @@ -49,6 +49,7 @@ + @@ -115,7 +116,7 @@ admission_method, admission_method_other, bed_number, discharge_date, discharge_method, tz, temperature, systolic_pressure, diastolic_pressure, pulse, creatinine, oxygen_saturation, albumin, total_protein, vitamin_d3, hematocrit, dimer, diagnosis_type, is_main_diagnosis, - diagnosis_code, diagnosis_name, diagnosis_date, bmi, visit_type + diagnosis_code, diagnosis_name, diagnosis_date, bmi, visit_type, dept_id @@ -622,6 +629,9 @@ visit_type = #{record.visitType,jdbcType=VARCHAR}, + + dept_id = #{record.deptId,jdbcType=BIGINT}, + @@ -675,7 +685,8 @@ diagnosis_name = #{record.diagnosisName,jdbcType=VARCHAR}, diagnosis_date = #{record.diagnosisDate,jdbcType=VARCHAR}, bmi = #{record.bmi,jdbcType=VARCHAR}, - visit_type = #{record.visitType,jdbcType=VARCHAR} + visit_type = #{record.visitType,jdbcType=VARCHAR}, + dept_id = #{record.deptId,jdbcType=BIGINT} @@ -821,6 +832,9 @@ visit_type = #{visitType,jdbcType=VARCHAR}, + + dept_id = #{deptId,jdbcType=BIGINT}, + where id = #{id,jdbcType=BIGINT} @@ -871,7 +885,8 @@ diagnosis_name = #{diagnosisName,jdbcType=VARCHAR}, diagnosis_date = #{diagnosisDate,jdbcType=VARCHAR}, bmi = #{bmi,jdbcType=VARCHAR}, - visit_type = #{visitType,jdbcType=VARCHAR} + visit_type = #{visitType,jdbcType=VARCHAR}, + dept_id = #{deptId,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/PmsPatientDao.xml b/ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/PmsPatientDao.xml index f4c38e1..344e3b7 100644 --- a/ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/PmsPatientDao.xml +++ b/ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/PmsPatientDao.xml @@ -24,64 +24,6 @@