From 3037a0facaad1d735271b4a3a786d0162526a232 Mon Sep 17 00:00:00 2001 From: tan <11033394+tanzr@user.noreply.gitee.com> Date: Tue, 9 Apr 2024 14:22:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BB=E6=8A=A4=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=A7=93=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...院电子病历采集-homeQualitySet.json | 2 + ...中医院护理文书-homeQualitySet.json | 4 ++ .../bgts/facade/IAfCollectTaskService.java | 13 ++-- .../docus/bgts/handler/TBasicWebService.java | 72 +++++++++++-------- .../service/AfCollectTaskServiceImpl.java | 16 ++--- src/main/resources/logback-spring.xml | 4 +- 6 files changed, 63 insertions(+), 48 deletions(-) diff --git a/dataConfig/广东省中医院住院电子病历采集-homeQualitySet.json b/dataConfig/广东省中医院住院电子病历采集-homeQualitySet.json index 09c95e8..fc81721 100644 --- a/dataConfig/广东省中医院住院电子病历采集-homeQualitySet.json +++ b/dataConfig/广东省中医院住院电子病历采集-homeQualitySet.json @@ -21,6 +21,8 @@ "filetitle":"FILENAME", //医生提交时间 "doctorSubmitTime":"SUBMIT_TIME", + //提交人姓名 + "submitName":"REC_SUB_NAME", //封存id "sealId":"SEAL_ID", //下载地址,&代表多个选其一 diff --git a/dataConfig/广东省中医院护理文书-homeQualitySet.json b/dataConfig/广东省中医院护理文书-homeQualitySet.json index eeb1d6b..007a69c 100644 --- a/dataConfig/广东省中医院护理文书-homeQualitySet.json +++ b/dataConfig/广东省中医院护理文书-homeQualitySet.json @@ -21,6 +21,10 @@ "filetitle":"FILENAME", //护士提交时间 "nurseSubmitTime":"SUBMIT_TIME", + //提交人姓名 + "submitName":"SUBMIT_NURSE_NAME", + //封存id + "sealId":"SEAL_ID", //下载地址,&代表多个选其一 "downurl":"PDF_PATH", //分类id diff --git a/src/main/java/com/docus/bgts/facade/IAfCollectTaskService.java b/src/main/java/com/docus/bgts/facade/IAfCollectTaskService.java index b1233bc..c1d30b1 100644 --- a/src/main/java/com/docus/bgts/facade/IAfCollectTaskService.java +++ b/src/main/java/com/docus/bgts/facade/IAfCollectTaskService.java @@ -86,22 +86,23 @@ public interface IAfCollectTaskService extends IService { int deleteByPatientIdAndSysFlag(String patientId, String sysFlag); /** - * 添加护理提交时间 - * + * 添加护理提交信息 * @param reportDownDto * @param nurseSubmitTime + * @param nurseSubmitName * @return */ - int updateNurseSubmitTime(ReportDownDto reportDownDto, String nurseSubmitTime); + int updateNurseSubmitTime(ReportDownDto reportDownDto, String nurseSubmitTime,String nurseSubmitName); + /** - * 添加医生提交时间 - * + * 添加医生提交信息 * @param reportDownDto * @param doctorSubmitTime + * @param doctorSubmitName * @return */ - int updateDoctorSubmitTime(ReportDownDto reportDownDto, String doctorSubmitTime); + int updateDoctorSubmitTime(ReportDownDto reportDownDto, String doctorSubmitTime,String doctorSubmitName); /** * 添加护士提交状态 diff --git a/src/main/java/com/docus/bgts/handler/TBasicWebService.java b/src/main/java/com/docus/bgts/handler/TBasicWebService.java index 8f4b404..6e9b99c 100644 --- a/src/main/java/com/docus/bgts/handler/TBasicWebService.java +++ b/src/main/java/com/docus/bgts/handler/TBasicWebService.java @@ -103,6 +103,9 @@ public class TBasicWebService implements ITBasicWebService { String empId = String.valueOf(FileUtils.getJsonByName(Codes.EMP_ID.getMessage())); //电子病历封存id String seal = String.valueOf(FileUtils.getJsonByName("sealId")); + //提交人姓名 + String submitName = String.valueOf(FileUtils.getJsonByName("submitName")); + //判断是否为撤销 String isJudge = String.valueOf(FileUtils.getJsonByName("isJudge")); if (StringUtils.isBlank(isJudge) || isJudge.equals("0")) { @@ -156,6 +159,8 @@ public class TBasicWebService implements ITBasicWebService { reportDownPatientDto = new ReportDownPatientDto(); //获取jzh String empIdText = getElementText(elementRoot, empId.split(",")); + //获取提交人姓名 + String submit = getElementText(elementRoot, submitName.split(",")); //获取封存id String sealId = getElementTextCanBeEmpty(elementRoot, seal.split(",")); if (null != sealId && !"".equals(sealId)) { @@ -165,6 +170,7 @@ public class TBasicWebService implements ITBasicWebService { sealCollect(sealId); reportDownDto.setPatient(reportDownPatientDto); List elementList = xmlUtils.getJsonByName(elementRoot); + doctorSubmitTime = getElementText(elementRoot, doctorSubmitTime.split(",")); for (Element element : elementList) { filetitle = getElementText(element, filetitleKey.split(",")); downurl = getElementText(element, downurlKey.split(",")); @@ -172,9 +178,10 @@ public class TBasicWebService implements ITBasicWebService { //添加护理提交时间 if (collectorid.equals("1")) { nurseSubmitTime = getElementText(element, nurseSubmitTime.split(",")); - afCollectTaskService.updateNurseSubmitTime(reportDownDto, nurseSubmitTime); + afCollectTaskService.updateNurseSubmitTime(reportDownDto, nurseSubmitTime,submit); afCollectTaskService.insertNurseState(reportDownDto, nurseSubmitTime); } + //获取电子病历排序时间 sortingTime = getElementTextCanBeEmpty(element, sortingTimeKey.split(",")); //获取采集流水号 @@ -197,7 +204,10 @@ public class TBasicWebService implements ITBasicWebService { } else { reportDownDto.setScanfiles(reportDownDtoArr); } - + //插入医生提交时间 + afCollectTaskService.updateDoctorSubmitTime(reportDownDto, doctorSubmitTime,submit); + //插入医生提交状态 + afCollectTaskService.insertDoctorState(reportDownDto, doctorSubmitTime); afCollectTaskService.insertSeal(reportDownDto); @@ -247,31 +257,31 @@ public class TBasicWebService implements ITBasicWebService { // } - // doctorSubmitTime = getElementText(elementRoot, doctorSubmitTime.split(",")); + doctorSubmitTime = getElementText(elementRoot, doctorSubmitTime.split(",")); /** * 删除电子病历数据 */ -// long l2 = System.currentTimeMillis(); -// String patientId = afCollectTaskService.getpatientIdByEmpId(empIdText); -// long l3 = System.currentTimeMillis(); -// logger.info("查询patient_id耗时" + (l3 - l2)); -// //删除af_downfile表数据 -// long l4 = System.currentTimeMillis(); -// int i = afCollectTaskService.deleteByPatientIdAndCollectorId(patientId, collectorid); -// long l5 = System.currentTimeMillis(); -// logger.info("删除" + empIdText + "af_downfile表" + i + "条数据耗时-----" + (l5 - l4)); -// //删除t_scan_assort表数据 -// long l8 = System.currentTimeMillis(); -// int i1 = afCollectTaskService.deleteByPatientIdAndAssortId(patientId, assortid); -// long l11 = System.currentTimeMillis(); -// logger.info("删除" + empIdText + "t_scan_assort表" + i1 + "条数据耗时-----" + (l11 - l8)); -// //删除af_collect_task表数据 -// long l9 = System.currentTimeMillis(); -// int i2 = afCollectTaskService.deleteByPatientIdAndSysFlag(patientId, collectorid); -// long l10 = System.currentTimeMillis(); -// logger.info("删除" + empIdText + "af_collect_task表" + i2 + "条数据耗时-----" + (l10 - l9)); + long l2 = System.currentTimeMillis(); + String patientId = afCollectTaskService.getpatientIdByEmpId(empIdText); + long l3 = System.currentTimeMillis(); + logger.info("查询patient_id耗时" + (l3 - l2)); + //删除af_downfile表数据 + long l4 = System.currentTimeMillis(); + int i = afCollectTaskService.deleteByPatientIdAndCollectorId(patientId, collectorid); + long l5 = System.currentTimeMillis(); + logger.info("删除" + empIdText + "af_downfile表" + i + "条数据耗时-----" + (l5 - l4)); + //删除t_scan_assort表数据 + long l8 = System.currentTimeMillis(); + int i1 = afCollectTaskService.deleteByPatientIdAndAssortId(patientId, assortid); + long l11 = System.currentTimeMillis(); + logger.info("删除" + empIdText + "t_scan_assort表" + i1 + "条数据耗时-----" + (l11 - l8)); + //删除af_collect_task表数据 + long l9 = System.currentTimeMillis(); + int i2 = afCollectTaskService.deleteByPatientIdAndSysFlag(patientId, collectorid); + long l10 = System.currentTimeMillis(); + logger.info("删除" + empIdText + "af_collect_task表" + i2 + "条数据耗时-----" + (l10 - l9)); reportDownPatientDto.setJzh(empIdText); logger.info("患者主索引号：" + empIdText); reportDownDto.setPatient(reportDownPatientDto); @@ -283,18 +293,18 @@ public class TBasicWebService implements ITBasicWebService { //添加护理提交时间 if (collectorid.equals("1")) { nurseSubmitTime = getElementText(element, nurseSubmitTime.split(",")); - afCollectTaskService.updateNurseSubmitTime(reportDownDto, nurseSubmitTime); + afCollectTaskService.updateNurseSubmitTime(reportDownDto, nurseSubmitTime,submit); afCollectTaskService.insertNurseState(reportDownDto, nurseSubmitTime); } //获取电子病历排序时间 - // sortingTime = getElementTextCanBeEmpty(element, sortingTimeKey.split(",")); + sortingTime = getElementTextCanBeEmpty(element, sortingTimeKey.split(",")); //获取采集流水号 serialnum = getElementText(element, serialnmnKey.split(",")); reportDownScanFileDto = new ReportDownScanFileDto(); reportDownScanFileDto.setDownurl(downurl); reportDownScanFileDto.setFiletitle(filetitle); reportDownScanFileDto.setSerialnum(serialnum); - // reportDownScanFileDto.setSortdate(sortingTime); + reportDownScanFileDto.setSortdate(sortingTime); reportDownScanFileDto.setFilesource(Integer.parseInt(String.valueOf(FileUtils.getJsonByName("filesource")))); reportDownScanFileDto.setFilestoragetype(Integer.parseInt(String.valueOf(FileUtils.getJsonByName("filestoragetype")))); //判断是否为base64 @@ -331,9 +341,9 @@ public class TBasicWebService implements ITBasicWebService { } //插入医生提交时间 - // afCollectTaskService.updateDoctorSubmitTime(reportDownDto, doctorSubmitTime); + afCollectTaskService.updateDoctorSubmitTime(reportDownDto, doctorSubmitTime,submit); //插入医生提交状态 - // afCollectTaskService.insertDoctorState(reportDownDto, doctorSubmitTime); + afCollectTaskService.insertDoctorState(reportDownDto, doctorSubmitTime); //插入文件af_collect_task表数据 // synchronized (lock) { // System.err.println(reportDownDto); @@ -383,10 +393,10 @@ public class TBasicWebService implements ITBasicWebService { } } - public static void main(String[] args) { - TBasicWebService service = new TBasicWebService(); - service.sealCollect(""); - } +// public static void main(String[] args) { +// TBasicWebService service = new TBasicWebService(); +// service.sealCollect(""); +// } private void sealCollect(String sealId) { final String systemCollectConfigFileName = "dataConfig" + File.separator + "SystemCollectConfig"; List sealCollectConfigs; diff --git a/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java b/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java index 0735486..56ff974 100644 --- a/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java +++ b/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java @@ -331,7 +331,7 @@ public class AfCollectTaskServiceImpl extends ServiceImpl headMap = new HashMap<>(); headMap.put("Content-Type", "application/json"); Map> params = new HashMap<>(); @@ -353,13 +352,13 @@ public class AfCollectTaskServiceImpl extends ServiceImpl headMap = new HashMap<>(); headMap.put("Content-Type", "application/json"); Map> params = new HashMap<>(); @@ -402,13 +400,13 @@ public class AfCollectTaskServiceImpl extends ServiceImpl log/demo.%d.%i.log - - 90 + + 180 10MB