From 9d7d5a9b58bff63bc25dbdb305371df127034d97 Mon Sep 17 00:00:00 2001 From: 51976 <519763495@qq.com> Date: Fri, 15 Jul 2022 15:49:29 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AF=B9=E6=8E=A5ca=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=EF=BC=8C=E5=AE=9E=E7=8E=B0=E4=BD=BF=E7=94=A8?= =?UTF-8?q?CA=E7=94=B5=E5=AD=90=E7=AD=BE=E5=90=8D=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=AE=A4=E8=AF=81=202.=E5=BD=92=E6=A1=A3?= =?UTF-8?q?=E7=97=85=E5=8E=86=E5=8F=AC=E5=9B=9E=E6=97=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E6=8F=90=E9=86=92=EF=BC=88=E2=80=9C=E6=8F=90?= =?UTF-8?q?=E9=86=92=E6=82=A3=E6=96=B9=E5=8F=8A=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E5=B7=B2=E7=94=B3=E8=AF=B7=E4=BD=BF=E7=94=A8=E8=BF=87=E7=97=85?= =?UTF-8?q?=E5=8E=86=E2=80=9D=EF=BC=89=203.=E9=94=81=E5=AE=9A=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=97=85=E5=8E=86=EF=BC=8C=E5=B8=B8=E7=94=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=A1=B5=E9=9D=A2=E6=97=A0=E6=B3=95=E5=80=9F=E9=98=85?= =?UTF-8?q?=EF=BC=8C=E7=94=B3=E8=AF=B7=E5=88=97=E8=A1=A8=E5=80=9F=E9=98=85?= =?UTF-8?q?=E5=90=8E=E6=97=A0=E6=B3=95=E7=9B=B4=E6=8E=A5=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emr/controller/PowerUserController.java | 4 +++- .../java/com/emr/entity/Emr_Fault_Vo.java | 10 +++++++++ .../com/emr/service/PowerUserService.java | 3 +++ .../service/ipml/PowerUserServiceImpl.java | 1 - .../mapper/Emr_Fault_DetailMapper.xml | 5 ++++- .../medicalRecallDir/medicalRecallList.jsp | 21 ++++++++++++++++--- 6 files changed, 38 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/emr/controller/PowerUserController.java b/src/main/java/com/emr/controller/PowerUserController.java index 2277479d..e6c7d027 100644 --- a/src/main/java/com/emr/controller/PowerUserController.java +++ b/src/main/java/com/emr/controller/PowerUserController.java @@ -5,12 +5,14 @@ import com.alibaba.fastjson.JSONArray; import com.emr.entity.Power_User; +import com.emr.service.PowerUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import javax.servlet.http.HttpServletRequest; @Controller @@ -21,7 +23,7 @@ public class PowerUserController { @RequestMapping("getPowerUserList") @ResponseBody - public Object getPowerUserList(HttpServletRequest request,String type){ + public Object getPowerUserList(HttpServletRequest request, String type){ Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); String handleName = user.getUserPosition();//姓名 request.setAttribute("handleName",handleName); diff --git a/src/main/java/com/emr/entity/Emr_Fault_Vo.java b/src/main/java/com/emr/entity/Emr_Fault_Vo.java index 043dc7b7..c4691025 100644 --- a/src/main/java/com/emr/entity/Emr_Fault_Vo.java +++ b/src/main/java/com/emr/entity/Emr_Fault_Vo.java @@ -106,6 +106,8 @@ public class Emr_Fault_Vo { //退回总费用 private String totalBackFee; + private String vprintinfoId; + public String getBackTime() { @@ -475,6 +477,14 @@ public class Emr_Fault_Vo { public void setTotalBackFee(String totalBackFee) { this.totalBackFee = totalBackFee; } + + public String getVprintinfoId() { + return vprintinfoId; + } + + public void setVprintinfoId(String vprintinfoId) { + this.vprintinfoId = vprintinfoId; + } } diff --git a/src/main/java/com/emr/service/PowerUserService.java b/src/main/java/com/emr/service/PowerUserService.java index f58b1aa6..ffd06747 100644 --- a/src/main/java/com/emr/service/PowerUserService.java +++ b/src/main/java/com/emr/service/PowerUserService.java @@ -2,10 +2,13 @@ package com.emr.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.emr.entity.Archive_Master_Following; import java.util.List; public interface PowerUserService { JSONArray getPowerUserList(String type); + + List getHandleName(String patientIds); } diff --git a/src/main/java/com/emr/service/ipml/PowerUserServiceImpl.java b/src/main/java/com/emr/service/ipml/PowerUserServiceImpl.java index ae452730..9b24294f 100644 --- a/src/main/java/com/emr/service/ipml/PowerUserServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/PowerUserServiceImpl.java @@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import com.emr.service.PowerUserService; -import java.util.ArrayList; import java.util.List; @Service diff --git a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml index 0271bebc..1ca686aa 100644 --- a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml +++ b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml @@ -66,6 +66,7 @@ + id, archive_detail_id, assort_id, parent_id, content,price, score, back_content, first_trial,state,recall_reason @@ -311,11 +312,13 @@