fix(print): 优化打印功能调试日志和修复位置ID获取问题 BUG#217
- 在printUtils.js中添加详细的打印诊断日志,包含hiprint对象检查、模板数据检查、医院名称处理等步骤 - 修复orderGroupDrawer.vue中的positionId获取逻辑,优先使用item.positionId - 修复prescriptionlist.vue中quantity和totalPrice的计算问题 - 修复服务器端DiagTreatMAppServiceImpl中pricingFlag过滤条件处理问题 - 修复EleInvoiceMapper.xml中orgClassEnum类型的CAST转换问题 - 优化打印错误处理和异常捕获机制 - 添加完整的打印流程日志跟踪功能
This commit is contained in:
@@ -200,6 +200,13 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
|
||||
DiagnosisTreatmentSelParam.setInspectionTypeId(null); // 临时移除,防止HisQueryUtils处理
|
||||
}
|
||||
|
||||
// 临时保存pricingFlag值,手动添加带表别名的条件
|
||||
Integer pricingFlagValue = null;
|
||||
if (DiagnosisTreatmentSelParam != null && DiagnosisTreatmentSelParam.getPricingFlag() != null) {
|
||||
pricingFlagValue = DiagnosisTreatmentSelParam.getPricingFlag();
|
||||
DiagnosisTreatmentSelParam.setPricingFlag(null); // 临时移除,防止HisQueryUtils处理
|
||||
}
|
||||
|
||||
// 构建查询条件
|
||||
QueryWrapper<DiagnosisTreatmentDto> queryWrapper = HisQueryUtils.buildQueryWrapper(DiagnosisTreatmentSelParam,
|
||||
searchKey, new HashSet<>(Arrays.asList("T1.bus_no", "T1.name", "T1.py_str", "T1.wb_str")), request);
|
||||
@@ -218,6 +225,13 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
|
||||
DiagnosisTreatmentSelParam.setInspectionTypeId(inspectionTypeIdValue);
|
||||
}
|
||||
|
||||
// 如果需要按划价标记过滤,添加带表别名的条件
|
||||
if (pricingFlagValue != null) {
|
||||
queryWrapper.eq("T1.pricing_flag", pricingFlagValue);
|
||||
// 恢复参数对象中的值
|
||||
DiagnosisTreatmentSelParam.setPricingFlag(pricingFlagValue);
|
||||
}
|
||||
|
||||
// 分页查询
|
||||
IPage<DiagnosisTreatmentDto> diseaseTreatmentPage
|
||||
= activityDefinitionManageMapper.getDiseaseTreatmentPage(new Page<DiagnosisTreatmentDto>(pageNo, pageSize), queryWrapper);
|
||||
|
||||
@@ -33,4 +33,7 @@ public class DiagnosisTreatmentSelParam {
|
||||
|
||||
/** 检验类型ID */
|
||||
private Long inspectionTypeId;
|
||||
|
||||
/** 划价标记 */
|
||||
private Integer pricingFlag;
|
||||
}
|
||||
|
||||
@@ -140,7 +140,7 @@
|
||||
ON LEFT (T3.bus_no, 6) = T11.bus_no
|
||||
WHERE T2.id = #{encounterId}
|
||||
AND T2.class_enum = #{encClassEnum}
|
||||
AND T3.class_enum = #{orgClassEnum}
|
||||
AND T3.class_enum = CAST(#{orgClassEnum} AS VARCHAR)
|
||||
AND T1.delete_flag = '0'
|
||||
LIMIT 1
|
||||
</select>
|
||||
|
||||
Reference in New Issue
Block a user