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

湖里妇幼修改

Browse Source
Lhxyy
yewj 7 months ago
parent 55579ec4bf
commit 2b73138bf9
4 changed files with 110 additions and 85 deletions
Show Stats Download Patch File Download Diff File

13
src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java
Unescape Escape View File

@ -72,6 +72,7 @@ import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -155,8 +156,6 @@ public class HlfyyyClient extends CommonHttpClient {
private RelCodeDetailService relCodeDetailService;
@Resource
private VA001Service va001Service;
@ -1143,7 +1142,8 @@ public class HlfyyyClient extends CommonHttpClient {
udiwmsWarehouseRequest.setDatabaseProductName(getDataSourceType());
PageSimpleResponseNew<VA004> pageSimpleResponseNew = va004Service.filterList(udiwmsWarehouseRequest);
log.info("解析四川武平县医院返回仓库信息，返回结果：{}", pageSimpleResponseNew.getList());
return ResultVOUtils.success(pageSimpleResponseNew); }
return ResultVOUtils.success(pageSimpleResponseNew);
}
@Override
public BaseResponse testConnect() {
@ -1446,7 +1446,8 @@ public class HlfyyyClient extends CommonHttpClient {
return udiwmsPreInOrderRequest;
}
@Value("${DBTYPE}")
private String DBTYPE;
/**
* ------------------------------------------现场管理医保相关接口方法--------------------------------------------------------------
*/
@ -1459,7 +1460,7 @@ public class HlfyyyClient extends CommonHttpClient {
@Override
public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) {
if (IntUtil.value(udiwmsBasicSkPrescribeRequest.getInOutType()) == 0) {
udiwmsBasicSkPrescribeRequest.setDatabaseProductName(getDataSourceType());
udiwmsBasicSkPrescribeRequest.setDatabaseProductName(DBTYPE);
IPage<VA010> iPage = va010Service.getList(new Page<VA010>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), udiwmsBasicSkPrescribeRequest);
// List<VA010> list = iPage.getRecords();
// PageInfo<VA010> pageInfo = new PageInfo<>(list);
@ -1814,6 +1815,7 @@ public class HlfyyyClient extends CommonHttpClient {
return ResultVOUtils.error(500, "下载失败!");
}
}
public static List<IoCollectOrderBiz> summarizeByCode(List<IoCollectOrderBiz> bizList) {
Map<String, IoCollectOrderBiz> summarizedMap = new HashMap<>();
@ -1904,7 +1906,6 @@ public class HlfyyyClient extends CommonHttpClient {
}
public BaseResponse optionUploadCollectOrder3505(IoCollectOrder ioCollectOrder) {
//摆药流水号
// String stoout_no = ioCollectOrder.getBackupOrderRemark1();

1
src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA010Mapper.java
Unescape Escape View File

@ -14,3 +14,4 @@ import org.apache.ibatis.annotations.Param;
public interface VA010Mapper extends BaseMapper<VA010> {
IPage<VA010> getList(Page page, @Param("req") UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest);
}

3
src/main/resources/application.yml
Unescape Escape View File

@ -21,6 +21,7 @@ THIRD_NAME: thirdName
#UDI管理系统地址
UDIWMS_IP: http://127.0.0.1:9991
DBTYPE: Oracle
#mybatis-plus配置
mybatis-plus:
@ -40,3 +41,5 @@ ok:
write-timeout: 30000
max-idle-connections: 200
keep-alive-duration: 300

100
src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml
Unescape Escape View File

@ -17,57 +17,77 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
CODE, SICKCODE, SICKNAME, PRESCRIBEDATE, CREATEDR, AMOUNT, DEPTCODE, DEPTNAME, DIAGNOSIS,
CODE,
SICKCODE,
SICKNAME,
PRESCRIBEDATE,
CREATEDR,
AMOUNT,
DEPTCODE,
DEPTNAME,
DIAGNOSIS,
REMARK
</sql>
<select id="getList" resultType="com.glxp.mipsdl.entity.hlfyyy.VA010">
select
<include refid="Base_Column_List">
</include>
from v_a010 WHERE 1=1
<if test="req.busType == 'YPCF002'">
AND REMARK ='门诊'
SELECT
<include refid="Base_Column_List" />
FROM
v_a010
WHERE
1 = 1
<!-- 业务类型条件 -->
<if test="req.busType != null">
AND REMARK =
<choose>
<when test="req.busType == 'YPCF002'"> '门诊' </when>
<otherwise> '非门诊' </otherwise>
</choose>
</if>
<if test="req.busType != 'YPCF002'">
AND REMARK !='门诊'
</if>
<if test="req.databaseProductName == 'MySQL'">
<if test="req.startTime != '' and req.startTime != null and req.endTime != '' and req.endTime != null">
AND STR_TO_DATE(PRESCRIBEDATE, '%e/%c/%Y %H:%i:%s') >= #{req.startTime} AND STR_TO_DATE(PRESCRIBEDATE, '%e/%c/%Y %H:%i:%s') &lt; #{req.endTime}
</if>
<if test="req.code != '' and req.code != null">
AND CODE = #{req.code}
</if>
<if test="req.fromCorpName != '' and req.fromCorpName != null">
AND DEPTNAME = #{req.fromCorpName}
</if>
<if test="req.key != '' and req.key != null">
AND CODE like concat('%', #{req.key}, '%')
or DEPTNAME like concat('%', #{req.key}, '%')
<!-- or STR_TO_DATE(PRESCRIBEDATE, '%e/%c/%Y %H:%i:%s') = #{req.key}-->
</if>
group by CODE
order by STR_TO_DATE(PRESCRIBEDATE, '%e/%c/%Y %H:%i:%s') desc
</if>
<if test="req.databaseProductName == 'Oracle'">
<if test="req.startTime != '' and req.startTime != null and req.endTime != '' and req.endTime != null">
AND TO_DATE(PRESCRIBEDATE, 'dd/MM/yyyy HH:mm:ss') >= #{req.startTime} AND TO_DATE(PRESCRIBEDATE, 'dd/MM/yyyy HH:mm:ss') &lt; #{req.endTime}
<!-- 时间范围条件 -->
<if test="req.startTime != null and req.endTime != null">
AND
<choose>
<when test="req.databaseProductName == 'MySQL'">
<![CDATA[
STR_TO_DATE(PRESCRIBEDATE, '%e/%c/%Y %H:%i:%s') >= #{req.startTime}
AND STR_TO_DATE(PRESCRIBEDATE, '%e/%c/%Y %H:%i:%s') < #{req.endTime}
]]>
</when>
<when test="req.databaseProductName == 'Oracle'">
<![CDATA[
TO_DATE(PRESCRIBEDATE, 'dd/MM/yyyy HH:mm:ss') >= #{req.startTime}
AND TO_DATE(PRESCRIBEDATE, 'dd/MM/yyyy HH:mm:ss') < #{req.endTime}
]]>
</when>
</choose>
</if>
<if test="req.code != '' and req.code != null">
<!-- 其他条件 -->
<if test="req.code != null and req.code != ''">
AND CODE = #{req.code}
</if>
<if test="req.fromCorpName != '' and req.fromCorpName != null">
<if test="req.fromCorpName != null and req.fromCorpName != ''">
AND DEPTNAME = #{req.fromCorpName}
</if>
<if test="req.key != '' and req.key != null">
AND CODE like '%' || #{req.key} || '%'
or DEPTNAME '%' || #{req.key} || '%'
<!-- or TO_DATE(PRESCRIBEDATE, 'dd/MM/yyyy HH:mm:ss') = #{req.key}-->
</if>
group by CODE
order by TO_DATE(PRESCRIBEDATE, 'dd/MM/yyyy HH:mm:ss') desc
<if test="req.key != null and req.key != ''">
AND (
CODE LIKE CONCAT('%', #{req.key}, '%')
OR DEPTNAME LIKE CONCAT('%', #{req.key}, '%')
)
</if>
<!-- 分组和排序 -->
GROUP BY CODE
ORDER BY
<choose>
<when test="req.databaseProductName == 'MySQL'">
PRESCRIBEDATE DESC
</when>
<when test="req.databaseProductName == 'Oracle'">
PRESCRIBEDATE DESC
</when>
</choose>
</select>
</mapper>

Write Preview
Loading…
Cancel
Save