feat: 益兽园原有生成处方图片逻辑修改

fs-admin/src/main/java/com/fs/his/controller/DataController.java

@@ -171,7 +171,7 @@ public class DataController extends BaseController {
     @GetMapping("/addCF/{code}")
     public AjaxResult addCF(@PathVariable Long code){
 
-        String s = fsPrescribeService.PrescribeImg(code);
+        String s = fsPrescribeService.PrescribeImgYsy(code);
         return AjaxResult.success();
     }
 

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

@@ -16,10 +16,7 @@ import com.fs.his.dto.FsPackagePruductDTO;
 import com.fs.his.dto.FsPrescribeUsageDTO;
 import com.fs.his.mapper.*;
 import com.fs.his.param.*;
-import com.fs.his.service.IFsDoctorService;
-import com.fs.his.service.IFsPrescribeDrugService;
-import com.fs.his.service.IFsPrescribeService;
-import com.fs.his.service.IFsStoreOrderService;
+import com.fs.his.service.*;
 import com.fs.his.utils.ConfigUtil;
 import com.fs.his.utils.qrcode.QRCodeUtils;
 import com.fs.his.vo.*;
@@ -89,6 +86,8 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
     private FsExportTaskMapper fsExportTaskMapper;
     @Autowired
     private PrescriptionTaskRecordMapper prescriptionTaskRecordMapper;
+    @Autowired
+    private PrescriptionImageService prescriptionImageService;
     /**
      * 查询处方
      *
@@ -536,9 +535,9 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
             o.setDispatcher("");
             o.setCheckDoctor("");
             o.setDoctorName(f.getDoctorName());
-            String s = getFsPrescribeXyImg(o);
+            String url = prescriptionImageService.generatePrescriptionImage(o);
             FsPrescribe fsPrescribe = new FsPrescribe();
-            fsPrescribe.setPrescribeImgUrl(s);
+            fsPrescribe.setPrescribeImgUrl(url);
             fsPrescribe.setPrescribeId(f.getPrescribeId());
             fsPrescribeMapper.updateFsPrescribe(fsPrescribe);
         } else {

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

@@ -1024,7 +1024,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
                 expressService.subscribeEspress(o.getOrderCode(), fsStoreOrder.getDeliveryCode(), fsStoreOrder.getDeliverySn(), lastFourNumber);
 
                 try {
-                    String s = fsPrescribeService.PrescribeImg(o.getPrescribeId());
+                    String s = fsPrescribeService.PrescribeImgYsy(o.getPrescribeId());
                 } catch (Exception e) {
 
                 }
@@ -1082,7 +1082,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         }
         FsPrescribeVO fp = prescribeMapper.selectFsPrescribeByPrescribeIdVO(o.getPrescribeId());
 
-        String s = fsPrescribeService.PrescribeImg(fp.getPrescribeId());
+        String s = fsPrescribeService.PrescribeImgYsy(fp.getPrescribeId());
 
         FsPrescribeUsageDTO usage = JSONUtil.toBean(fp.getUsageJson(), FsPrescribeUsageDTO.class);
 
@@ -2180,7 +2180,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         // 处方图片生成
         String PrescribeImg=null;
         if (order.getPrescribeId()!=null){
-            PrescribeImg = fsPrescribeService.PrescribeImg(order.getPrescribeId());
+            PrescribeImg = fsPrescribeService.PrescribeImgYsy(order.getPrescribeId());
         }
         erpOrder.setSeller_memo(erpOrder.getSeller_memo() + "||" + PrescribeImg + "||");
         ErpOrderResponse response = erpOrderService.addOrder(erpOrder);

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -3297,7 +3297,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 expressService.subscribeEspress(o.getOrderCode(), fsStoreOrder.getDeliveryCode(), fsStoreOrder.getDeliverySn(), lastFourNumber);
 
                 try {
-                    String s = fsPrescribeService.PrescribeImg(o.getPrescribeId());
+                    String s = fsPrescribeService.PrescribeImgYsy(o.getPrescribeId());
                 } catch (Exception e) {
 
                 }
@@ -3457,7 +3457,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         }
         FsPrescribeVO fp = prescribeMapper.selectFsPrescribeByPrescribeIdVO(o.getPrescribeId());
 
-        String s = fsPrescribeService.PrescribeImg(fp.getPrescribeId());
+        String s = fsPrescribeService.PrescribeImgYsy(fp.getPrescribeId());
 
         FsPrescribeUsageDTO usage = JSONUtil.toBean(fp.getUsageJson(), FsPrescribeUsageDTO.class);