From 199e18270079128e82cc6b17c75433ff5fe959f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=87=E5=AE=99=E7=9A=AE=E7=9A=AE=E5=A8=83?= <2964346877@qq.com> Date: Tue, 14 Mar 2023 13:55:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=B8=90=E5=8F=B7=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=88=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/HttpTBasicServiceImpl.java | 2 - .../dao/mapper/TBasicMapper.java | 2 + .../service/impl/TBasicServiceImpl.java | 49 ++++++------------- src/main/resources/bootstrap.yml | 2 +- src/main/resources/mapper/TBasicMapper.xml | 30 ++++++++++-- 5 files changed, 44 insertions(+), 41 deletions(-) diff --git a/src/main/java/com/docus/server/collection/httpservices/impl/HttpTBasicServiceImpl.java b/src/main/java/com/docus/server/collection/httpservices/impl/HttpTBasicServiceImpl.java index 0a9fa57..220fb99 100644 --- a/src/main/java/com/docus/server/collection/httpservices/impl/HttpTBasicServiceImpl.java +++ b/src/main/java/com/docus/server/collection/httpservices/impl/HttpTBasicServiceImpl.java @@ -28,11 +28,9 @@ public class HttpTBasicServiceImpl implements HttpTBasicService { try { //发送get请求获取返货值 String resultStr = HttpUtil.get(url, headers, params); - log.info("HttpTBasicServiceImpl:resultStr:"+resultStr); //解析返货值字符串 tBasicDtos=parsing(resultStr); - log.info("HttpTBasicServiceImpl:tBasicDtos:"+tBasicDtos==null? null :tBasicDtos.toString()); }catch (Exception e){ log.error(e.getMessage(),e); diff --git a/src/main/java/com/docus/server/collection/infrastructure/dao/mapper/TBasicMapper.java b/src/main/java/com/docus/server/collection/infrastructure/dao/mapper/TBasicMapper.java index f60d81e..26a2b21 100644 --- a/src/main/java/com/docus/server/collection/infrastructure/dao/mapper/TBasicMapper.java +++ b/src/main/java/com/docus/server/collection/infrastructure/dao/mapper/TBasicMapper.java @@ -20,4 +20,6 @@ public interface TBasicMapper{ Integer insertBatch(@Param("tBasicList") List tBasicList); + Integer update(@Param("tBasic") TBasic tBasic); + } diff --git a/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java b/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java index 9ab5728..814250f 100644 --- a/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java +++ b/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java @@ -43,8 +43,6 @@ public class TBasicServiceImpl implements ITBasicService { @Value("${TBasic.url}") private String url; - private String headers="{\"Content-Type\":\"application/json\",\"domain\":\"b91b0ac7-665f-4874-a282-2f5511a44263\",\"key\":\"WZHBA\"}\n"; - @Override public void setTBasic() throws Exception { //读取配置文件 @@ -74,7 +72,6 @@ public class TBasicServiceImpl implements ITBasicService { //开始时间 Date beginTime=DateUtil.plusDays(startTime,i); String beginTimeStr = DateUtil.format(beginTime, DateUtil.PATTERN_DATETIME); - log.info("TBasicServiceImpl:beginTimeStr:"+beginTimeStr); //结束时间 Date endTime = DateUtil.plusDays(beginTime, 1); @@ -92,7 +89,10 @@ public class TBasicServiceImpl implements ITBasicService { //分页查询 for(pageNum=1;true;i++){ //设置请求头信息 - Map headerMap = Func.readJson(headers, Map.class); + Map headerMap =new HashMap<>(); + headerMap.put("Content-Type","application/json"); + headerMap.put("domain","b91b0ac7-665f-4874-a282-2f5511a44263"); + headerMap.put("key","WZHBA"); //设置请求参数 Map paramMap = new HashMap(5); @@ -113,9 +113,7 @@ public class TBasicServiceImpl implements ITBasicService { for(TBasicDto tBasicDto:tBasicDtoList){ //判断jzh是否重复 Integer num = tBasicMapper.selectOne(tBasicDto.getJzh()); - if (num>0) { - throw new Exception("记帐号已存在"); - } + Long patientId = idService.getDateSeq(); //数据类型转化，格式处理 @@ -185,14 +183,19 @@ public class TBasicServiceImpl implements ITBasicService { tBasic.setDisDeptName(tBasicDto.getDisDeptName()); tBasic.setCreateTime(DateUtil.now()); - //持久化 - tBasicList.add(tBasic); + if (num>0) { + tBasicMapper.update(tBasic); + }else{ + tBasicList.add(tBasic); + } } - log.info("TBasicServiceImpl:tBasicList:"+tBasicList); //批量插入 - Integer insertBatch = tBasicMapper.insertBatch(tBasicList); - log.info("TBasicServiceImpl:insertBatch:"+insertBatch); + if(Func.isNotEmpty(tBasicList)){ + log.info("新增"+tBasicList.size()+"条基础数据开始"); + tBasicMapper.insertBatch(tBasicList); + log.info("新增"+tBasicList.size()+"条基础数据结束"); + } //记录页码startTime modifyJsonFile(timeConfigFile,"pageNum",pageNum.toString()); @@ -205,28 +208,6 @@ public class TBasicServiceImpl implements ITBasicService { } -// public static void main(String[] args) throws IOException { -// File dir = new File("."); -// String path =""; -// path = dir.getCanonicalPath()+"\\timeConfig\\time.json"; -// File timeConfigFile= new File(path); -// InputStream inputstream =null; -// if(timeConfigFile.isFile()){ -// inputstream=new FileInputStream(timeConfigFile); -// } -// byte[] bytes = IOUtils.toByteArray(inputstream); -// String timeJson = new String(bytes); -// -// String str1=timeJson.substring(0,timeJson.indexOf("startTime")); -// String str2=timeJson.substring(timeJson.indexOf("startTime")); -// String str3=str2.substring(0,str2.indexOf(":")+2); -// String str4=str2.substring(str2.indexOf(":")+2); -// String str5=str4.substring(str4.indexOf("\"")); -// System.out.println(str1+str3+str5); -// } - - - public void modifyJsonFile(File file, String key, String value) { StringBuilder sb = new StringBuilder(); //记录替换所在的行 diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml index 6bea234..006f376 100644 --- a/src/main/resources/bootstrap.yml +++ b/src/main/resources/bootstrap.yml @@ -74,7 +74,7 @@ xxl: TBasic: url: http://localhost:8989/tbasic -# url: http://199.168.91.110:7800/roc/curr-web/api/v1/common/in-patient/query + # com.ibm.mq连接方式（集群模式需要配置两个地址） 本地测试 diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml index 4b4312f..7b1121d 100644 --- a/src/main/resources/mapper/TBasicMapper.xml +++ b/src/main/resources/mapper/TBasicMapper.xml @@ -5,8 +5,7 @@ INSERT INTO `docus_medicalrecord`.`t_basic` - (`duty_nurse`, - `admiss_dept`, + (`admiss_dept`, `attending`, `create_time`, `admiss_days`, @@ -29,8 +28,7 @@ `jzh`) VALUES - (#{tBasic.dutyNurse}, - #{tBasic.admissDept}, + (#{tBasic.admissDept}, #{tBasic.attending}, #{tBasic.createTime}, #{tBasic.admissDays}, @@ -54,6 +52,30 @@ + + UPDATE `docus_medicalrecord`.`t_basic` SET + `admiss_dept` = #{tBasic.admissDept}, + `attending` = #{tBasic.attending}, + `create_time` = #{tBasic.createTime}, + `admiss_days` = #{tBasic.admissDays}, + `is_dead` = #{tBasic.isDead}, + `sex_name` = #{tBasic.sexName}, + `bed_num` = #{tBasic.bedNum}, + `age` = #{tBasic.age}, + `sex` = #{tBasic.sex}, + `id_card` = #{tBasic.idCard}, + `dis_dept` = #{tBasic.disDept}, + `admiss_times` = #{tBasic.admissTimes}, + `name` = #{tBasic.name}, + `admiss_date` = #{tBasic.admissDate}, + `admiss_dept_name` = #{tBasic.admissDeptName}, + `dis_date` = #{tBasic.disDate}, + `dis_dept_name` = #{tBasic.disDeptName}, + `attending_name` = #{tBasic.attendingName} + WHERE + `jzh` = #{tBasic.jzh} + +