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