From d5d5f65e1bd2bcdcbe73f8baaaeb421ccd284776 Mon Sep 17 00:00:00 2001 From: ALW <850658129@qq.com> Date: Wed, 22 Jun 2022 16:42:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8F=90=E4=BA=A4=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E6=96=87=E4=BB=B6=E8=A1=A8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emr/controller/ArchiveOtherExtController.java | 2 ++ .../java/com/emr/dao/ArchiveOtherExtMapper.java | 4 ++++ .../emr/service/ipml/ArchiveOtherExtService.java | 9 ++++++++- .../service/ipml/Archive_MasterServiceImpl.java | 8 ++------ src/main/resources/config/config.properties | 4 ++-- src/main/resources/config/jdbc.properties | 2 +- .../resources/mapper/ArchiveOtherExtMapper.xml | 15 ++++++++++++++- .../resources/mapper/Archive_MasterMapper.xml | 6 +++--- 8 files changed, 36 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/emr/controller/ArchiveOtherExtController.java b/src/main/java/com/emr/controller/ArchiveOtherExtController.java index fe1e791..0a0972f 100644 --- a/src/main/java/com/emr/controller/ArchiveOtherExtController.java +++ b/src/main/java/com/emr/controller/ArchiveOtherExtController.java @@ -93,7 +93,9 @@ public class ArchiveOtherExtController { @RequestMapping("submitUpdate1") @ResponseBody public Msg submitUpdate1(String ids){ + archiveOtherExtService.updateSubmit1(ids); + return Msg.success(); } diff --git a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java index d76e394..3caa82e 100644 --- a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java +++ b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java @@ -27,7 +27,11 @@ public interface ArchiveOtherExtMapper { int updateSubmit(@Param("ids")String ids); + List selectDiD(@Param("ids") String ids); + List selectDetailByDid(@Param("did") String did); + + int delDetailByDid(@Param("did") String did); /** * 根据ids字段的查询与同步更新比较时间比较较晚时间的集合 * @param ids diff --git a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java index 87aad5e..e4e1ed3 100644 --- a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java +++ b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java @@ -150,7 +150,14 @@ public class ArchiveOtherExtService { } public void updateSubmit1(String ids){ - //定义需要新增的集合 + List archiveOtherExtVos = archiveOtherExtMapper.selectDiD(ids); + for (ArchiveOtherExtVo a:archiveOtherExtVos){ + String did = a.getDid(); + List archiveOtherExtVos1 = archiveOtherExtMapper.selectDetailByDid(did); + if (archiveOtherExtVos1.size()>0){ + archiveOtherExtMapper.delDetailByDid(did); + } + } archiveOtherExtMapper.updateSubmit(ids); } diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index affdb31..24c67b1 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -1235,9 +1235,9 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { } Archive_Master archive_master_vos = archive_masterVos.get(0); CommomVo commomVo=new CommomVo(); - commomVo.setPatientId(archive_master_vos.getPatientId()); + commomVo.setPatientId(archive_master_vos.getId()); commomVo.setAdmissTimes(archive_master_vos.getVisitId()); - commomVo.setAdmissId(archive_master_vos.getId()); + commomVo.setAdmissId(archive_master_vos.getInpNo()); commomVo.setInpatientNo(archive_master_vos.getInpNo()); commomVo.setName(archive_master_vos.getName()); commomVo.setCheckedDatetime(format1.format(new Date())); @@ -1267,10 +1267,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { int i1 = i * 12; String s = String.valueOf(i1); commomVo.setAgeMonth(s); -// int i2 = Integer.parseInt(substring); -// int i3 = i2 * 12; -// String s = String.valueOf(i3); -// commomVo.setAgeMonth(s); commomVo.setAdmissDate(archive_master_vos.getAdmissionDateTime()); commomVo.setDisDate(archive_master_vos.getDischargeDateTime()); commomVo.setDisDept(archive_master_vos.getDeptName1()); diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index f29c6a0..a5fb90f 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -2,8 +2,8 @@ #POWER_IP = localhost #POWER_PORT = 8081 -POWER_IP = 200.100.104.40 -POWER_PORT = 8081 +POWER_IP = localhost +POWER_PORT = 8082 #power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934 POWER_URLHEAD = http://${POWER_IP}:${POWER_PORT}/power diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index ce9e23d..49f8c6a 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -3,7 +3,7 @@ dataBaseIp=localhost #\u6570\u636E\u5E93\u540D\u79F0 dataBaseName=gm_record #\u6570\u636E\u5E93\u5BC6\u7801 -dataBasePassword=docus702 +dataBasePassword=admin123 #\u6570\u636E\u5E93IP #dataBaseIp=200.100.104.40 diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml index 16efa88..939b551 100644 --- a/src/main/resources/mapper/ArchiveOtherExtMapper.xml +++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml @@ -52,6 +52,10 @@ delete from archive_other_ext where ID = #{id,jdbcType=BIGINT} + + delete from archive_detail + where ID = #{did} + insert into archive_other_ext (ID, SycTime, SycObj, otherID, sysFlag, sysUpdateTime, @@ -800,9 +804,18 @@ and statusFlag =2 AND statusFlag !=0 + + - + diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index eb36601..3581710 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -1750,9 +1750,9 @@