申诉记录冗余申诉人字段

doc/048.20220506_v2.7.0_通用版_操作日志/qc_init_v2.7.0_通用版_操作日志.sql

@@ -75,6 +75,9 @@ INSERT INTO `sys_role_menu` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `
 
 
 
+/**
+sys_hospital_set 医院配置表配置对应医院的日志信息模板
+ */
 INSERT INTO `sys_hospital_set` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `hospital_id`, `name`, `code`, `value`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', @hospitalId, '修改模块分值', '/qc/cases/saveQcCases', '修改#name模块分值为#score_new分', 'operationLog');
 INSERT INTO `sys_hospital_set` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `hospital_id`, `name`, `code`, `value`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', @hospitalId, '修改条目提示信息', '/qc/casesEntryHospital/updataQcCasesEntry', '修改#name条目提示信息为#msg_new', 'operationLog');
 INSERT INTO `sys_hospital_set` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `hospital_id`, `name`, `code`, `value`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', @hospitalId, '导出', '/console/export/medicalCheckExport', '导出{\"0\":\"运行病历稽查表\",\"1\":\"终末病历稽查表\",\"key\":\"isPlacefile\"}', 'operationLog');
@@ -158,3 +161,9 @@ INSERT INTO `sys_hospital_set` ( `is_deleted`, `gmt_create`, `gmt_modified`, `cr
 INSERT INTO `sys_hospital_set` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `hospital_id`, `name`, `code`, `value`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', @hospitalId, '导出', '/console/export/badQualifiedLevelPageXYExport', '导出病案首页合格数病历详情页', 'operationLog');
 INSERT INTO `sys_hospital_set` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `hospital_id`, `name`, `code`, `value`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', @hospitalId, '导出', '/console/export/badUnQualifiedLevelPageXYExport', '导出病案首页不合格数病历详情页', 'operationLog');
 INSERT INTO `sys_hospital_set` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `hospital_id`, `name`, `code`, `value`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', @hospitalId, '导出', '/print/export/medicalCheckExportByDept', '导出{\"0\":\"运行病历稽查表\",\"1\":\"终末病历稽查表\",\"key\":\"isPlacefile\"}', 'operationLog');
+
+
+/**
+med_appeal_info 申述信息表添加申诉人姓名字段
+ */
+ALTER TABLE `med_appeal_info` ADD  `claimant_name` varchar(60) DEFAULT NULL COMMENT '申述人姓名' AFTER `claimant_id`;

src/main/java/com/diagbot/vo/AddAppealInfoApiVO.java

@@ -63,6 +63,9 @@ public class AddAppealInfoApiVO {
     @NotBlank(message = "申诉人工号不能为空")
     private String claimantId;
 
+    @ApiModelProperty(value = "申诉人姓名")
+    private String claimantName;
+
     @ApiModelProperty(value = "申诉类型(0:医生申诉|1:质控申诉)", required = true)
     @NotBlank(message = "申诉类型不能为空")
     private String appealType;

src/main/java/com/diagbot/vo/AddAppealInfoVO.java

@@ -62,6 +62,9 @@ public class AddAppealInfoVO {
     @ApiModelProperty(value = "申诉人id")
     private String claimantId;
 
+    @ApiModelProperty(value = "申诉人姓名")
+    private String claimantName;
+
     @ApiModelProperty(value = "申诉类型(0:医生申诉|1:质控申诉)", required = true)
     @NotBlank(message = "申诉类型不能为空")
     private String appealType;

src/main/java/com/diagbot/web/MedAppealInfoController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.MedAppealInfoServiceClientFacade;
 import com.diagbot.dto.*;
+import com.diagbot.entity.SysUser;
 import com.diagbot.entity.SysUserRole;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.SysHospitalSetFacade;
@@ -62,7 +63,14 @@ public class MedAppealInfoController {
     @Transactional
     public RespDTO<Boolean> addAppealInfo(@RequestBody @Valid AddAppealInfoVO addAppealInfoVO) {
         addAppealInfoVO.setHospitalId(Long.parseLong(SysUserUtils.getCurrentHospitalID()));
-        addAppealInfoVO.setClaimantId(SysUserUtils.getCurrentPrincipleID());
+        //对内申诉接口如果没有传申诉人，就自己获取
+        if(StringUtil.isBlank(addAppealInfoVO.getClaimantId())){
+            addAppealInfoVO.setClaimantId(SysUserUtils.getCurrentPrincipleID());
+            SysUser user = sysUserFacade.getById(SysUserUtils.getCurrentPrincipleID());
+            if(user!=null){
+                addAppealInfoVO.setClaimantName(user.getLinkman());
+            }
+        }
         //获取操作流节点
         String mapping = sysHospitalSetFacade.getValue(Long.parseLong(SysUserUtils.getCurrentHospitalID()), "work_flow_node_mapping");
         //获取是否是单人操作开关
@@ -91,10 +99,10 @@ public class MedAppealInfoController {
             addAppealInfoVO.setWorkFlowNodeId(mapJSON.getLong("addAppealInfo"));
         }
         //通过医生id获取医生的用户id
-        Long userId = sysUserFacade.getUserId(addAppealInfoApiVO.getClaimantId(), addAppealInfoApiVO.getHospitalId());
-        if (userId != null) {
-            addAppealInfoVO.setClaimantId(userId+"");
-        }
+//        Long userId = sysUserFacade.getUserId(addAppealInfoApiVO.getClaimantId(), addAppealInfoApiVO.getHospitalId());
+//        if (userId != null) {
+//            addAppealInfoVO.setClaimantId(userId+"");
+//        }
         //获取是否是单人操作开关
         String single_appeal_falg = sysHospitalSetFacade.getValue(addAppealInfoApiVO.getHospitalId(), "single_appeal_falg");
         if(StringUtil.isNotEmpty(single_appeal_falg)) {