住院证签名

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

@@ -15,6 +15,8 @@ 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.HttpRequest;
+import cn.hutool.http.HttpStatus;
 import cn.hutool.http.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -898,7 +900,7 @@ public class CommonController {
     @RequestMapping(value = "/getDoctorSignatureImage", method = {RequestMethod.GET})
     public R getDoctorSignatureImage(String doctorCode) {
         String url = StrUtil.format("{}/doctorSignatureImage/{}.png", wxPayOrderServiceUrl, doctorCode);
-        if(HttpUtil.get(url) == null){
+        if(HttpRequest.get(url).execute().getStatus() == HttpStatus.HTTP_NOT_FOUND){
             return R.error();
         }
         return R.ok().put("data",url);

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

@@ -604,7 +604,13 @@ function printZyReq(patientId, printType) {
                 });
                 $("#visitDateZyReq").text(format(mzZyReq.visitDate, "yyyy-MM-dd HH:mm:ss"));
                 $("#deptCodeZyReq").text(mzZyReq.deptName);
-                $("#doctorCodeZyReq").text(mzZyReq.doctorName);
+                getAjaxRequst("/thmz/getDoctorSignatureImage",{doctorCode:mzZyReq.doctorCode},false,function (signRes) {
+                    if(signRes.code == 0){
+                        $("#doctorCodeZyReq").html("<img src='" + signRes.data + "'  style='width:100px;height:23px;'/>")
+                    }else {
+                        $("#doctorCodeZyReq").text(mzZyReq.doctorName);
+                    }
+                })
                 LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("mz_zy_req_table").innerHTML);
                 if (printType == 1) {
                     LODOP.PREVIEW();

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

@@ -11186,7 +11186,13 @@ function printPrescription(patientId, times, clnicId, payMark, printType) {
                         });
                         $("#visitDateZyReq").text(format(mzZyReq.visitDate, "yyyy-MM-dd HH:mm:ss"));
                         $("#deptCodeZyReq").text(mzZyReq.deptName);
-                        $("#doctorCodeZyReq").text(mzZyReq.doctorName);
+                        getAjaxRequst("/thmz/getDoctorSignatureImage",{doctorCode:mzZyReq.doctorCode},false,function (signRes) {
+                            if(signRes.code == 0){
+                                $("#doctorCodeZyReq").html("<img src='" + signRes.data + "'  style='width:100px;height:23px;'/>")
+                            }else {
+                                $("#doctorCodeZyReq").text(mzZyReq.doctorName);
+                            }
+                        })
                         if (index > 0) {
                             LODOP.NewPageA();
                         }
@@ -11791,7 +11797,13 @@ function printZyReq(patientId, printType) {
                 });
                 $("#visitDateZyReq").text(format(mzZyReq.visitDate, "yyyy-MM-dd HH:mm:ss"));
                 $("#deptCodeZyReq").text(mzZyReq.deptName);
-                $("#doctorCodeZyReq").text(mzZyReq.doctorName);
+                getAjaxRequst("/thmz/getDoctorSignatureImage",{doctorCode:mzZyReq.doctorCode},false,function (signRes) {
+                    if(signRes.code == 0){
+                        $("#doctorCodeZyReq").html("<img src='" + signRes.data + "'  style='width:100px;height:23px;'/>")
+                    }else {
+                        $("#doctorCodeZyReq").text(mzZyReq.doctorName);
+                    }
+                })
                 LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("mz_zy_req_table").innerHTML);
                 if (printType == 1) {
                     LODOP.PREVIEW();

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

@@ -2185,16 +2185,6 @@ function setPrint() {
  * 退费操作
  */
 function refundFee(patientId, times, receiptNo, printFlag) {
-    if (printFlag == 0) {
-        new PNotify({
-            title: '错误提示',
-            text: '当前病人缴费记录发票还未打印，无法进行退费，请先打印该发票！',
-            type: 'error',
-            hide: true,
-            styling: 'bootstrap3'
-        });
-        return;
-    }
     $("#refundFeePrepare").text(0.00);
     $("#refundFeeDetailModal").modal();
     $("#refund_bill_item_group").removeClass("in").addClass("hide");