医生签名

src/main/java/cn/hnthyy/thmz/controller/CommonController.java

@@ -3,6 +3,7 @@ package cn.hnthyy.thmz.controller;
 import cn.hnthyy.thmz.Utils.AddressResolutionUtil;
 import cn.hnthyy.thmz.Utils.AssertUtil;
 import cn.hnthyy.thmz.Utils.R;
+import cn.hnthyy.thmz.Utils.TokenUtil;
 import cn.hnthyy.thmz.Utils.Tools;
 import cn.hnthyy.thmz.comment.UserLoginToken;
 import cn.hnthyy.thmz.entity.his.mz.CodeNameEntity;
@@ -13,6 +14,8 @@ import cn.hnthyy.thmz.service.his.mz.*;
 import cn.hnthyy.thmz.service.his.zd.*;
 import cn.hnthyy.thmz.service.thmz.UserService;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +23,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
 @Slf4j
@@ -67,6 +71,8 @@ public class CommonController {
     //门诊结算单地址
     @Value("${mzjsdHost}")
     private String mzjsdHost;
+    @Value("${wxPayOrderServiceUrl}")
+    private String wxPayOrderServiceUrl;
     @Resource
     private DictDataService dictDataService;
 
@@ -881,6 +887,24 @@ public class CommonController {
         resultMap.put("data", mzjsdHost);
         return resultMap;
     }
+    /**
+     * @description: 医生签名
+     * @author: lihong
+     * @date: 2024/7/18 14:45
+     * @param: request
+     * @param: doctorCode
+     * @return: cn.hnthyy.thmz.Utils.R
+     **/
+    @RequestMapping(value = "/getDoctorSignatureImage", method = {RequestMethod.GET})
+    public R getDoctorSignatureImage(String doctorCode) {
+        String url = StrUtil.format("{}/doctorSignatureImage/{}.png", wxPayOrderServiceUrl, doctorCode);
+        if(HttpUtil.get(url) == null){
+            return R.error();
+        }
+        return R.ok().put("data",url);
+    }
+
+
 
     /**
      * 根据输入的参数查询诊断列表的前50个诊断

src/main/java/cn/hnthyy/thmz/controller/mz/MzChargeDetailController.java

@@ -1962,6 +1962,7 @@ public class MzChargeDetailController {
                         if (clinic.getDoctorCode() != null && StringUtils.isNotBlank(clinic.getDoctorCode())) {
                             Employee employee = employeeService.queryByUserCode(clinic.getDoctorCode());
                             resultMap.put("doctorName", employee != null ? employee.getEmployeeName() : "");
+                            resultMap.put("doctorCode", clinic.getDoctorCode());
                         }
                     }
                 }

src/main/resources/static/js/mz/clinic.js

@@ -10834,7 +10834,14 @@ function printPrescription(patientId, times, clnicId, payMark, printType) {
                     $("#patientAgePrescription").text(mzPatientMi.ageString);
                     $("#patientIdPrescription").text(mzPatientMi.patientId);
                     $("#deptPrescription").text(deptName);
-                    $("#doctorPrescription").text(res.doctorName);
+                    // $("#doctorPrescription").text(res.doctorName);
+                    getAjaxRequst("/thmz/getDoctorSignatureImage",{doctorCode:res.doctorCode},false,function (postRes) {
+                        if(postRes.code ==0){
+                            $("#doctorPrescription").html("<img src='" + postRes.data + "'  style='width:100px;height:23px;'/>")
+                        }else {
+                            $("#doctorPrescription").text(res.doctorName);
+                        }
+                    })
                     $("#cfTime").text(res.opDate);
                     $("#socialNo").text(mzPatientMi.socialNo);
                     $("#sfTypeId").text(mzPatientMi.responseTypeName);
@@ -11683,8 +11690,12 @@ function printBlRecord(patientId, times, printType) {
                     $("#emrJkjyBlrecord").parent().css("display", "none");
                 }
                 $("#visitDeptBlrecord").text(res.deptName);
-                $("#visitDoctorBlrecord").text(res.doctorName);
                 $("#visitDateBlrecord").text(res.visitDate);
+                getAjaxRequst("/thmz/getDoctorSignatureImage",{doctorCode:mzBlRecord.doctorCode},false,function (hostRes) {
+                    if(hostRes.code ==0){
+                        $("#doctorSignBlrecord").html("<img src='" + hostRes.data + "'  style='width:150px;height:25px;'/>")
+                    }
+                })
 
                 //LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("mz_blrecord_card_table").innerHTML);
                 //上边距  左边距  宽  高

src/main/resources/templates/mz/clinic.html

@@ -3049,11 +3049,10 @@
                     <tbody style="font-size: 13px;">
                     <tr>
                         <td>就诊科室： <span id="visitDeptBlrecord"></span></td>
-                        <td>就诊医生：<span id="visitDoctorBlrecord"></span></td>
+                        <td>就诊时间：<span id="visitDateBlrecord"></span></td>
                     </tr>
                     <tr>
-                        <td>就诊时间：<span id="visitDateBlrecord"></span></td>
-                        <td>医师签名：<span style="text-decoration: underline;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <td colspan="2">医师签名：<span id="doctorSignBlrecord" style="width: 200px;display: inline-block;border-bottom: 1px solid grey;"></span>
                         </td>
                     </tr>
                     </tbody>