From 35cd338a6c40833b8c56fbafacc3f411508154dc Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Thu, 12 Mar 2026 16:59:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A9=E5=BC=80=E5=8D=95=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E7=99=BB=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/entity/SysLoginParam.java | 4 + .../common/core/domain/model/LoginParam.java | 1 + .../mapper/RegApplyMapper.java | 2 +- .../interfaceCommon/utils/CommonUtil.java | 2 +- .../main/resources/mapper/RegApplyMapper.xml | 126 ++++++++++++------ .../system/web/service/SysLoginService.java | 77 +++++++---- .../resources/mapper/system/SysUserMapper.xml | 3 +- .../controller/RegRequestInfoController.java | 5 + .../mapper/RegRequestInfoMapper.java | 5 +- .../impl/RegRequestInfoServiceImpl.java | 82 +++++++----- .../resources/mapper/RegRequestInfoMapper.xml | 6 +- .../mapper/RegTransitSampleMapper.xml | 12 +- 12 files changed, 211 insertions(+), 114 deletions(-) diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/SysLoginParam.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/SysLoginParam.java index ecebc8a..acc36b6 100644 --- a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/SysLoginParam.java +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/SysLoginParam.java @@ -21,6 +21,10 @@ public class SysLoginParam { * 登录的医疗机构 */ private String loginYLJG; + /** + * 登录的医疗机构名称 + */ + private String loginYLJGName; /** * 默认仪器 */ diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/model/LoginParam.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/model/LoginParam.java index 878c185..0c6e0e1 100644 --- a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/model/LoginParam.java +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/model/LoginParam.java @@ -9,5 +9,6 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class LoginParam { private String loginYLJG; + private String loginYLJGName; private String localid; } diff --git a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegApplyMapper.java b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegApplyMapper.java index d45301f..b64920d 100644 --- a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegApplyMapper.java +++ b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegApplyMapper.java @@ -4,7 +4,7 @@ import com.transitPlatForm.common.core.domain.entity.reg.RegApply; public interface RegApplyMapper { void insert(RegApply regApply); - RegApply queryOne(RegApply regApply); + RegApply queryOne(String applyid); void update(RegApply regApply); void delete(String applyid); } diff --git a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/utils/CommonUtil.java b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/utils/CommonUtil.java index 290b501..f81e242 100644 --- a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/utils/CommonUtil.java +++ b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/utils/CommonUtil.java @@ -70,7 +70,7 @@ public class CommonUtil { */ public synchronized String getMaxNo(String seqid) { RegSeq seqOne = regSeqMapper.getSeqOne(seqid); - if (seqOne != null) return ""; + if (seqOne == null) return ""; long maxno = seqOne.getMaxno() + 1; seqOne.setMaxno(maxno); regSeqMapper.update(seqOne); diff --git a/pf_interfaceCommon/src/main/resources/mapper/RegApplyMapper.xml b/pf_interfaceCommon/src/main/resources/mapper/RegApplyMapper.xml index 7dbad7f..e8082ba 100644 --- a/pf_interfaceCommon/src/main/resources/mapper/RegApplyMapper.xml +++ b/pf_interfaceCommon/src/main/resources/mapper/RegApplyMapper.xml @@ -3,49 +3,88 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > - insert into reg_apply(PatId, PatCardType, PatCardNo, PatType, RegNo, PatName, PatSex, PatAge, AgeUnit, - PatAgeShow, PatBirthday, PatIdentity, Phone, Address, PatFeeType, DepartCode, - DepartName, AreaCode, AreaName, PatBed, DiagnosisCode, DiagnosisName, ReciNumber, - DoctorCode, DoctorName, OrderTime, ExecDeptCode, ExecDeptName, SrcHospCode, SrcHospName, - Amount, ChargeState, PatInvoiceNum, UserCode, UserName, DataSource, applyid, Status) - values (#{PatId}, - #{PatCardType}, - #{PatCardNo}, - #{PatType}, - #{RegNo}, - #{PatName}, - #{PatSex}, - #{PatAge}, - #{AgeUnit}, - #{PatAgeShow}, - #{PatBirthday}, - #{PatIdentity}, - #{Phone}, - #{Address}, - #{PatFeeType}, - #{DepartCode}, - #{DepartName}, - #{AreaCode}, - #{AreaName}, - #{PatBed}, - #{DiagnosisCode}, - #{DiagnosisName}, - #{ReciNumber}, - #{DoctorCode}, - #{DoctorName}, - #{OrderTime}, - #{ExecDeptCode}, - #{ExecDeptName}, - #{SrcHospCode}, - #{SrcHospName}, - #{Amount}, - #{ChargeState}, - #{PatInvoiceNum}, - #{UserCode}, - #{UserName}, - #{DataSource}, - #{applyid}, - #{Status}) + insert into reg_apply( + PatId, + PatCardType, + PatCardNo, + PatType, + RegNo, + PatName, + PatSex, + PatAge, + AgeUnit, + PatAgeShow, + PatBirthday, + PatIdentity, + Phone, + Address, + PatFeeType, + DepartCode, + DepartName, + AreaCode, + AreaName, + PatBed, + DiagnosisCode, + DiagnosisName, + ReciNumber, + DoctorCode, + DoctorName, + OrderTime, + ExecDeptCode, + ExecDeptName, + SrcHospCode, + SrcHospName, + Amount, + ChargeState, + PatInvoiceNum, + UserCode, + UserName, + DataSource, + applyid, + Status, + create_by,create_time + ) + values ( + #{PatId}, + #{PatCardType}, + #{PatCardNo}, + #{PatType}, + #{RegNo}, + #{PatName}, + #{PatSex}, + #{PatAge}, + #{AgeUnit}, + #{PatAgeShow}, + #{PatBirthday}, + #{PatIdentity}, + #{Phone}, + #{Address}, + #{PatFeeType}, + #{DepartCode}, + #{DepartName}, + #{AreaCode}, + #{AreaName}, + #{PatBed}, + #{DiagnosisCode}, + #{DiagnosisName}, + #{ReciNumber}, + #{DoctorCode}, + #{DoctorName}, + #{OrderTime}, + #{ExecDeptCode}, + #{ExecDeptName}, + #{SrcHospCode}, + #{SrcHospName}, + #{Amount}, + #{ChargeState}, + #{PatInvoiceNum}, + #{UserCode}, + #{UserName}, + #{DataSource}, + #{applyid}, + #{Status}, + #{create_by},#{create_time} + ) + + \ No newline at end of file diff --git a/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml b/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml index 7785e17..1c9d589 100644 --- a/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml @@ -43,7 +43,7 @@ PatAge, AgeUnit, PatAgeShow, - PatBirthday, + PatBirthday, PatIdentity, Phone, Address, @@ -99,7 +99,7 @@ #{PatAge}, #{AgeUnit}, #{PatAgeShow}, - #{PatBirthday}, + #{PatBirthday}, #{PatIdentity}, #{Phone}, #{Address}, @@ -159,6 +159,10 @@ FeeName, Cost, Status, + applyid, + applyDetailId, + bz1, + bz2, Barcode,OrderItemSerial,create_by,create_time,update_by,update_time )values( #{OrderItemCode}, @@ -171,6 +175,10 @@ #{FeeName}, #{Cost}, #{Status}, + #{applyid}, + #{applyDetailId}, + #{bz1}, + #{bz2}, #{Barcode},#{OrderItemSerial},#{create_by},#{create_time},#{update_by},#{update_time} )