From 584c7c40ec0f6361d5a9800a96c91720049037ea Mon Sep 17 00:00:00 2001 From: linjj <850658129@qq.com> Date: Mon, 29 Apr 2024 08:51:47 +0800 Subject: [PATCH] =?UTF-8?q?pacs=E8=A1=A5=E5=81=BF=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emr/controller/lastVerifyController.java | 10 + .../java/com/emr/dao/CompenSateMapper.java | 13 ++ .../com/emr/entity/Archive_Master_Vo.java | 11 + .../com/emr/service/CompenSateService.java | 2 + .../ipml/Archive_MasterServiceImpl.java | 19 +- .../service/ipml/CompenSateServiceImpl.java | 12 ++ src/main/resources/config/config.properties | 23 ++- src/main/resources/config/jdbc.properties | 74 ++++++- .../resources/mapper/CompenSateMapper.xml | 19 ++ .../views/lastVerifyDir/lastVerifyList.jsp | 191 ++++++++++-------- 10 files changed, 283 insertions(+), 91 deletions(-) diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java index 41771f9..e18d719 100644 --- a/src/main/java/com/emr/controller/lastVerifyController.java +++ b/src/main/java/com/emr/controller/lastVerifyController.java @@ -88,6 +88,16 @@ public class lastVerifyController { return compenSateService.updateCompenSate(id,patientId); } + @ResponseBody + @RequestMapping(value = "/updatePacsCompensate") + + public int updatePacsCompensate(String id,String patientId){ + return compenSateService.updatePacsCompenSate(id,patientId); + } + + + + @ResponseBody @RequestMapping(value = "/exportExcel") public void exportExcel(HttpServletResponse response, Archive_Master_Vo archiveMasterVo,Integer isSearch) throws Exception { diff --git a/src/main/java/com/emr/dao/CompenSateMapper.java b/src/main/java/com/emr/dao/CompenSateMapper.java index b51d921..f4870c8 100644 --- a/src/main/java/com/emr/dao/CompenSateMapper.java +++ b/src/main/java/com/emr/dao/CompenSateMapper.java @@ -16,9 +16,22 @@ public interface CompenSateMapper { List selectAll(@Param(value = "ids")String ids); + ListselectAllByPacs(@Param(value = "ids")String ids); + int updateCompenSate(String masterId); + + int updatePacsCompenSate(String masterId); + List selectAllByMasterId(String masterId); + + List selectPacsAllByMasterId(String masterId); + int addCompenSate(@Param(value = "masterId")String masterId,@Param(value = "patientId")String patientId,@Param(value = "compensateState")int compensateState); + + + + int addPacsCompenSate(@Param(value = "masterId")String masterId,@Param(value = "compensateState")int compensateState); + } diff --git a/src/main/java/com/emr/entity/Archive_Master_Vo.java b/src/main/java/com/emr/entity/Archive_Master_Vo.java index 49e47f1..e44efa1 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java @@ -52,6 +52,17 @@ public class Archive_Master_Vo { private String returntoRole; private int compensateState; + + private int pacsCompensate; + + public int getPacsCompensate() { + return pacsCompensate; + } + + public void setPacsCompensate(int pacsCompensate) { + this.pacsCompensate = pacsCompensate; + } + public int getCompensateState() { return compensateState; } diff --git a/src/main/java/com/emr/service/CompenSateService.java b/src/main/java/com/emr/service/CompenSateService.java index a026454..e259d22 100644 --- a/src/main/java/com/emr/service/CompenSateService.java +++ b/src/main/java/com/emr/service/CompenSateService.java @@ -10,4 +10,6 @@ package com.emr.service; public interface CompenSateService { int updateCompenSate(String masterId,String patientId); + + int updatePacsCompenSate(String masterId,String patientId); } 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 aa1feb7..9f593b5 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -133,17 +133,26 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { //转成逗号拼接 String ids = String.join(",", messageList); //获取按需采集信息 - List compenSateVos = compenSateMapper.selectAll(ids); - //医生是否有缺陷 - Map masterIdMap = ListUtil.toMap(compenSateVos, CompenSateVo::getMasterId); + List hisAll = compenSateMapper.selectAll(ids); + Map masterIdHisMap = ListUtil.toMap(hisAll, CompenSateVo::getMasterId); Setters.instance().list(list).cycleSetProperties(p -> { String masterId = p.getId(); - if (masterIdMap.containsKey(masterId)){ - p.setCompensateState(masterIdMap.get(masterId).getCompensateState()); + if (masterIdHisMap.containsKey(masterId)){ + p.setCompensateState(masterIdHisMap.get(masterId).getCompensateState()); }else { p.setCompensateState(1); } }); + List pacsAll = compenSateMapper.selectAllByPacs(ids); + Map masterIdPacsMap = ListUtil.toMap(pacsAll, CompenSateVo::getMasterId); + Setters.instance().list(list).cycleSetProperties(p -> { + String masterId = p.getId(); + if (masterIdPacsMap.containsKey(masterId)){ + p.setPacsCompensate(masterIdPacsMap.get(masterId).getCompensateState()); + }else { + p.setPacsCompensate(1); + } + }); } } diff --git a/src/main/java/com/emr/service/ipml/CompenSateServiceImpl.java b/src/main/java/com/emr/service/ipml/CompenSateServiceImpl.java index 809a7f1..71ccc8c 100644 --- a/src/main/java/com/emr/service/ipml/CompenSateServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/CompenSateServiceImpl.java @@ -33,4 +33,16 @@ public class CompenSateServiceImpl implements CompenSateService { return compenSateMapper.updateCompenSate(masterId); } } + + @Override + public int updatePacsCompenSate(String masterId, String patientId) { + List list = compenSateMapper.selectPacsAllByMasterId(masterId); + if (list == null || list.isEmpty()) { + //如果不存在则新增任务,存在则更新任务状态 + return compenSateMapper.addPacsCompenSate(masterId,0); + }else { + return compenSateMapper.updatePacsCompenSate(masterId); + } + + } } diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index 4799aab..da7a3ab 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -15,4 +15,25 @@ medicalRecordsRoomDeptId = 1315 medicalepartmentDeptId = 1145 #\u5B9A\u4E49\u7B2C\u4E09\u65B9\u6D4F\u89C8\u75C5\u5386\u7684\u67E5\u8BE2\u5168\u90E8\u5206\u7C7B\u7684\u5206\u7C7Bid\u53C2\u6570\u503C -allAddortIds = 00000000 \ No newline at end of file +allAddortIds = 00000000 + + + +###\u9000\u56DE\u75C5\u6848\u7ED9\u91D1\u8776\u516C\u53F8\u7684webService\u63A5\u53E3\u5730\u5740 +#RETURNWEBSERVICE = http://192.168.10.39:8001/KingdeeEmrArchiveReturn.asmx?wsdl +###webService qName\u53C2\u65701 +#RETURNPARM1 = http://tempuri.org/ +###webService qName\u53C2\u65702 +#RETURNPARM2 = SetArchieveReturn +# +##pdf\u6C34\u5370 +#pdfWater = \u5E7F\u4E1C\u7701\u82F1\u5FB7\u5E02\u4EBA\u6C11\u533B\u9662 +# +##\u75C5\u6848\u5BA4\u79D1\u5BA4\u7F16\u53F7 +#medicalRecordsRoomDeptId = 1315 +# +##\u533B\u52A1\u79D1\u79D1\u5BA4\u7F16\u53F7 +#medicalepartmentDeptId = 1145 +# +##\u5B9A\u4E49\u7B2C\u4E09\u65B9\u6D4F\u89C8\u75C5\u5386\u7684\u67E5\u8BE2\u5168\u90E8\u5206\u7C7B\u7684\u5206\u7C7Bid\u53C2\u6570\u503C +#allAddortIds = 00000000 \ No newline at end of file diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index a9a21ae..524e625 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -53,9 +53,71 @@ POWER_JSP=http://localhost:8084/power recallReason=\u533B\u9662\u9700\u8981\u8FD9\u4EFD\u6587\u6863 HomepageDictionary=http://localhost:8080/WholeCheckInterface/services/HomepageDictionary?wsdl HomepageMethod=CheckData - - - - - - +# +# +# +# +# +# +##\u6570\u636E\u5E93IP +#dataBaseIp=localhost +###\u6570\u636E\u5E93\u540D\u79F0 +##dataBaseName=yd_record +###\u6570\u636E\u5E93\u5BC6\u7801 +##dataBasePassword=docus702 +# +##\u6570\u636E\u5E93IP +##dataBaseIp=10.36.116.108 +###\u6570\u636E\u5E93\u540D\u79F0 +#dataBaseName=emr_record +##\u6570\u636E\u5E93\u5BC6\u7801 +#dataBasePassword=xjgs+docus911 +# +#jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver +#jdbc.url=jdbc\:sqlserver\://${dataBaseIp}:1433;databaseName=${dataBaseName} +#jdbc.username=sa +#jdbc.password=${dataBasePassword} +# +##oracle +##jdbc.url1=jdbc:oracle:thin:@localhost:1521/ORCL +##jdbc.username1=docus +##jdbc.password1=docus702 +# +#jdbc.url1=jdbc:oracle:thin:@192.168.10.6:1521/orc1 +#jdbc.username1=pacs +#jdbc.password1=pacs +# +#jdbc.driver1=oracle.jdbc.driver.OracleDriver +# +#filters: stat +#maxActive: 20 +#initialSize: 1 +#maxWait: 60000 +#minIdle: 10 +#timeBetweenEvictionRunsMillis: 60000 +#minEvictableIdleTimeMillis: 300000 +#validationQuery: SELECT 'x' +#testWhileIdle: true +#testOnBorrow: false +#testOnReturn: false +#maxOpenPreparedStatements: 20 +#removeAbandoned: true +#removeAbandonedTimeout: 1800 +#logAbandoned: true +# +##\u56FE\u7247\u5730\u5740 +#pictureUrl=src\\main\\webapp +# +#powerUrl=http://10.36.116.108:8080/power/font/getMenusByUserIdAndSysFlag +#POWER_URLHEAD=http://10.36.116.108:8080/power +#POWER_JSP=http://10.36.116.108:8080/power +#recallReason=\u533B\u9662\u9700\u8981\u8FD9\u4EFD\u6587\u6863 +#HomepageDictionary=http://10.36.116.108:8080/WholeCheckInterface/services/HomepageDictionary?wsdl +#HomepageMethod=CheckData +# +# +# +# +# +# +# diff --git a/src/main/resources/mapper/CompenSateMapper.xml b/src/main/resources/mapper/CompenSateMapper.xml index b96b82b..b19a697 100644 --- a/src/main/resources/mapper/CompenSateMapper.xml +++ b/src/main/resources/mapper/CompenSateMapper.xml @@ -7,9 +7,18 @@ values (#{masterId}, #{patientId}, #{compensateState}) + + insert into pacs_compensate (masterId, + compensateState) + values (#{masterId}, + #{compensateState}) + update compensate set compensateState=0 where masterId=#{masterId} + + update pacs_compensate set compensateState=0 where masterId=#{masterId} + select * from compensate where masterId=#{masterId} + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index 8d2e828..8da3bed 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -26,6 +26,7 @@ margin-top: 5px; margin-left: 20px; } + .divCss22 { margin-top: 5px; margin-left: -7px; @@ -148,8 +149,9 @@ margin-top: 35%; width: 100%; } - .returntoRole{ - margin-left:15px!important; + + .returntoRole { + margin-left: 15px !important; }