新增会诊申请的接口

src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/HuiZhenShenQingController.java

@@ -1,6 +1,7 @@
 package thyyxxk.webserver.controller.zhuyuanyizheng;
 
 import com.alibaba.fastjson.JSONArray;
+import org.springframework.http.HttpRequest;
 import org.springframework.web.bind.annotation.*;
 import thyyxxk.webserver.config.auth.PassToken;
 import thyyxxk.webserver.entity.ResultVo;
@@ -8,7 +9,9 @@ import thyyxxk.webserver.entity.casefrontsheet.YshHzRecord;
 import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
 import thyyxxk.webserver.entity.login.UserInfo;
 import thyyxxk.webserver.service.zhuyuanyisheng.HuiZhenShenQingService;
+import thyyxxk.webserver.utils.TokenUtil;
 
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -44,7 +47,15 @@ public class HuiZhenShenQingController {
 
     @PostMapping("/submitHuiZhenShenQing")
     public ResultVo<String> submitHuiZhenShenQing(@RequestBody YshHzRecord param) {
-        return service.submitHuiZhenShenQing(param);
+        String tokenUserId = TokenUtil.getInstance().getTokenUserId();
+        return service.submitHuiZhenShenQing(param, tokenUserId);
+    }
+
+    @PostMapping("/consultationOfDoctors")
+    @PassToken
+    public ResultVo<String> consultationOfDoctors(@RequestBody YshHzRecord param) {
+        String tokenUserId = param.getInputId();
+        return service.submitHuiZhenShenQing(param, tokenUserId);
     }
 
     @GetMapping("/chaKanHuiZhenShenQing")

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/HuiZhenShenQingService.java

@@ -73,8 +73,8 @@ public class HuiZhenShenQingService {
      * @param param 申请需要插入的数据
      * @return 返回状态
      */
-    public ResultVo<String> submitHuiZhenShenQing(YshHzRecord param) {
-        log.info("会诊申请====>申请人：{}，数据：{}", TokenUtil.getInstance().getTokenUserId(), JSON.toJSONString(param));
+    public ResultVo<String> submitHuiZhenShenQing(YshHzRecord param, String userCode) {
+        log.info("会诊申请====>申请人：{}，数据：{}", userCode, JSON.toJSONString(param));
         publicServer.huanZheJieSuan(param.getInpatientNo(), param.getAdmissTimes());
         //下面是给申请次数 加一
         param.setReqTimes(dao.getMaxReqTimes(param.getInpatientNo(), param.getAdmissTimes()) + 1);
@@ -86,7 +86,7 @@ public class HuiZhenShenQingService {
             param.setYbSelfFlag(null);
         }
         param.setActOrderNo(publicServer.getActOrderNo());
-        param.setInputId(TokenUtil.getInstance().getTokenUserId());
+        param.setInputId(userCode);
         param.setReqDate(param.getInputDate());
         param.setOrderCode(getOrderCode("00" + param.getHzType()));
         param.setOrderName(String.format("请%s进行院内会诊", param.getReqDeptName()));
@@ -100,9 +100,9 @@ public class HuiZhenShenQingService {
                 patientInfo.getName(), param.getInpatientNo(), param.getReqDeptName(), param.getHzMd(), userInfo.getName(), userInfo.getDeptName());
 
         if (StringUtil.notBlank(param.getHzDoctor1())) {
-            publicServer.sendDoctorNotification(patientInfo, msg, "新增会诊申请", TokenUtil.getInstance().getTokenUserId(), Collections.singletonList(param.getHzDoctor1()));
+            publicServer.sendDoctorNotification(patientInfo, msg, "新增会诊申请", userCode, Collections.singletonList(param.getHzDoctor1()));
         } else {
-            publicServer.sendDoctorNotification(patientInfo, msg, "新增会诊申请", TokenUtil.getInstance().getTokenUserId(), dao.obtainDepartmentDoctor(param.getReqDept1()));
+            publicServer.sendDoctorNotification(patientInfo, msg, "新增会诊申请", userCode, dao.obtainDepartmentDoctor(param.getReqDept1()));
         }
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_EL_MESSAGE, "会诊申请成功，正在通知会诊医生。");
     }