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 @@