From 0b2fec8da75c4eda629ae69ac9f738502d79bae7 Mon Sep 17 00:00:00 2001 From: zzc Date: Tue, 6 May 2025 22:54:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=A3=E8=80=85=E6=A1=A3=E6=A1=88=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=BA=AB=E9=AB=98=E3=80=81=E4=BD=93=E9=87=8D=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=20=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=82=A3=E8=80=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/web/PmsPatientController.java | 7 + .../src/main/resources/mbg.xml | 4 +- .../system/domain/dto/PmsPatientDto.java | 5 +- .../system/domain/po/PmsPatient.java | 34 ++- .../system/domain/po/PmsPatientExample.java | 196 +++++++++++++++--- .../system/domain/vo/PmsPatientVo.java | 2 + .../system/service/PmsPatientService.java | 2 + .../service/impl/PmsPatientServiceImpl.java | 46 +++- .../service/impl/ScreeningServiceImpl.java | 8 +- .../resources/mapper/dao/PmsPatientDao.xml | 6 + .../mapper/system/PmsPatientMapper.xml | 68 ++++-- 11 files changed, 317 insertions(+), 61 deletions(-) diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/PmsPatientController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/PmsPatientController.java index 27e3a02f..8b1d27b5 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/PmsPatientController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/PmsPatientController.java @@ -78,4 +78,11 @@ public class PmsPatientController { return JsonResponse.ok(); } + @ApiOperation("导入患者信息") + @PostMapping("/import1") + public JsonResponse importPatient1(MultipartFile file) throws IOException{ + pmsPatientService.importPatient1(file); + return JsonResponse.ok(); + } + } diff --git a/acupuncture-generator/src/main/resources/mbg.xml b/acupuncture-generator/src/main/resources/mbg.xml index b655781a..d3e1f019 100644 --- a/acupuncture-generator/src/main/resources/mbg.xml +++ b/acupuncture-generator/src/main/resources/mbg.xml @@ -80,8 +80,8 @@ - - +
+ diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/PmsPatientDto.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/PmsPatientDto.java index b32278eb..fca1a0e8 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/PmsPatientDto.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/PmsPatientDto.java @@ -59,7 +59,8 @@ public class PmsPatientDto { private String idCard; private Byte source; - + private String weight; + private String height; private List currentIllnessHistory; private String currentIllnessHistoryQt; public String getCurrentIllnessHistory() { @@ -91,6 +92,8 @@ public class PmsPatientDto { private String idCard; private Byte source; + private String weight; + private String height; private List currentIllnessHistory; private String currentIllnessHistoryQt; diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatient.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatient.java index 809e35d3..eb3ef191 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatient.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatient.java @@ -30,7 +30,9 @@ public class PmsPatient implements Serializable { private String currentIllnessHistory; - private String currentIllnessHistoryQt; + private String weight; + + private String height; private Byte delFlag; @@ -46,6 +48,8 @@ public class PmsPatient implements Serializable { private String remark; + private String currentIllnessHistoryQt; + private static final long serialVersionUID = 1L; public Long getId() { @@ -152,12 +156,20 @@ public class PmsPatient implements Serializable { this.currentIllnessHistory = currentIllnessHistory == null ? null : currentIllnessHistory.trim(); } - public String getCurrentIllnessHistoryQt() { - return currentIllnessHistoryQt; + public String getWeight() { + return weight; } - public void setCurrentIllnessHistoryQt(String currentIllnessHistoryQt) { - this.currentIllnessHistoryQt = currentIllnessHistoryQt == null ? null : currentIllnessHistoryQt.trim(); + public void setWeight(String weight) { + this.weight = weight == null ? null : weight.trim(); + } + + public String getHeight() { + return height; + } + + public void setHeight(String height) { + this.height = height == null ? null : height.trim(); } public Byte getDelFlag() { @@ -216,6 +228,14 @@ public class PmsPatient implements Serializable { this.remark = remark == null ? null : remark.trim(); } + public String getCurrentIllnessHistoryQt() { + return currentIllnessHistoryQt; + } + + public void setCurrentIllnessHistoryQt(String currentIllnessHistoryQt) { + this.currentIllnessHistoryQt = currentIllnessHistoryQt == null ? null : currentIllnessHistoryQt.trim(); + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -235,7 +255,8 @@ public class PmsPatient implements Serializable { sb.append(", idCard=").append(idCard); sb.append(", source=").append(source); sb.append(", currentIllnessHistory=").append(currentIllnessHistory); - sb.append(", currentIllnessHistoryQt=").append(currentIllnessHistoryQt); + sb.append(", weight=").append(weight); + sb.append(", height=").append(height); sb.append(", delFlag=").append(delFlag); sb.append(", tenantId=").append(tenantId); sb.append(", createBy=").append(createBy); @@ -243,6 +264,7 @@ public class PmsPatient implements Serializable { sb.append(", updateBy=").append(updateBy); sb.append(", updateTime=").append(updateTime); sb.append(", remark=").append(remark); + sb.append(", currentIllnessHistoryQt=").append(currentIllnessHistoryQt); sb.append("]"); return sb.toString(); } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatientExample.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatientExample.java index f386307f..491f9efa 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatientExample.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatientExample.java @@ -982,73 +982,143 @@ public class PmsPatientExample { return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtIsNull() { - addCriterion("current_illness_history_qt is null"); + public Criteria andWeightIsNull() { + addCriterion("weight is null"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtIsNotNull() { - addCriterion("current_illness_history_qt is not null"); + public Criteria andWeightIsNotNull() { + addCriterion("weight is not null"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtEqualTo(String value) { - addCriterion("current_illness_history_qt =", value, "currentIllnessHistoryQt"); + public Criteria andWeightEqualTo(String value) { + addCriterion("weight =", value, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtNotEqualTo(String value) { - addCriterion("current_illness_history_qt <>", value, "currentIllnessHistoryQt"); + public Criteria andWeightNotEqualTo(String value) { + addCriterion("weight <>", value, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtGreaterThan(String value) { - addCriterion("current_illness_history_qt >", value, "currentIllnessHistoryQt"); + public Criteria andWeightGreaterThan(String value) { + addCriterion("weight >", value, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtGreaterThanOrEqualTo(String value) { - addCriterion("current_illness_history_qt >=", value, "currentIllnessHistoryQt"); + public Criteria andWeightGreaterThanOrEqualTo(String value) { + addCriterion("weight >=", value, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtLessThan(String value) { - addCriterion("current_illness_history_qt <", value, "currentIllnessHistoryQt"); + public Criteria andWeightLessThan(String value) { + addCriterion("weight <", value, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtLessThanOrEqualTo(String value) { - addCriterion("current_illness_history_qt <=", value, "currentIllnessHistoryQt"); + public Criteria andWeightLessThanOrEqualTo(String value) { + addCriterion("weight <=", value, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtLike(String value) { - addCriterion("current_illness_history_qt like", value, "currentIllnessHistoryQt"); + public Criteria andWeightLike(String value) { + addCriterion("weight like", value, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtNotLike(String value) { - addCriterion("current_illness_history_qt not like", value, "currentIllnessHistoryQt"); + public Criteria andWeightNotLike(String value) { + addCriterion("weight not like", value, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtIn(List values) { - addCriterion("current_illness_history_qt in", values, "currentIllnessHistoryQt"); + public Criteria andWeightIn(List values) { + addCriterion("weight in", values, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtNotIn(List values) { - addCriterion("current_illness_history_qt not in", values, "currentIllnessHistoryQt"); + public Criteria andWeightNotIn(List values) { + addCriterion("weight not in", values, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtBetween(String value1, String value2) { - addCriterion("current_illness_history_qt between", value1, value2, "currentIllnessHistoryQt"); + public Criteria andWeightBetween(String value1, String value2) { + addCriterion("weight between", value1, value2, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtNotBetween(String value1, String value2) { - addCriterion("current_illness_history_qt not between", value1, value2, "currentIllnessHistoryQt"); + public Criteria andWeightNotBetween(String value1, String value2) { + addCriterion("weight not between", value1, value2, "weight"); + return (Criteria) this; + } + + public Criteria andHeightIsNull() { + addCriterion("height is null"); + return (Criteria) this; + } + + public Criteria andHeightIsNotNull() { + addCriterion("height is not null"); + return (Criteria) this; + } + + public Criteria andHeightEqualTo(String value) { + addCriterion("height =", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotEqualTo(String value) { + addCriterion("height <>", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightGreaterThan(String value) { + addCriterion("height >", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightGreaterThanOrEqualTo(String value) { + addCriterion("height >=", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightLessThan(String value) { + addCriterion("height <", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightLessThanOrEqualTo(String value) { + addCriterion("height <=", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightLike(String value) { + addCriterion("height like", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotLike(String value) { + addCriterion("height not like", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightIn(List values) { + addCriterion("height in", values, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotIn(List values) { + addCriterion("height not in", values, "height"); + return (Criteria) this; + } + + public Criteria andHeightBetween(String value1, String value2) { + addCriterion("height between", value1, value2, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotBetween(String value1, String value2) { + addCriterion("height not between", value1, value2, "height"); return (Criteria) this; } @@ -1501,6 +1571,76 @@ public class PmsPatientExample { addCriterion("remark not between", value1, value2, "remark"); return (Criteria) this; } + + public Criteria andCurrentIllnessHistoryQtIsNull() { + addCriterion("current_illness_history_qt is null"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtIsNotNull() { + addCriterion("current_illness_history_qt is not null"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtEqualTo(String value) { + addCriterion("current_illness_history_qt =", value, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtNotEqualTo(String value) { + addCriterion("current_illness_history_qt <>", value, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtGreaterThan(String value) { + addCriterion("current_illness_history_qt >", value, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtGreaterThanOrEqualTo(String value) { + addCriterion("current_illness_history_qt >=", value, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtLessThan(String value) { + addCriterion("current_illness_history_qt <", value, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtLessThanOrEqualTo(String value) { + addCriterion("current_illness_history_qt <=", value, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtLike(String value) { + addCriterion("current_illness_history_qt like", value, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtNotLike(String value) { + addCriterion("current_illness_history_qt not like", value, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtIn(List values) { + addCriterion("current_illness_history_qt in", values, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtNotIn(List values) { + addCriterion("current_illness_history_qt not in", values, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtBetween(String value1, String value2) { + addCriterion("current_illness_history_qt between", value1, value2, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtNotBetween(String value1, String value2) { + addCriterion("current_illness_history_qt not between", value1, value2, "currentIllnessHistoryQt"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsPatientVo.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsPatientVo.java index 7a80fa59..084e8bfa 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsPatientVo.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsPatientVo.java @@ -42,6 +42,8 @@ public class PmsPatientVo { @ApiModelProperty("现病史，存储格式：[\"高血压\",\"脑血管病\"]") private String currentIllnessHistory; private String currentIllnessHistoryQt; + private String weight; + private String height; @ApiModelProperty("建档组织（当前登录账号医院ID）") private Long tenantId; @ApiModelProperty("创建者") diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/PmsPatientService.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/PmsPatientService.java index 520ae4f1..06cc9204 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/PmsPatientService.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/PmsPatientService.java @@ -50,6 +50,8 @@ public interface PmsPatientService { void importPatient(MultipartFile file) throws IOException; + void importPatient1(MultipartFile file) throws IOException; + /** * 查询患者信息 * @param dto diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java index c9494055..fa9c60ff 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java @@ -74,6 +74,7 @@ public class PmsPatientServiceImpl implements PmsPatientService { PmsPatient pmsPatient = BeanUtil.copyProperties(dto, PmsPatient.class); pmsPatient.setUpdateBy(SecurityUtils.getUsername()); pmsPatient.setUpdateTime(new Date()); + pmsPatient.setId(pmsPatients.get(0).getId()); pmsPatient.setPinyinFull(PinyinUtil.getPinyin(dto.getName(), "")); pmsPatient.setPinyinSimple(PinyinUtil.getFirstLetter(dto.getName(), "")); pmsPatientMapper.updateByPrimaryKeySelective(pmsPatient); @@ -269,6 +270,41 @@ public class PmsPatientServiceImpl implements PmsPatientService { } } + @Override + public void importPatient1(MultipartFile file) throws IOException { + //读取excel + List pmsPatientList = CollectionUtil.newArrayList(); + ExcelUtil.readBySax(file.getInputStream(), 0, (sheetIndex, rowIndex, rowList) -> { + //中铝新材料有限公司电解厂2024年度职工健康体检统计表（非高温） + //序号 姓名 性别 出生日期 身份证号 婚姻状况 联系电话 部门 工号 工种 民族 国籍 防护措施 总工龄(年) 总工龄(月) 接害工龄(年) 接害工龄(月) 体检类别 + try { + if (rowIndex < 4) { + return; + } + PmsPatient patient = new PmsPatient(); + patient.setName(rowList.get(1).toString() + "-" + rowList.get(2).toString()); + patient.setGender(rowList.get(3).toString().trim().equals("男") ? (byte) 0 : (byte) 1); + patient.setPinyinFull(PinyinUtil.getPinyin(rowList.get(2).toString(), "")); + patient.setPinyinSimple(PinyinUtil.getFirstLetter(rowList.get(2).toString(), "")); + patient.setBirthDate(DateUtil.parse(rowList.get(4).toString())); + patient.setCreateBy(SecurityUtils.getUsername()); + patient.setId(IdUtil.getSnowflakeNextId()); + patient.setTenantId(SecurityUtils.getTenantId()); + patient.setDelFlag((byte) 0); + patient.setCreateTime(new Date()); + pmsPatientList.add(patient); + } catch (Exception e) { + e.printStackTrace(); + throw new BaseException(StrUtil.format("导入患者信息错误：sheet:{},row:{}, {}", + sheetIndex + 1, rowIndex + 1, ExceptionUtil.getExceptionMessage(e))); + } + }); + if (CollectionUtil.isNotEmpty(pmsPatientList)) { + //批量插入 + batchSave(pmsPatientList); + } + } + @Override public List adminQuery(PmsPatientDto.PatientQuery dto) { return pmsPatientDao.adminQuery(dto); @@ -310,20 +346,22 @@ public class PmsPatientServiceImpl implements PmsPatientService { } } writer.writeCellValue(8, row, patientList.get(i).getIdCard()); + writer.writeCellValue(9, row, patientList.get(i).getWeight()); + writer.writeCellValue(10, row, patientList.get(i).getHeight()); Integer source = patientList.get(i).getSource(); if (source != null) { switch (source) { case 0: - writer.writeCellValue(9, row, "筛查"); + writer.writeCellValue(11, row, "筛查"); break; case 1: - writer.writeCellValue(9, row, "录入"); + writer.writeCellValue(11, row, "录入"); break; case 2: - writer.writeCellValue(9, row, "HIS"); + writer.writeCellValue(11, row, "HIS"); } } - writer.writeCellValue(10, row, patientList.get(i).getCurrentIllnessHistory()); + writer.writeCellValue(12, row, patientList.get(i).getCurrentIllnessHistory()); } String filename = StrUtil.format("患者档案-{}.xlsx", DateUtil.date().toString("yyyyMMdd")); diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java index dd0550ef..3b4c4897 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java @@ -441,7 +441,7 @@ public class ScreeningServiceImpl implements IScreeningService { ScrScreeningDetailExample scrScreeningDetailExample = new ScrScreeningDetailExample(); scrScreeningDetailExample.createCriteria().andDelFlagEqualTo((byte) 0).andRecordIdEqualTo(param.getDetailId()) .andQuestionCodeIn(CollectionUtil.newArrayList("SCWJ-NAME", "SCWJ-SEX", "SCWJ-BIRTH", - "SCWJ-AGE", "SCWJ-PHONE", "SCWJ-XBS")); + "SCWJ-AGE", "SCWJ-PHONE", "SCWJ-XBS", "SCWJ-HEIGHT", "SCWJ-WEIGHT")); List scrScreeningDetails = screeningDetailDao.selectByExample(scrScreeningDetailExample); if (CollectionUtil.isNotEmpty(scrScreeningDetails)) { Map map = scrScreeningDetails.stream().collect(Collectors.toMap(ScrScreeningDetail::getQuestionCode, Function.identity())); @@ -477,6 +477,12 @@ public class ScreeningServiceImpl implements IScreeningService { if (ObjectUtil.isNotNull(map.get("SCWJ-XBS-QT"))) { pmsPatient.setCurrentIllnessHistory(map.get("SCWJ-XBS-QT").getAnswer()); } + if (ObjectUtil.isNotNull(map.get("SCWJ-HEIGHT"))) { + pmsPatient.setHeight(map.get("SCWJ-HEIGHT").getAnswer()); + } + if (ObjectUtil.isNotNull(map.get("SCWJ-WEIGHT"))) { + pmsPatient.setWeight(map.get("SCWJ-WEIGHT").getAnswer()); + } pmsPatient.setSource((byte) 0); pmsPatient.setDelFlag((byte) 0); pmsPatient.setCreateTime(new Date()); diff --git a/acupuncture-system/src/main/resources/mapper/dao/PmsPatientDao.xml b/acupuncture-system/src/main/resources/mapper/dao/PmsPatientDao.xml index 84f1c1f4..90d21e84 100644 --- a/acupuncture-system/src/main/resources/mapper/dao/PmsPatientDao.xml +++ b/acupuncture-system/src/main/resources/mapper/dao/PmsPatientDao.xml @@ -21,6 +21,8 @@ p.tenant_id as tenantId, p.create_by as createBy, p.create_time as createTime, + p.weight, + p.height, t.name as tenantName FROM pms_patient p @@ -83,6 +85,8 @@ p.tenant_id as tenantId, p.create_by as createBy, p.create_time as createTime, + p.weight, + p.height, t.name as tenantName FROM v_pms_patient p @@ -140,6 +144,7 @@ id_card_type, id_card, source, + tenant_id, current_illness_history, create_by, create_time @@ -159,6 +164,7 @@ #{patient.idCardType}, #{patient.idCard}, #{patient.source}, + #{patient.tenantId}, #{patient.currentIllnessHistory}, #{patient.createBy}, #{patient.createTime} diff --git a/acupuncture-system/src/main/resources/mapper/system/PmsPatientMapper.xml b/acupuncture-system/src/main/resources/mapper/system/PmsPatientMapper.xml index ada11a21..7f8a728c 100644 --- a/acupuncture-system/src/main/resources/mapper/system/PmsPatientMapper.xml +++ b/acupuncture-system/src/main/resources/mapper/system/PmsPatientMapper.xml @@ -15,7 +15,8 @@ - + + @@ -23,6 +24,7 @@ + @@ -84,8 +86,8 @@ id, name, pinyin_full, pinyin_simple, gender, birth_date, ethnicity, education_years, - phone, id_card_type, id_card, source, current_illness_history, current_illness_history_qt, - del_flag, tenant_id, create_by, create_time, update_by, update_time, remark + phone, id_card_type, id_card, source, current_illness_history, weight, height, del_flag, + tenant_id, create_by, create_time, update_by, update_time, remark, current_illness_history_qt @@ -310,8 +324,11 @@ current_illness_history = #{record.currentIllnessHistory,jdbcType=VARCHAR}, - - current_illness_history_qt = #{record.currentIllnessHistoryQt,jdbcType=VARCHAR}, + + weight = #{record.weight,jdbcType=VARCHAR}, + + + height = #{record.height,jdbcType=VARCHAR}, del_flag = #{record.delFlag,jdbcType=TINYINT}, @@ -334,6 +351,9 @@ remark = #{record.remark,jdbcType=VARCHAR}, + + current_illness_history_qt = #{record.currentIllnessHistoryQt,jdbcType=VARCHAR}, + @@ -354,14 +374,16 @@ id_card = #{record.idCard,jdbcType=VARCHAR}, source = #{record.source,jdbcType=TINYINT}, current_illness_history = #{record.currentIllnessHistory,jdbcType=VARCHAR}, - current_illness_history_qt = #{record.currentIllnessHistoryQt,jdbcType=VARCHAR}, + weight = #{record.weight,jdbcType=VARCHAR}, + height = #{record.height,jdbcType=VARCHAR}, del_flag = #{record.delFlag,jdbcType=TINYINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT}, create_by = #{record.createBy,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=TIMESTAMP}, update_by = #{record.updateBy,jdbcType=VARCHAR}, update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - remark = #{record.remark,jdbcType=VARCHAR} + remark = #{record.remark,jdbcType=VARCHAR}, + current_illness_history_qt = #{record.currentIllnessHistoryQt,jdbcType=VARCHAR} @@ -405,8 +427,11 @@ current_illness_history = #{currentIllnessHistory,jdbcType=VARCHAR}, - - current_illness_history_qt = #{currentIllnessHistoryQt,jdbcType=VARCHAR}, + + weight = #{weight,jdbcType=VARCHAR}, + + + height = #{height,jdbcType=VARCHAR}, del_flag = #{delFlag,jdbcType=TINYINT}, @@ -429,6 +454,9 @@ remark = #{remark,jdbcType=VARCHAR}, + + current_illness_history_qt = #{currentIllnessHistoryQt,jdbcType=VARCHAR}, + where id = #{id,jdbcType=BIGINT} @@ -446,14 +474,16 @@ id_card = #{idCard,jdbcType=VARCHAR}, source = #{source,jdbcType=TINYINT}, current_illness_history = #{currentIllnessHistory,jdbcType=VARCHAR}, - current_illness_history_qt = #{currentIllnessHistoryQt,jdbcType=VARCHAR}, + weight = #{weight,jdbcType=VARCHAR}, + height = #{height,jdbcType=VARCHAR}, del_flag = #{delFlag,jdbcType=TINYINT}, tenant_id = #{tenantId,jdbcType=BIGINT}, create_by = #{createBy,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP}, update_by = #{updateBy,jdbcType=VARCHAR}, update_time = #{updateTime,jdbcType=TIMESTAMP}, - remark = #{remark,jdbcType=VARCHAR} + remark = #{remark,jdbcType=VARCHAR}, + current_illness_history_qt = #{currentIllnessHistoryQt,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT} \ No newline at end of file