Ver Fonte

feat:鸿森堂-生成处方单图片调整

caoliqin há 2 dias atrás
pai
commit
7aa5ea9f7f

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

@@ -285,6 +285,9 @@ public interface FsPrescribeMapper
     @Select("select p.prescribe_id from fs_store_order o LEFT JOIN fs_prescribe p on p.store_order_id =o.order_id where o.status=2 and  o.order_type=2 and p.prescribe_img_store_url is null ")
     List<Long> selectFsPrescribeByPrescribeIdByOrderType();
 
+    @Select("select p.prescribe_id from fs_store_order o LEFT JOIN fs_prescribe p on p.store_order_id =o.order_id where o.status=2 and p.prescribe_img_store_url is null ")
+    List<Long> selectFsPrescribeByOrderStatus();
+
     List<Map<String,Object>> selectUploadData(String date);
 
     @Select("select count(1) from fs_prescribe where inquiry_order_id = #{orderId}")

+ 2 - 0
fs-service/src/main/java/com/fs/his/service/IFsPrescribeService.java

@@ -104,6 +104,8 @@ public interface IFsPrescribeService
 
     List<Long> selectFsPrescribeByPrescribeIdByOrderType();
 
+    List<Long> selectFsPrescribeByOrderStatus();
+
     void PrescribeStoreImg(Long id);
 
     List<FsPrescribeListDVO> selectFsPrescribeListDVOByCompanyUser(FsPrescribeListDCompanyParam param);

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

@@ -22,6 +22,7 @@ import com.fs.his.service.IFsPrescribeService;
 import com.fs.his.service.IFsStoreOrderService;
 import com.fs.his.utils.ConfigUtil;
 import com.fs.his.utils.IdCardUtil;
+import com.fs.his.utils.PhoneUtil;
 import com.fs.his.utils.qrcode.QRCodeUtils;
 import com.fs.his.vo.*;
 import com.fs.im.dto.MsgCustomDTO;
@@ -740,6 +741,11 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
         return fsPrescribeMapper.selectFsPrescribeByPrescribeIdByOrderType();
     }
 
+    @Override
+    public List<Long> selectFsPrescribeByOrderStatus() {
+        return fsPrescribeMapper.selectFsPrescribeByOrderStatus();
+    }
+
     @Override
     public void PrescribeStoreImg(Long id) {
         FsPrescribeVO f = fsPrescribeMapper.selectFsPrescribeByPrescribeIdVO(id);
@@ -761,7 +767,7 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
             o.setPatientName(f.getPatientName());
             o.setPatientGender(f.getPatientGender());
             o.setPatientAge(f.getPatientAge());
-            o.setPatientTel(f.getPatientTel());
+            o.setPatientTel(StringUtils.isEmpty(f.getPatientTel()) ? f.getPatientTel(): PhoneUtil.decryptPhone(f.getPatientTel()));
             o.setPrescribeDoctorName(f.getPrescribeDoctorName());
             o.setUserName(fsStoreOrder.getUserName()); //发货地址
             o.setUserPhone(fsStoreOrder.getUserPhone()); //收货人手机