基本完成不良事件。

src/main/java/thyyxxk/webserver/controller/adverseevent/AdverseEventController.java

@@ -6,6 +6,7 @@ import thyyxxk.webserver.pojo.ResultVo;
 import thyyxxk.webserver.pojo.adverseevent.HandlerInfo;
 import thyyxxk.webserver.pojo.adverseevent.ReportDetail;
 import thyyxxk.webserver.pojo.adverseevent.ReportIndex;
+import thyyxxk.webserver.pojo.dictionary.PureCodeName;
 import thyyxxk.webserver.service.adverseevent.AdverseEventService;
 
 import java.util.List;
@@ -45,6 +46,11 @@ public class AdverseEventController {
         return service.updateDeptHandled(param);
     }
 
+    @GetMapping({"/getAllDepts"})
+    public ResultVo<List<PureCodeName>> getAllDepts() {
+        return service.getAllDepts();
+    }
+
     @GetMapping({"/updateDeleted"})
     public ResultVo<String> updateDeleted(@RequestParam("pid") Integer pid) {
         return service.updateDeleted(pid);
@@ -56,7 +62,7 @@ public class AdverseEventController {
     }
 
     @PostMapping({"/updateFinalHandled"})
-    public ResultVo<String> updateFinalHandled(@RequestBody HandlerInfo param) {
+    public ResultVo<ReportDetail> updateFinalHandled(@RequestBody HandlerInfo param) {
         return service.updateFinalHandled(param);
     }
 

src/main/java/thyyxxk/webserver/dao_his/adverseevent/AdverseEventDao.java

@@ -94,7 +94,7 @@ public interface AdverseEventDao {
     List<ReportIndex> getHandledReports(@Param("deptCodes") List<String> deptCodes);
 
     @Select("select p_id,category,occur_datetime,submit_datetime,accepted,handled," +
-            "user_name, department, dept_dealer_name, printed from adverse_event where " +
+            "user_name,dept_code, department, dept_dealer_name, printed from adverse_event where " +
             "deleted=0 order by occur_datetime desc")
     List<ReportIndex> getAllReports();
 
@@ -114,6 +114,9 @@ public interface AdverseEventDao {
             "final_deal_time=#{datetime} where p_id=#{pid}")
     void updateFinalHandled(HandlerInfo handlerInfo);
 
+    @Select("select dept_id code, dept_name name from adverse_dept")
+    List<PureCodeName> getAllDepts();
+
     @Update("update adverse_event set deleted=1,delete_operate_id=#{operId}, " +
             "delete_time=getdate() where p_id=#{pid}")
     void updateDeleted(@Param("pid") Integer pid, @Param("operId") String operId);

src/main/java/thyyxxk/webserver/service/adverseevent/AdverseEventService.java

@@ -53,19 +53,10 @@ public class AdverseEventService {
     }
 
     public ResultVo<ReportDetail> getReportDetail(Integer pid, String level) {
-        ReportDetail report = dao.getReportDetail(pid);
-        report.setNurseReasonArr(strToArr(report.getNurseReason()));
-        report.setPatientReasonArr(strToArr(report.getPatientReason()));
-        report.setEnvironReasonArr(strToArr(report.getEnvironReason()));
-        report.setManageReasonArr(strToArr(report.getManageReason()));
-        report.setProNurseArr(strToArr(report.getProNurse()));
-        report.setProPatientArr(strToArr(report.getProPatient()));
-        report.setProEnvironArr(strToArr(report.getProEnviron()));
-        report.setProManageArr(strToArr(report.getProManage()));
         if (level.equals("dept")) {
             dao.updateAccepted(pid);
         }
-        return ResultVoUtil.success(report);
+        return ResultVoUtil.success(getReport(pid));
     }
 
     public ResultVo<List<ReportIndex>> getReportsForDept() {
@@ -82,6 +73,10 @@ public class AdverseEventService {
         return ResultVoUtil.success();
     }
 
+    public ResultVo<List<PureCodeName>> getAllDepts() {
+        return ResultVoUtil.success(dao.getAllDepts());
+    }
+
     public ResultVo<String> updateDeleted(Integer pid) {
         dao.updateDeleted(pid, TokenUtil.getTokenUserId());
         return ResultVoUtil.success();
@@ -91,10 +86,13 @@ public class AdverseEventService {
         return ResultVoUtil.success(dao.getAllReports());
     }
 
-    public ResultVo<String> updateFinalHandled(HandlerInfo indata) {
+    public ResultVo<ReportDetail> updateFinalHandled(HandlerInfo indata) {
+        PureCodeName userCodeName = dao.selectUserCodeRsAndName(TokenUtil.getTokenUserId());
+        indata.setUserId(userCodeName.getCode());
+        indata.setUserName(userCodeName.getName());
         indata.setDatetime(new Date());
         dao.updateFinalHandled(indata);
-        return ResultVoUtil.success();
+        return ResultVoUtil.success(getReport(indata.getPid()));
     }
 
     public ResultVo<String> updatePrinted(Integer pid) {
@@ -102,6 +100,19 @@ public class AdverseEventService {
         return ResultVoUtil.success();
     }
 
+    private ReportDetail getReport(Integer pid) {
+        ReportDetail report = dao.getReportDetail(pid);
+        report.setNurseReasonArr(strToArr(report.getNurseReason()));
+        report.setPatientReasonArr(strToArr(report.getPatientReason()));
+        report.setEnvironReasonArr(strToArr(report.getEnvironReason()));
+        report.setManageReasonArr(strToArr(report.getManageReason()));
+        report.setProNurseArr(strToArr(report.getProNurse()));
+        report.setProPatientArr(strToArr(report.getProPatient()));
+        report.setProEnvironArr(strToArr(report.getProEnviron()));
+        report.setProManageArr(strToArr(report.getProManage()));
+        return report;
+    }
+
     private String arrToStr(List<String> ori) {
         StringBuilder temp = new StringBuilder();
         for (String str : ori) {