优化

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

@@ -39,6 +39,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.web.bind.annotation.*;
 
@@ -106,8 +107,8 @@ public class MzChargeDetailController {
     private TransactionService transactionService;
     @Autowired
     private ZdChequeTypeService zdChequeTypeService;
-    @Resource
-    private MzYjReqService mzYjReqService;
+    @Value("${wxPayQrUrl}")
+    private String wxPayQrUrl;
 
 
     /**
@@ -2006,13 +2007,8 @@ public class MzChargeDetailController {
         Map<String, Object> results = null;
         try {
             results = getChargeDetailFee(patientId, times, 1, null, httpServletRequest);
-            BigDecimal selfAmount = (BigDecimal) results.get("selfAmount");
-            if (selfAmount != null) {
-                String payQrcode = haiCiAdapterService.genMzPayQrcode(selfAmount.multiply(BigDecimal.valueOf(100)).intValue(), patientId, patientId + "_" + times + "_1");
-                if (payQrcode != null) {
-                    results.put("payQrcode", payQrcode);
-                }
-            }
+            String payQrcode = wxPayQrUrl.replace("patientId", patientId);
+            results.put("payQrcode", payQrcode);
             return results;
         } catch (Exception e) {
             if (results == null) {

src/main/resources/application-dev.yml

@@ -215,6 +215,9 @@ misPossUrl:  "http://172.16.32.201:8080/ccbmis/transaction/"
 #pacs检查地址
 pacsUrl: http://172.16.32.122:8081/
 
+#微信支付链接
+wxPayQrUrl: https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxbde6b16acad84204&redirect_uri=http://staticweb.hnthyy.cn/wxserver/redirect/page2?to=fromGuideBillQrScan_patientId&response_type=code&scope=snsapi_base&state=1#wechat_redirect
+
 #调用医保药品更新最新报销比例测试地址
 hiDrugPostUrl: "http://172.16.30.26:8706/nationalMatch/queryPsnPayProp?hiListCode="
 #（ Windows配置，Linux配置 /home/thmz_system/uploadPath）

src/main/resources/application-prod.yml

@@ -207,6 +207,8 @@ misPossUrl: "http://172.16.32.201:8080/ccbmis/transaction/"
 
 #pacs检查地址
 pacsUrl: http://172.16.32.122:8081/
+#微信支付链接
+wxPayQrUrl: https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxbde6b16acad84204&redirect_uri=http://staticweb.hnthyy.cn/wxserver/redirect/page2?to=fromGuideBillQrScan_patientId&response_type=code&scope=snsapi_base&state=1#wechat_redirect
 
 #调用医保药品更新最新报销比例地址
 hiDrugPostUrl: "http://webhis.thyy.cn:8077/nationalMatch/queryPsnPayProp?hiListCode="

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

@@ -11061,7 +11061,7 @@ function printPrescription(patientId, times, clnicId, payMark, printType) {
                                     var canvas = document.getElementById('erw');
                                     var src = canvas.toDataURL("image/png");
                                     //var strDataURI =canvas.toDataURL("image/png");
-                                    $("#payQrcodeGuideCard").html("<img src='" + src + "' style='width:100px;height:100px;'/><div style='width: 100px;margin-top: 10px;text-align: center;'>微信支付</div>");
+                                    $("#payQrcodeGuideCard").html("<img src='" + src + "' style='width:230px;height:230px;'/><div style='width: 500px;margin-top: 10px;text-align: center;'>微信支付</div>");
                                 }
                                 if (res.fundPay != undefined && res.fundPay != null) {
                                     $("#fundPayGuideCard").text("￥" + res.fundPay);

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

@@ -2697,6 +2697,9 @@
                 <td style="font-weight: 700">个账支付：<span id="acctPayGuideCard"></span><span>元</span></td>
                 <td style="font-weight: 700">合计金额：<span id="totalAmountGuideCard"></span><span>元</span></td>
             </tr>
+            <tr>
+                <td colspan="2">医保门诊统筹报销跨月不可以退费，退费必须在就诊当月完成,请悉知。</td>
+            </tr>
             <tr>
                 <td colspan="2">如有故障请联系服务中心：0731-88518702</td>
             </tr>
@@ -2711,11 +2714,11 @@
             </tr>
             </tbody>
         </table>
-        <div id="payQrcodeGuideCard" style="width: 100px;height: 100px;margin-top:10px;float: left"></div>
-        <div style="width: 100px;height: 100px;margin-top:10px;float: left;margin-left: 100px;"><img
-                style="width: 100px;height: 100px;" src="/thmz/images/zfb.png"/>
-            <div style='width: 100px;margin-top: 10px;text-align: center;'>支付宝支付</div>
-        </div>
+        <div id="payQrcodeGuideCard" style="width: 500px;height: 400px;margin-top:10px;text-align: center"></div>
+<!--        <div style="width: 100px;height: 100px;margin-top:10px;float: left;margin-left: 100px;"><img-->
+<!--                style="width: 100px;height: 100px;" src="/thmz/images/zfb.png"/>-->
+<!--            <div style='width: 100px;margin-top: 10px;text-align: center;'>支付宝支付</div>-->
+<!--        </div>-->
     </div>
 </div>
 <!--打印门诊指引单结束-->