fix:修复

dev_unify
chenhc 7 months ago
parent a1fd086920
commit c0111c959b

@ -80,8 +80,12 @@ public class IoCollectOriginController extends BaseController {
getSickPrescribeRequest.setThirdSys("thirdId"); getSickPrescribeRequest.setThirdSys("thirdId");
getSickPrescribeRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode()); getSickPrescribeRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
getSickPrescribeRequest.setFromType(collectOrderRequest.getFromType()); getSickPrescribeRequest.setFromType(collectOrderRequest.getFromType());
getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime()); if (StrUtil.isNotEmpty(collectOrderRequest.getStartTime())){
getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime()); getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime() + "00:00:00");
}
if (StrUtil.isNotEmpty(collectOrderRequest.getEndTime())){
getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime()+ "23:59:59");
}
getSickPrescribeRequest.setKey(collectOrderRequest.getKeyWords()); getSickPrescribeRequest.setKey(collectOrderRequest.getKeyWords());
getSickPrescribeRequest.setPage(collectOrderRequest.getPage()); getSickPrescribeRequest.setPage(collectOrderRequest.getPage());
getSickPrescribeRequest.setFromCorpName(collectOrderRequest.getFromCorpName()); getSickPrescribeRequest.setFromCorpName(collectOrderRequest.getFromCorpName());
@ -97,8 +101,12 @@ public class IoCollectOriginController extends BaseController {
getSickPrescribeRequest.setThirdSys("thirdId"); getSickPrescribeRequest.setThirdSys("thirdId");
getSickPrescribeRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode()); getSickPrescribeRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
getSickPrescribeRequest.setFromType(collectOrderRequest.getFromType()); getSickPrescribeRequest.setFromType(collectOrderRequest.getFromType());
getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime()); if (StrUtil.isNotEmpty(collectOrderRequest.getStartTime())){
getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime()); getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime() + "00:00:00");
}
if (StrUtil.isNotEmpty(collectOrderRequest.getEndTime())){
getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime()+ "23:59:59");
}
getSickPrescribeRequest.setKey(collectOrderRequest.getKeyWords()); getSickPrescribeRequest.setKey(collectOrderRequest.getKeyWords());
getSickPrescribeRequest.setPage(collectOrderRequest.getPage()); getSickPrescribeRequest.setPage(collectOrderRequest.getPage());
getSickPrescribeRequest.setFromCorpName(collectOrderRequest.getFromCorpName()); getSickPrescribeRequest.setFromCorpName(collectOrderRequest.getFromCorpName());
@ -114,8 +122,12 @@ public class IoCollectOriginController extends BaseController {
filterOrderRequest.setProductType(null); filterOrderRequest.setProductType(null);
filterOrderRequest.setLimit(collectOrderRequest.getLimit()); filterOrderRequest.setLimit(collectOrderRequest.getLimit());
filterOrderRequest.setPage(collectOrderRequest.getPage()); filterOrderRequest.setPage(collectOrderRequest.getPage());
filterOrderRequest.setStartTime(collectOrderRequest.getStartTime()); if (StrUtil.isNotEmpty(collectOrderRequest.getStartTime())){
filterOrderRequest.setEndTime(collectOrderRequest.getEndTime()); filterOrderRequest.setStartTime(collectOrderRequest.getStartTime() + "00:00:00");
}
if (StrUtil.isNotEmpty(collectOrderRequest.getEndTime())){
filterOrderRequest.setEndTime(collectOrderRequest.getEndTime()+ "23:59:59");
}
filterOrderRequest.setBillNo(collectOrderRequest.getBillNo()); filterOrderRequest.setBillNo(collectOrderRequest.getBillNo());
filterOrderRequest.setFromCorp(collectOrderRequest.getFromCorpName()); filterOrderRequest.setFromCorp(collectOrderRequest.getFromCorpName());
filterOrderRequest.setAction(collectOrderRequest.getBusType()); filterOrderRequest.setAction(collectOrderRequest.getBusType());
@ -130,8 +142,12 @@ public class IoCollectOriginController extends BaseController {
filterThrOrderRequest.setBusType(collectOrderRequest.getBusType()); filterThrOrderRequest.setBusType(collectOrderRequest.getBusType());
filterThrOrderRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode()); filterThrOrderRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
filterThrOrderRequest.setFromType(collectOrderRequest.getFromType()); filterThrOrderRequest.setFromType(collectOrderRequest.getFromType());
filterThrOrderRequest.setStartTime(collectOrderRequest.getStartTime()); if (StrUtil.isNotEmpty(collectOrderRequest.getStartTime())){
filterThrOrderRequest.setEndTime(collectOrderRequest.getEndTime()); filterThrOrderRequest.setStartTime(collectOrderRequest.getStartTime() + "00:00:00");
}
if (StrUtil.isNotEmpty(collectOrderRequest.getEndTime())){
filterThrOrderRequest.setEndTime(collectOrderRequest.getEndTime()+ "23:59:59");
}
filterThrOrderRequest.setPage(collectOrderRequest.getPage()); filterThrOrderRequest.setPage(collectOrderRequest.getPage());
filterThrOrderRequest.setKeyWords(collectOrderRequest.getKeyWords()); filterThrOrderRequest.setKeyWords(collectOrderRequest.getKeyWords());

Loading…
Cancel
Save