患者信息远程下载,提供中医院设备查询界面

zyy_db
anthonywj 1 year ago
parent b73e4a3826
commit bc4b627077

@ -16,6 +16,7 @@ import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.basic.BasicSkSickerResponse;
import com.glxp.api.service.basic.BasicSkSickerService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -53,6 +54,30 @@ public class BasicSickerController extends BaseController {
return ResultVOUtils.success(pageSimpleResponse);
}
/**
*
*
* @return
*/
@GetMapping("/udiwms/basic/sk/sicker/filter/remote")
public BaseResponse filterSickerRemote(BasicSkSickerRequest basicSkSickerRequest) {
List<BasicSkSickerResponse> basicSkSickerResponses = basicSkSickerService.filterNoList(basicSkSickerRequest);
if (CollUtil.isEmpty(basicSkSickerResponses)) {
GetSickRequest getSickRequest = new GetSickRequest();
BeanUtils.copyProperties(basicSkSickerRequest, getSickRequest);
BaseResponse<PageSimpleResponse<BasicSkSickerResponse>> baseResponse = erpBasicClient.getSicker(getSickRequest);
if (CollUtil.isNotEmpty(baseResponse.getData().getList())) {
basicSkSickerService.replaceBatchs(getSickRequest.getSelectSickers());
}
return baseResponse;
} else {
PageSimpleResponse<BasicSkSickerResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setList(basicSkSickerResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
}
/**
* 线
*

@ -23,10 +23,7 @@ import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
import com.glxp.api.entity.system.SystemPDFTemplateEntity;
import com.glxp.api.entity.thrsys.ThrProductsEntity;
import com.glxp.api.req.inout.*;
import com.glxp.api.res.inout.CptTraceOrderResponse;
import com.glxp.api.res.inout.CptTraceResultResponse;
import com.glxp.api.res.inout.IoOrderDetailResultResponse;
import com.glxp.api.res.inout.IoOrderDetailVo;
import com.glxp.api.res.inout.*;
import com.glxp.api.service.auth.CustomerService;
import com.glxp.api.service.auth.InvWarehouseService;
import com.glxp.api.service.basic.IBasicBussinessTypeService;
@ -408,4 +405,18 @@ public class IoOrderDetailResultController extends BaseController {
return ResultVOUtils.success(cptTraceResultResponses);
}
/**
*
*/
@GetMapping("/udiwms/inout/external/orderDetail/filter")
public BaseResponse externalOrderFilter(FilterOrderDetailResultRequest orderDetailResultRequest) {
List<IoExOrderDetailResultResponse> list = orderDetailResultService.exFilterOrderDetail(orderDetailResultRequest);
PageInfo<IoExOrderDetailResultResponse> pageInfo = new PageInfo<>(list);
return ResultVOUtils.page(pageInfo);
}
}

@ -5,6 +5,7 @@ import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
import com.glxp.api.req.inout.CptTraceRequest;
import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
import com.glxp.api.res.inout.CptTraceOrderResponse;
import com.glxp.api.res.inout.IoExOrderDetailResultResponse;
import com.glxp.api.res.inout.IoOrderDetailResultResponse;
import com.glxp.api.res.inv.IoOrderDetailStatRsponse;
import io.lettuce.core.dynamic.annotation.Param;
@ -40,4 +41,7 @@ public interface IoOrderDetailResultDao extends BaseMapperPlus<IoOrderDetailBizD
List<CptTraceOrderResponse> cptCodeTrace(CptTraceRequest cptTraceRequest);
List<IoExOrderDetailResultResponse> exFilterOrderDetail(FilterOrderDetailResultRequest orderDetailResultRequest);
}

@ -165,4 +165,16 @@ public class BasicSkSickerEntity {
@TableField(value = "remark")
@ApiModelProperty(value = "备注")
private String remark;
/**
*
*/
@TableField(value = "deptName")
@ApiModelProperty(value = "所属科室名称")
private String deptName;
@TableField(value = "deptCode")
@ApiModelProperty(value = "所属科室编码")
private String deptCode;
}

@ -116,6 +116,9 @@ public class ErpBasicClient {
* @return
*/
public BaseResponse<PageSimpleResponse<BasicSkSickerResponse>> getSicker(GetSickRequest getSickRequest) {
if (StrUtil.isEmpty(getSickRequest.getThirdSys())) {
getSickRequest.setThirdSys("thirdId");
}
ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(getSickRequest.getThirdSys());
String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/sicker/getInfo";
try {

@ -54,4 +54,5 @@ public class FilterOrderDetailResultRequest extends ListPageRequest {
private String action;
private String mainAction;
private Integer inoutPrintStatus;
private String invName;
}

@ -17,7 +17,7 @@ public class BasicSkPrescribeDiResponse {
/**
*
*/
private Long pId;
private String pId;
/**
*

@ -0,0 +1,175 @@
package com.glxp.api.res.inout;
import cn.hutool.core.util.StrUtil;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class IoExOrderDetailResultResponse {
private Integer id;
/**
*
*/
@ExcelProperty(value = "出入库单号", index = 1)
private String orderIdFk;
/**
* ID
*/
private Long bindRlFk;
/**
* DIUUID
*/
private String uuidFk;
/**
* DI
*/
@ExcelProperty(value = "DI/物资编码", index = 2)
private String nameCode;
/**
*
*/
@ExcelProperty(value = "批次号", index = 5)
private String batchNo;
/**
*
*/
@ExcelProperty(value = "生产日期", index = 10)
private String productDate;
/**
*
*/
@ExcelProperty(value = "失效日期", index = 11)
private String expireDate;
/**
*
*/
@ExcelProperty(value = "物资名称", index = 3)
private String coName;
/**
*
*/
@ExcelProperty(value = "注册/备案号", index = 14)
private String certCode;
/**
*
*/
private String ylqxzcrbarmc;
/**
*
*/
@ExcelProperty(value = "生产企业", index = 13)
private String manufacturer;
/**
*
*/
@ExcelProperty(value = "计量单位", index = 8)
private String measname;
/**
*
*/
@ExcelProperty(value = "规格型号", index = 4)
private String spec;
/**
*
*/
private BigDecimal price;
/**
*
*/
private int count;
/**
*
*/
private int reCount;
/**
*
*/
private String remark;
/**
* 1
*/
private String remark1;
/**
* 2
*/
private String remark2;
/**
* 3
*/
private String remark3;
/**
* 4
*/
private String remark4;
/**
* 5
*/
private String remark5;
/**
*
*/
private String sterBatchNo;
/**
*
*/
private String sterDate;
@ExcelProperty(value = "单据类型", index = 9)
private String billTypeName;
private String mainAction;
@ExcelProperty(value = "出入库时间", index = 12)
private Date auditTime;
//
// @ExcelProperty(value = "往来单位", index = 0)
// private String fromName;
/**
* /
*/
private String invName;
//
// public String getFromName() {
// if (StrUtil.isNotEmpty(fromCorpName))
// return fromCorpName;
// if (StrUtil.isNotEmpty(fromInvName))
// return fromInvName;
//
//
// return fromName;
// }
}

@ -407,6 +407,7 @@ public class IoCheckInoutService {
if (CollUtil.isEmpty(orderDetailCodeEntities)) {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_FAIL);
orderEntity.setCheckUser(orderEntity.getCreateUser());
orderEntity.setUpdateTime(new Date());
orderEntity.setErrMsg("校验失败,扫码详情为空!");
orderService.update(orderEntity);
@ -963,6 +964,7 @@ public class IoCheckInoutService {
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED) {
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_CHECK);
orderEntity.setUpdateTime(new Date());
orderEntity.setReviewUser(orderEntity.getCheckUser());
if (IntUtil.value(orderEntity.getFromType()) != ConstantStatus.FROM_UDISP)
orderEntity.setAuditTime(new Date());
if (StrUtil.isEmpty(orderEntity.getReviewUser())) {

@ -5,6 +5,7 @@ import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
import com.glxp.api.req.inout.CptTraceRequest;
import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
import com.glxp.api.res.inout.CptTraceOrderResponse;
import com.glxp.api.res.inout.IoExOrderDetailResultResponse;
import com.glxp.api.res.inout.IoOrderDetailResultResponse;
import java.util.List;
@ -28,4 +29,6 @@ public interface IoOrderDetailResultService {
List<CptTraceOrderResponse> cptTrace(CptTraceRequest cptTraceRequest);
List<IoExOrderDetailResultResponse> exFilterOrderDetail(FilterOrderDetailResultRequest orderDetailResultRequest);
}

@ -41,7 +41,7 @@ public class IoCodeLostServiceImpl extends ServiceImpl<IoCodeLostMapper, IoCodeL
@Override
public IoCodeLostEntity findByCode(String code) {
List<IoCodeLostEntity> codeLostEntities = codeLostEntityMapper.selectList(new QueryWrapper<IoCodeLostEntity>().eq("code", code).last("limit 1"));
List<IoCodeLostEntity> codeLostEntities = codeLostEntityMapper.selectList(new QueryWrapper<IoCodeLostEntity>().like("code", code).last("limit 1"));
if (CollUtil.isNotEmpty(codeLostEntities)) {
return codeLostEntities.get(0);
}

@ -9,6 +9,7 @@ import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
import com.glxp.api.req.inout.CptTraceRequest;
import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
import com.glxp.api.res.inout.CptTraceOrderResponse;
import com.glxp.api.res.inout.IoExOrderDetailResultResponse;
import com.glxp.api.res.inout.IoOrderDetailResultResponse;
import com.glxp.api.service.inout.IoOrderDetailResultService;
import org.springframework.stereotype.Service;
@ -81,4 +82,15 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic
} else
return orderDetailResultDao.cptTrace(cptTraceRequest);
}
@Override
public List<IoExOrderDetailResultResponse> exFilterOrderDetail(FilterOrderDetailResultRequest orderDetailResultRequest) {
if (null == orderDetailResultRequest) {
return Collections.emptyList();
}
if (null != orderDetailResultRequest.getPage() && null != orderDetailResultRequest.getLimit()) {
PageHelper.offsetPage((orderDetailResultRequest.getPage() - 1) * orderDetailResultRequest.getLimit(), orderDetailResultRequest.getLimit());
}
return orderDetailResultDao.exFilterOrderDetail(orderDetailResultRequest);
}
}

@ -4,7 +4,7 @@ server:
spring:
datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pzh?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udiwms_qq?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: 123456
hikari:

@ -185,4 +185,76 @@
</if>
</where>
</select>
<select id="exFilterOrderDetail" resultType="com.glxp.api.res.inout.IoExOrderDetailResultResponse">
SELECT a2.*,
basic_bussiness_type.`name` billTypeName,
a1.createTime,
a1.auditTime,
aw.name invName,
basic_bussiness_type.mainAction
FROM io_order_detail_result a2
LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk
left join auth_warehouse aw on aw.code = a1.invCode
left join basic_bussiness_type ON a1.action = basic_bussiness_type.action
<where>
a1.status = 7
and a1.mainAction = 'WareHouseOut'
and aw.spUse = 0
<if test="orderIdFk != null and orderIdFk != ''">
AND a2.orderIdFk = #{orderIdFk}
</if>
<if test="nameCode != null and nameCode != ''">
AND a2.nameCode = #{nameCode}
</if>
<if test="action != null and action != ''">
AND a1.action = #{action}
</if>
<if test="mainAction != null and mainAction != ''">
AND a1.mainAction = #{mainAction}
</if>
<if test="invCode != null and invCode != ''">
AND a1.invCode = #{invCode}
</if>
<if test="invName != null and invName != ''">
AND aw.name like concat('%'
, #{invName}
, '%')
</if>
<if test="manufacturer != null and manufacturer != ''">
AND a2.manufacturer like concat('%'
, #{manufacturer}
, '%')
</if>
<if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
AND a2.certCode like concat('%'
, #{zczbhhzbapzbh}
, '%')
</if>
<if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
AND date_format(a1.auditTime
, '%Y-%m-%d') between date_format(#{startAduditTime}
, '%Y-%m-%d')
and date_format(#{endAduditTime}
, '%Y-%m-%d')
</if>
<if test="batchNo != null and batchNo != ''">
AND a2.batchNo like concat('%'
, #{batchNo}
, '%')
</if>
<if test="coName != null and coName != ''">
AND a2.coName like concat('%'
, #{coName}
, '%')
</if>
<if test="productName != null and productName != ''">
AND a2.coName like concat('%'
, #{productName}
, '%')
</if>
</where>
</select>
</mapper>

@ -208,3 +208,7 @@ CALL Pro_Temp_ColumnWork('io_stat_order', 'startDate', 'datetime', 1);
CALL Pro_Temp_ColumnWork('io_stat_order', 'endDate', 'datetime', 1);
CALL Pro_Temp_ColumnWork('io_stat_order', 'status', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('io_stat_order', 'statType', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('basic_sk_prescribe', 'deptName', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('basic_sk_prescribe', 'deptCode', 'varchar(255)', 1);

Loading…
Cancel
Save