处方退货判断更改

hlfyyy
qiuyt 4 months ago
parent 7aea29b14d
commit b8ab2699de

@ -1484,7 +1484,7 @@ public class HlfyyyClient extends CommonHttpClient {
*/ */
@Override @Override
public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) { public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) {
if (IntUtil.value(udiwmsBasicSkPrescribeRequest.getInOutType()) == 0) { if (udiwmsBasicSkPrescribeRequest.getBusType().equals("YPCF003") || udiwmsBasicSkPrescribeRequest.getBusType().equals("YPCF002")) {
udiwmsBasicSkPrescribeRequest.setDatabaseProductName(getDataSourceType()); udiwmsBasicSkPrescribeRequest.setDatabaseProductName(getDataSourceType());
IPage<VA010> iPage = va010Service.getList(new Page<VA010>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), udiwmsBasicSkPrescribeRequest); IPage<VA010> iPage = va010Service.getList(new Page<VA010>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), udiwmsBasicSkPrescribeRequest);
return this.covertSellOrder(udiwmsBasicSkPrescribeRequest, iPage); return this.covertSellOrder(udiwmsBasicSkPrescribeRequest, iPage);
@ -1880,11 +1880,8 @@ public class HlfyyyClient extends CommonHttpClient {
ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode()); ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode());
ioCollectOrder.setFromCorpName(item.getSickname()); ioCollectOrder.setFromCorpName(item.getSickname());
ioCollectOrder.setShipperName(item.getDeptname()); ioCollectOrder.setShipperName(item.getDeptname());
if (item.getRemark().equals("门诊")) { ioCollectOrder.setBusType(udiwmsBasicSkPrescribeRequest.getBusType());
ioCollectOrder.setBusType("YPCF002");
} else {
ioCollectOrder.setBusType("YPCF003");
}
Date date = null; Date date = null;
try { try {
date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(item.getPrescribedate()); date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(item.getPrescribedate());

Loading…
Cancel
Save