优化益寿缘处方订单布局

fs-service/src/main/java/com/fs/his/service/impl/FsPrescribeServiceImpl.java

@@ -519,13 +519,18 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
             } else {
                 o.setBedId("中医科");
             }
-            String remark = "";
-            if (f.getUsageJson() != null) {
-                FsPrescribeUsageDTO usage = JSONUtil.toBean(f.getUsageJson(), FsPrescribeUsageDTO.class);
-                remark = usage.getRemark();
-            }
-            if (remark != null && remark != "") {
-                o.setRemark(remark);
+//            String remark = "";
+//            if (f.getUsageJson() != null) {
+//                FsPrescribeUsageDTO usage = JSONUtil.toBean(f.getUsageJson(), FsPrescribeUsageDTO.class);
+//                remark = usage.getRemark();
+//            }
+//            if (remark != null && remark != "") {
+//                o.setRemark(remark);
+//            } else {
+//                o.setRemark("请按照用药说明书服用药品，如有不适，请及时就医!");
+//            }
+            if (StringUtils.isNotBlank(f.getRemark())){
+                o.setRemark(f.getRemark());
             } else {
                 o.setRemark("请按照用药说明书服用药品，如有不适，请及时就医!");
             }

fs-service/src/main/java/com/fs/his/service/impl/PrescriptionImageServiceImpl.java

@@ -229,15 +229,15 @@ public class PrescriptionImageServiceImpl implements PrescriptionImageService {
     private void drawDoctorNoAndDoctorTitle(Graphics2D pen, PrescribeXyImgParam param) {
 
         if (StringUtils.isNotBlank(param.getDoctorNo())) {
-            int x = 747;
-            int y = 1405;
+            int x = 727;
+            int y = 1705;
             int maxWidth = 760;
             drawMultiLineText(pen, param.getDoctorNo(), x, y, maxWidth);
         }
 
         if (StringUtils.isNotBlank(param.getDoctorTitle())) {
             int x = 290;
-            int y = 1569;
+            int y = 1879;
             int maxWidth = 760;
             drawMultiLineText(pen, param.getDoctorTitle(), x, y, maxWidth);
         }
@@ -402,7 +402,7 @@ public class PrescriptionImageServiceImpl implements PrescriptionImageService {
      * 绘制医嘱
      */
     private void drawAdvice(Graphics2D pen, PrescribeXyImgParam param, int startY) {
-        int y = 1100;
+        int y = 1400;
 
         if (StringUtils.isNotBlank(param.getRemark())) {
             drawMultiLineText(pen, param.getRemark(), 133, y, 500);
@@ -421,7 +421,7 @@ public class PrescriptionImageServiceImpl implements PrescriptionImageService {
                 BufferedImage doctorSign = downloadSignatureImage(param.getUrl());
                 if (doctorSign != null) {
                     Image scaledSign = doctorSign.getScaledInstance(120, 80, Image.SCALE_SMOOTH);
-                    pen.drawImage(scaledSign, 202, 1342, null);
+                    pen.drawImage(scaledSign, 202, 1642, null);
                 }
             } catch (Exception e) {
                 log.error("加载医师签名失败: {}", param.getUrl(), e);
@@ -434,7 +434,7 @@ public class PrescriptionImageServiceImpl implements PrescriptionImageService {
                 BufferedImage pharmacistSign = downloadSignatureImage("https://ysy-1329817240.cos.ap-guangzhou.myqcloud.com/ysy/20251028/ed509381390049c9ad2a17e95d8b8732.png");
                 if (pharmacistSign != null) {
                     Image scaledSign = pharmacistSign.getScaledInstance(120, 80, Image.SCALE_SMOOTH);
-                    pen.drawImage(scaledSign, 1076, 1528, null);
+                    pen.drawImage(scaledSign, 1076, 1828, null);
                 }
             } catch (Exception e) {
                 log.error("加载药师签名失败: {}", param.getDrugDoctorUrl(), e);