feat: 修改测的问题

fs-service/src/main/java/com/fs/his/mapper/FsPrescribeDrugMapper.java

@@ -74,7 +74,7 @@ public interface FsPrescribeDrugMapper
     @Select("select * from fs_store_product where product_name=#{drugName} and store_id=#{storeId} LIMIT 1 ")
     FsStoreProduct selectFsPrescribeDrugCode(@Param("drugName") String drugName, @Param("storeId")Long storeId);
 
-    @Select("select prescribe_id from fs_prescribe where  ifnull(store_order_paid,0)=1")
+    @Select("select prescribe_id from fs_prescribe where  ifnull(store_order_paid,0)=1 or (user_confirm=0 and prescribe_img_url is null)")
     List<FsPrescribe> selectPenddingPrescribeImgData();
 
 

fs-service/src/main/java/com/fs/his/mapper/FsPrescribeMapper.java

@@ -18,7 +18,7 @@ import org.apache.ibatis.annotations.Select;
 public interface FsPrescribeMapper
 {
 
-    @Select("SELECT * FROM fs_prescribe WHERE `status`=0 and count < 3")
+    @Select("SELECT prescribe_id,prescribe_type,count FROM fs_prescribe WHERE `status`=0 and count < 3")
     List<FsPrescribe> selectFsPrescribeNoAudit();
     /**
      * 查询处方

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

@@ -55,6 +55,7 @@ import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * 处方Service业务层处理
@@ -1023,19 +1024,6 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
             throw e;
         }
 
-        try{
-            // 生成处方单图片
-            log.info("开始生成处方单图片，处方单ID: {}", param.getPrescribeId());
-
-            fsPrescribeService.PrescribeImg(param.getPrescribeId());
-            log.info("生成处方单图片成功，处方单ID: {}", param.getPrescribeId());
-
-        }catch (Throwable e) {
-            log.error("生成处方单图片 发生异常 参数: {}", param,e);
-            throw e;
-        }
-
-
         try{
             // 发送IM
             sendImMsg(fsPrescribeService, param.getPrescribeId());
@@ -1044,6 +1032,18 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
             throw e;
         }
 
+        CompletableFuture.runAsync(() -> {
+            try {
+                log.info("开始异步生成处方单图片，处方单ID: {}", param.getPrescribeId());
+                Thread.sleep(1000);
+                fsPrescribeService.PrescribeImg(param.getPrescribeId());
+                log.info("异步生成处方单图片成功，处方单ID: {}", param.getPrescribeId());
+            } catch (Throwable e) {
+                log.error("异步生成处方单图片 发生异常 处方单ID: {}, 参数: {}", param.getPrescribeId(), param, e);
+            }
+        });
+
+
         log.info("完成生成订单和处方单，处方单ID: {}", param.getPrescribeId());
     }
 

fs-user-app/src/main/java/com/fs/app/controller/PatientController.java

@@ -71,7 +71,6 @@ public class PatientController extends  AppBaseController {
         return R.ok().put("data",data);
     }
     @Login
-    @RepeatSubmit
     @ApiOperation("添加病人")
     @PostMapping("/addPatient")
     public R addPatient(@Valid @RequestBody FsPatientAddEditParam param, HttpServletRequest request){