{{ diagnosisLabel(item) }}
@@ -230,8 +240,14 @@ const selectedDiagnosisOptions = computed(() => {
const optionMap = new Map(diagnosisOptions.value.map(item => [String(item.code), item]));
const defaultOptionMap = new Map(diagnosisDefaultOptions.value.map(item => [String(item.code), item]));
return (form.value.applicableDiagnosisCodes || [])
- .map(code => optionMap.get(String(code)) || defaultOptionMap.get(String(code)))
- .filter(Boolean);
+ .map(code => {
+ const normalizedCode = String(code);
+ return optionMap.get(normalizedCode)
+ || defaultOptionMap.get(normalizedCode)
+ // Historical diagnosis codes may no longer exist in the diagnosis library.
+ // Keep them visible so the user can remove them and pass server validation.
+ || { code: normalizedCode, name: '已失效诊断', invalid: true };
+ });
})
function isDiagnosisSelected(code) {
@@ -371,7 +387,7 @@ async function getRepeatTags() {
watch(() => props.visible, async (val) => {
if (val) {
// reset local editForm when opening drawer
- editForm.value = props.data._id ? {} : { antibiotic_level: 0, tumor_use: 0 }
+ editForm.value = props.data._id ? {} : { antibiotic_level: 0, tumor_use: 0, forceSelfPay: 'N' }
diagnosisKeyword.value = ''
await Promise.all([attachMedicineConfig(), initializeDiagnoses()])
if (props.libType === 'online') {
diff --git a/src/views/hlw-hospital/chat-home/diagnosis-drawer/diagnosis-drawer.vue b/src/views/hlw-hospital/chat-home/diagnosis-drawer/diagnosis-drawer.vue
index 0493975..851a96f 100644
--- a/src/views/hlw-hospital/chat-home/diagnosis-drawer/diagnosis-drawer.vue
+++ b/src/views/hlw-hospital/chat-home/diagnosis-drawer/diagnosis-drawer.vue
@@ -6,10 +6,10 @@
{{ consultInfo.name }}
-
{{ consultInfo.sex }} {{ consultInfo.age ? consultInfo.age + '岁' : ''
- }}
-
![客户签名]()
+
+ {{ consultInfo.sex }} {{ consultInfo.age ? consultInfo.age + '岁' : '' }}
+
+
@@ -143,12 +143,12 @@
{{ $index + 1 }}
-
+
item.name === i.dose_time_name)) {
- ElMessage.info(`${i.drugName}: 用药时机无效`);
- return;
- }
+ // if (!useTimeList.value.some(item => item.name === i.dose_time_name)) {
+ // ElMessage.info(`${i.drugName}: 用药时机无效`);
+ // return;
+ // }
}
if (inappropriateDrugs.value.length) {
return showUnsuitDrug()
@@ -912,6 +913,7 @@ async function initWithOrder() {
row.suitableChild = drug.suitableChild
row.suitableGender = drug.suitableGender
row.repeatTag = drug.repeatTag
+ row.forceSelfPay = drug.forceSelfPay === 'Y' ? 'Y' : 'N'
acc.push(row)
} else {
errorDrugs.push(`患者申请的${cur.name}药品信息不存在或者已下架`);
diff --git a/src/views/hlw-hospital/chat-home/index.vue b/src/views/hlw-hospital/chat-home/index.vue
index 4024de9..574164c 100644
--- a/src/views/hlw-hospital/chat-home/index.vue
+++ b/src/views/hlw-hospital/chat-home/index.vue
@@ -397,10 +397,15 @@ function handleGlobalVideoMessageListUpdated(list) {
async function getConsultOrderList(orderId) {
+ const doctorCode = sessionStorage.getItem("doctorNo");
+ if (!doctorCode) {
+ orderList.value = [];
+ return;
+ }
const res = await getConsultOrder({
page: 1,
pageSize: 1000,
- doctorCode: sessionStorage.getItem("doctorNo"),
+ doctorCode,
mergeStatus: mergeStatus.value,
});
orderList.value = res.data.data.map((item) => {
diff --git a/src/views/hlw-hospital/components/history-conversation-list.vue b/src/views/hlw-hospital/components/history-conversation-list.vue
index 2a79ce8..996deab 100644
--- a/src/views/hlw-hospital/components/history-conversation-list.vue
+++ b/src/views/hlw-hospital/components/history-conversation-list.vue
@@ -52,12 +52,19 @@ const total = ref(0);
const fetchUserList = async (currentPage = 1, append = false) => {
if (loading.value) return;
+ const doctorCode = sessionStorage.getItem("doctorNo");
+ if (!doctorCode) {
+ userList.value = [];
+ total.value = 0;
+ noMoreData.value = true;
+ return;
+ }
loading.value = true;
try {
const res = await getConsultOrder({
page: currentPage,
pageSize: pageSize.value,
- doctorCode: sessionStorage.getItem("doctorNo"),
+ doctorCode,
mergeStatus: "已处理",
});
// 获取接口返回的总数
@@ -328,4 +335,4 @@ watch(
color: white;
font-size: 12px;
}
-
\ No newline at end of file
+
diff --git a/src/views/hlw-reg/hlw-reg.vue b/src/views/hlw-reg/hlw-reg.vue
index 9d6b29f..94ff7fb 100644
--- a/src/views/hlw-reg/hlw-reg.vue
+++ b/src/views/hlw-reg/hlw-reg.vue
@@ -161,6 +161,7 @@ const { close: closeBuildModal, show: showBuildModal, visible: buildVisible, wid
const { memberInfo } = storeToRefs(memberStore());
const tab = ref('reg')
const recordTableRef = ref(null);
+const cardReaderDownloadUrl = "https://hlwyy.hnkhhospital.com/hlwyy/readcard";
async function scan() {
scanCodeApi()
@@ -220,15 +221,25 @@ async function readCard() {
const objMsg = readRes && typeof readRes.Message ? readRes.Message : '';
close()
if (!IDNum) {
- ElMessage.info(objMsg || msg || '读取卡信息失败')
+ showCardReaderDownload(objMsg || msg || '读取卡信息失败');
return false
}
return readRes
} catch (e) {
- ElMessage.info(e)
+ showCardReaderDownload('读卡器服务异常,请确认本地读卡器服务是否已开启');
}
}
+function showCardReaderDownload(message) {
+ ElMessageBox.confirm(`${message},是否下载海宁读卡助手?`, '读卡失败', {
+ confirmButtonText: '下载读卡助手',
+ cancelButtonText: '取消',
+ type: 'warning',
+ }).then(() => {
+ window.open(cardReaderDownloadUrl, '_blank', 'noopener,noreferrer');
+ }).catch(() => {});
+}
+
/**
* 根据证件号 查询建档信息
* @param IDNum
diff --git a/src/views/home/header.vue b/src/views/home/header.vue
index 8348662..44cb9eb 100644
--- a/src/views/home/header.vue
+++ b/src/views/home/header.vue
@@ -7,6 +7,11 @@