htdocs/RoutePatientDetail.vue

@@ -1,12 +1,7 @@
 <template>
-	<div v-if="(sensitive) && (!info)" class="alert alert-danger text-center mb-3 shadow" role="alert">
-		<h1>Warning: Restricted Record</h1>
-		<p>This record is protected by the Privacy Act of 1974 and the Health Insurance Portability and Accountability Act of 1996. If you elect to proceed, you will be required to prove you have a need to know. Accessing this patient is tracked, and your station Security Officer will contact you for your justification.</p>
-		<router-link class="btn btn-danger" :to="'/patient/' + dfn + '?viewsensitive'">Proceed</router-link>
-	</div>
 	<div v-if="info">
 		<div class="card mb-3 shadow">
-			<div class="card-header">{{info.name}} <span :title="info.pid">{{info.pid.slice(-4)}}</span> #{{dfn}}</div>
+			<div class="card-header">{{info.name}} #{{dfn}} ${{info.pid}}</div>
 			<div class="card-body row" style="font-family: monospace;">
 				<div class="col" v-if="info.dob"><strong>DOB:</strong> {{strptime_vista(info.dob).toLocaleDateString('en-CA')}}</div>
 				<div class="col" v-if="info.age"><strong>Age:</strong> {{info.age}}</div>
@@ -57,7 +52,6 @@
 		data() {
 			return {
 				dfn: null,
-				sensitive: false,
 				info: null,
 				report_date: now,
 				report_date_begin: now,
@@ -72,12 +66,7 @@
 			}
 		},
 		methods: {
-			strptime_vista,
+			strptime_vista
-			async loadinfo(dfn, viewsensitive) {
-				this.dfn = dfn;
-				this.sensitive = viewsensitive ? false : await this.client.ORWPT_SELCHK(dfn);
-				this.info = this.sensitive ? null : await this.client.ORWPT16_ID_INFO(dfn);
-			}
 		},
 		async mounted() {
 			if(this.$route.params.id.startsWith('$')) {
@@ -93,10 +82,14 @@
 						break;
 					}
 				}
-			} else this.loadinfo(this.$route.params.id, this.$route.query.hasOwnProperty('viewsensitive'));
+			} else {
+				this.dfn = this.$route.params.id;
+				this.info = await this.client.ORWPT16_ID_INFO(this.$route.params.id);
+			}
 		},
 		async beforeRouteUpdate(to, from, next) {
-			this.loadinfo(to.params.id, to.query.hasOwnProperty('viewsensitive'));
+			this.dfn = to.params.id;
+			this.info = await this.client.ORWPT16_ID_INFO(to.params.id);
 			next();
 		}
 	};

htdocs/RouteRecall.vue

@@ -17,8 +17,8 @@
 					</thead>
 					<tbody>
 						<tr v-for="row in patients_lost" :style="{ backgroundColor: strHashHSL(row.Clinic, '90%') }">
-							<td v-if="production"><router-link :to="'/patient/$' + row.key">{{row.Name}} <span :title="row.key">{{row.key.slice(-4)}}</span></router-link></td>
+							<td v-if="production"><router-link :to="'/patient/$' + row.key">{{row.Name}} ${{row.key}}</router-link></td>
-							<td v-else><router-link :title="strtr_unscramble(row.Name)" :to="'/patient/$' + row.Name.charAt(0) + row.key.slice(-4) + '?name=' + row.Name">{{row.Name}} <span :title="row.key">{{row.key.slice(-4)}}</span></router-link></td>
+							<td v-else><router-link :title="strtr_unscramble(row.Name)" :to="'/patient/$' + row.Name.charAt(0) + row.key.slice(-4) + '?name=' + row.Name">{{row.Name}} ${{row.key}}</router-link></td>
 							<td>{{datefmt(row.TimeLast)}} {{dow[row.TimeLast.getDay()]}}</td>
 							<td>{{row.Clinic}}</td>
 							<td>{{Math.round(row.TimeLastDiff/86400000)}}</td>
@@ -31,8 +31,8 @@
 					</thead>
 					<tbody>
 						<tr v-for="row in patients_outstanding" :style="{ backgroundColor: strHashHSL(row.Clinic, '90%') }">
-							<td v-if="production"><router-link :to="'/patient/$' + row.key">{{row.Name}} <span :title="row.key">{{row.key.slice(-4)}}</span></router-link></td>
+							<td v-if="production"><router-link :to="'/patient/$' + row.key">{{row.Name}} ${{row.key}}</router-link></td>
-							<td v-else><router-link :title="strtr_unscramble(row.Name)" :to="'/patient/$' + row.Name.charAt(0) + row.key.slice(-4) + '?name=' + row.Name">{{row.Name}} <span :title="row.key">{{row.key.slice(-4)}}</span></router-link></td>
+							<td v-else><router-link :title="strtr_unscramble(row.Name)" :to="'/patient/$' + row.Name.charAt(0) + row.key.slice(-4) + '?name=' + row.Name">{{row.Name}} ${{row.key}}</router-link></td>
 							<td>{{datefmt(row.TimeNext)}} {{dow[row.TimeNext.getDay()]}}</td>
 							<td>{{row.Clinic}}</td>
 							<td>{{Math.round(row.TimeNextDiff/86400000)}}</td>

htdocs/ViewSchedule.vue

@@ -7,7 +7,7 @@
 			<tr v-for="row in appointments" :style="{ backgroundColor: strHashHSL(row.Clinic, '90%') }">
 				<td>{{row.ApptDate}}</td>
 				<td>{{row.Clinic}}</td>
-				<td v-if="production"><router-link :to="'/patient/$' + row.HRN">{{row.Name}} <span :title="row.HRN">{{row.HRN.slice(-4)}}</span></router-link></td>
+				<td v-if="production"><router-link :to="'/patient/$' + row.HRN">{{row.Name}} ${{row.HRN}}</router-link></td>
 				<td v-else><router-link :title="strtr_unscramble(row.Name)" :to="'/patient/$' + row.Name.charAt(0) + row.HRN.slice(-4) + '?name=' + row.Name">{{row.Name}} ${{row.HRN}}</router-link></td>
 				<td>{{row.NOTE}} [{{row.APPT_MADE_BY}} on {{row.DATE_APPT_MADE}}]</td>
 				<td><Autocomplete :value="practitioner[row.Name]" @update:value="x => set_practitioner(row.Name, x)" :items="practitioner_list" /></td>

htdocs/reportparser.mjs

@@ -53,7 +53,10 @@ function lab_parse1default(data) {
 				else x.comment = [line.substring(12)];
 			} else console.log('DANGLING:', line);
 		} else if(m = line.match(/^\b(?<name>.*?)\s{2,}(?<value>.*?)(?: (?<flag>L\*|L|H\*|H))?\s+(?:(?<unit>.{10}) (?<range>.*?)(?: \[(?<site>\d+)\])?)?$/)) {
-			if(x = line.match(/^\b(?<name>.*?)(?<value>(?:positive|negative|reactive|not detected|collected - specimen in lab|test not performed))(?: (?<flag>L\*|L|H\*|H))?\s+(?:(?<unit>.{10}) (?<range>.*?)(?: \[(?<site>\d+)\])?)?$/i)) m = x;
+			if(m.groups.name.startsWith('COVID-19 SCR (CEPHEID-RAPID)')) {
+				m = line.substring(28).match(/^(?<value>.*?)(?: (?<flag>L\*|L|H\*|H))?\s+(?:(?<unit>.{10}) (?<range>.*?)(?: \[(?<site>\d+)\])?)?$/);
+				m.groups.name = 'COVID-19 SCR (CEPHEID-RAPID)';
+			}
 			if((m.groups.range) && (m.groups.range.startsWith('Ref: '))) m.groups.range = m.groups.range.substring(5);
 			results.push(x = m.groups);
 			if((x.value === '') && (m = x.name.match(/^(?<name>.*?)(?<value>(?:[\d\.]+|positive|negative|reactive|not detected|collected - specimen in lab|test not performed))\s*$/i))) {

htdocs/vistax.mjs

@@ -48,12 +48,6 @@ export function memoized(fn) {
 	}
 }
 
-export function converted_boolean(fn, columns=null) {
-	return async function(...args) {
-		return await fn(...args) == '1';
-	}
-}
-
 export function caretseparated(fn, columns=null) {
 	return async function(...args) {
 		if(columns) return (await fn(...args)).map(function(row) {
@@ -148,7 +142,6 @@ export function Client(cid, secret) {
 	this.ORWPT_FULLSSN = memoized(caretseparated(unwrapped(logged((...args) => this.callctx(['OR CPRS GUI CHART'], 'ORWPT_FULLSSN', ...args), 'ORWPT_FULLSSN')), ['dfn', 'name', 'date', 'pid']));
 	this.ORWPT_LAST5 = memoized(caretseparated(unwrapped(logged((...args) => this.callctx(['OR CPRS GUI CHART'], 'ORWPT_LAST5', ...args), 'ORWPT_LAST5')), ['dfn', 'name', 'date', 'pid']));
 	this.ORWPT_ID_INFO = memoized(caretseparated1(unwrapped(logged((...args) => this.callctx(['OR CPRS GUI CHART'], 'ORWPT_ID_INFO', ...args), 'ORWPT_ID_INFO')), ['pid', 'dob', 'sex', 'vet', 'sc_percentage', 'ward', 'room_bed', 'name']));
-	this.ORWPT_SELCHK = memoized(converted_boolean(unwrapped(logged((...args) => this.callctx(['OR CPRS GUI CHART'], 'ORWPT_SELCHK', ...args), 'ORWPT_SELCHK'))));
 	this.ORWPT16_LOOKUP = memoized(caretseparated(unwrapped(logged((...args) => this.callctx(['OR CPRS GUI CHART'], 'ORWPT16_LOOKUP', ...args), 'ORWPT16_LOOKUP')), ['dfn', 'name', 'pid']));
 	this.ORWPT16_ID_INFO = memoized(caretseparated1(unwrapped(logged((...args) => this.callctx(['OR CPRS GUI CHART'], 'ORWPT16_ID_INFO', ...args), 'ORWPT16_ID_INFO')), ['pid', 'dob', 'age', 'sex', 'sc_percentage', 'type', 'ward', 'room_bed', 'name']));