UDI
/
udi-wms-third-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

平潭患者信息下载修改

Browse Source
dtxyy
anthonywj 9 months ago
parent 14048a3b19
commit 3e84d25d24
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File

33
src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java
Unescape Escape View File

@ -67,6 +67,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@ -89,12 +90,9 @@ public class PtxhyyClient extends CommonHttpClient {
private final AuthWarehouseDao authWarehouseDao;
private final ThrInvWarehouseDao thrInvWarehouseDao;
private final AuthWarehouseService authWarehouseService;
private final ThrCorpService thrCorpService;
private final IoCodeDao codeDao;
private final IoOrderDetailBizDao orderDetailBizDao;
private final SubmitOrderUtil submitOrderUtil;
private final ThrProductsDao thrProductsDao;
private final ThrDeptDao thrDeptDao;
@Resource
ThrHslbService thrHslbService;
@Resource
@ -353,8 +351,6 @@ public class PtxhyyClient extends CommonHttpClient {
@Resource
private ThrSystemDetailService thrSystemDetailService;
@Resource
private IoOrderUploadLogDao orderUploadLogDao;
@Resource
private OrderUploadLogService orderUploadLogService;
@ -454,13 +450,13 @@ public class PtxhyyClient extends CommonHttpClient {
PtxhyyInvRequest ptxhyyInvRequest = new PtxhyyInvRequest();
ptxhyyInvRequest.setKssj(DateUtil.formatDate(udiwmsInvProductsRequest.getStartDate(), "yyyy-MM-dd"));
ptxhyyInvRequest.setJssj(DateUtil.formatDate(udiwmsInvProductsRequest.getEndDate(), "yyyy-MM-dd"));
// String response = null;
// try {
// response = FileUtils.getFileContent("E://response.json");
// } catch (IOException e) {
// e.printStackTrace();
// }
String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(null) + "/CKCX", ptxhyyInvRequest);
String response = null;
try {
response = FileUtils.getFileContent("E://response.json");
} catch (IOException e) {
e.printStackTrace();
}
// String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(null) + "/CKCX", ptxhyyInvRequest);
// String response = "{\"code\": 20000,\"data\": {\"list\": [{\"zsl\": 1,\"fyxh\": 30274,\"dw\": \"根\",\"lb\": \"住院\",\"fymc\": \"一次性使用避光压力延长管/根\",\"fydj\": 13,\"rq\": 1709222400000,\"zxks\": \"新10区\"},{\"zsl\": 3,\"fyxh\": 35550,\"dw\": \"个\",\"lb\": \"住院\",\"fymc\": \"静脉林华留置针（苏州林华）/个\",\"fydj\": 3.12,\"rq\": 1709222400000,\"zxks\": \"精神科病区\"},{\"zsl\": 2,\"fyxh\": 29290,\"dw\": \"支\",\"lb\": \"住院\",\"fymc\": \"一次性采血针/支 (100.000%)\",\"fydj\": 0.28,\"rq\": 1709222400000,\"zxks\": \"精神科病区\"},{\"zsl\": 6,\"fyxh\": 29976,\"dw\": \"个\",\"lb\": \"住院\",\"fymc\": \"雾化面罩（口含式）/个 (100.000%)\",\"fydj\": 14.4,\"rq\": 1709222400000,\"zxks\": \"新11区\"},{\"zsl\": 1,\"fyxh\": 29298,\"dw\": \"支\",\"lb\": \"住院\",\"fymc\": \"一次性无菌注射器(1ml 带针)/支\",\"fydj\": 0.27,\"rq\": 1709222400000,\"zxks\": \"03区\"},{\"zsl\": 1,\"fyxh\": 29291,\"dw\": \"支\",\"lb\": \"住院\",\"fymc\": \"一次性使用静脉输液针（头皮针）/支 (100.000%)\",\"fydj\": 0.14,\"rq\": 1709222400000,\"zxks\": \"03区\"},{\"zsl\": 62,\"fyxh\": 29292,\"dw\": \"副\",\"lb\": \"住院\",\"fymc\": \"一次性使用代贴输液器（带针）/副 (100.000%)\",\"fydj\": 0.95,\"rq\": 1709222400000,\"zxks\": \"16区\"},{\"zsl\": 9,\"fyxh\": 30621,\"dw\": \"个\",\"lb\": \"住院\",\"fymc\": \"一次性使用真空采血管（促凝剂）/个\",\"fydj\": 0.58,\"rq\": 1709222400000,\"zxks\": \"05区\"},{\"zsl\": 66,\"fyxh\": 29294,\"dw\": \"支\",\"lb\": \"住院\",\"fymc\": \"一次性无菌注射器（5ml 带针)/支\",\"fydj\": 0.28,\"rq\": 1709222400000,\"zxks\": \"16区\"},{\"zsl\": 4,\"fyxh\": 29278,\"dw\": \"个\",\"lb\": \"住院\",\"fymc\": \"一次性使用负压引流袋/个\",\"fydj\": 5.8,\"rq\": 1709222400000,\"zxks\": \"04区\"}]}}";
BaseResponse<PageSimpleResponse<PtxhInvResponse>> baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<PtxhInvResponse>>>() {
@ -498,7 +494,7 @@ public class PtxhyyClient extends CommonHttpClient {
thrInvResultResponse.setSickerName(ptxhInvResponse.getBrxm());
thrInvResultResponse.setSickerCode(ptxhInvResponse.getJzhm());
if (StrUtil.isNotEmpty(ptxhInvResponse.getRq())) {
thrInvResultResponse.setChargeTime(DateUtil.timeStampToDate(Long.parseLong(ptxhInvResponse.getRq())));
thrInvResultResponse.setChargeTime(ptxhInvResponse.getRq());
}
thrInvResultResponses.add(thrInvResultResponse);
if (seenNames.add(ptxhInvResponse.getFyxh())) {
@ -624,22 +620,21 @@ public class PtxhyyClient extends CommonHttpClient {
.lambda()
.like(StringUtils.isNotBlank(getSickRequest.getCode()), SickerEntity::getZYHM, getSickRequest.getCode())
.like(StringUtils.isNotBlank(getSickRequest.getName()), SickerEntity::getBRXM, getSickRequest.getName()));
List<BasicSkSickerResponse> basicSkSickerResponses = new ArrayList<>();
productEntityIPage.getRecords().forEach(sickerEntity -> {
BasicSkSickerResponse.builder()
basicSkSickerResponses.add(BasicSkSickerResponse.builder()
.sickerId(sickerEntity.getZYH())
.code(sickerEntity.getZYH())
.name(sickerEntity.getBRXM())
.adNum(sickerEntity.getZYHM())
.inHospTime(sickerEntity.getRYRQ())
.outHospTime(sickerEntity.getCYRQ())
.build();
.build());
});
PageSimpleResponse<SickerEntity> pageSimpleResponse = new PageSimpleResponse<>();
PageSimpleResponse<BasicSkSickerResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(productEntityIPage.getTotal());
pageSimpleResponse.setList(productEntityIPage.getRecords());
pageSimpleResponse.setList(basicSkSickerResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
}

2
src/main/java/com/glxp/mipsdl/entity/ptxhyy/SickerEntity.java
Unescape Escape View File

@ -7,7 +7,7 @@ import lombok.Data;
import java.util.Date;
@Data
@TableName("UDI_ZY_BRRY")
@TableName("PORTAL_HIS.UDI_ZY_BRRY")
public class SickerEntity {
@TableField("ZYHM")

Write Preview
Loading…
Cancel
Save