HIMSS21

.meteor/packages

@@ -78,12 +78,12 @@ percolate:synced-cron
 # symptomatic:vaccine-wallet
 
 #HEALTHFLOW
-healthflow:core
-symptomatic:fhir-uscore
-clinical:accounts-housemd
-awatson1978:accounts-muppets
-clinical:accounts-famous-dead-people
-symptomatic:timelines
-symptomatic:vault-server-freemium
-symptomatic:structured-data-capture
-symptomatic:data-relay
+#healthflow:core
+#symptomatic:fhir-uscore
+#clinical:accounts-housemd
+#awatson1978:accounts-muppets
+#clinical:accounts-famous-dead-people
+#symptomatic:timelines
+#symptomatic:vault-server-freemium
+#symptomatic:structured-data-capture
+#symptomatic:data-relay

.meteor/versions

@@ -1,10 +1,9 @@
 accounts-base@1.9.0
-accounts-password@1.7.1
 alanning:roles@3.2.3
 aldeed:collection2@3.0.6
 allow-deny@1.1.0
 autoupdate@1.7.0
-awatson1978:accounts-muppets@1.1.0
+awatson1978:accounts-muppets@1.3.0
 babel-compiler@7.6.1
 babel-runtime@1.5.0
 base64@1.0.12
@@ -37,7 +36,6 @@ ecmascript-runtime@0.7.0
 ecmascript-runtime-client@0.11.0
 ecmascript-runtime-server@0.10.0
 ejson@1.1.1
-email@2.0.0
 es5-shim@4.8.0
 evaisse:csv@0.1.4
 fastclick@1.0.13
@@ -84,7 +82,6 @@ mongo-decimal@0.1.2
 mongo-dev-server@1.1.0
 mongo-id@1.0.7
 npdev:react-loadable@1.0.0
-npm-bcrypt@0.9.4
 npm-mongo@3.9.0
 observe-sequence@1.0.16
 ordered-dict@1.1.0
@@ -103,21 +100,19 @@ routepolicy@1.1.0
 server-render@0.3.1
 service-configuration@1.0.11
 session@1.2.0
-sha@1.0.9
 shell-server@0.5.0
 simple:json-routes@2.1.0
 socket-stream-client@0.3.2
 spacebars@1.1.0
 spacebars-compiler@1.2.1
-srp@1.1.0
 standard-minifier-css@1.7.2
 standard-minifier-js@2.6.0
 static-html@1.2.2
 symptomatic:data-relay@0.9.10
 symptomatic:fhir-uscore@0.4.10
 symptomatic:structured-data-capture@0.6.1
 symptomatic:timelines@0.5.2
-symptomatic:vault-server-freemium@6.4.5
+symptomatic:vault-server-freemium@6.4.4
 templating@1.4.0
 templating-compiler@1.4.1
 templating-runtime@1.4.0

app/accounts/AuthContext.jsx

@@ -36,11 +36,13 @@ if(Meteor.isClient){
 
     return {
       display: get(user, 'fullLegalName', ''),
-      reference: "Patient/" + get(user, 'id')
+      reference: "Patient/" + get(user, 'patientId')
     }
   }
   Meteor.logoutCurrentUser = function(){
     Session.set('currentUser', null);
+    Session.set('selectedPatient', null);
+    Session.set('selectedPatientId', null);
     Meteor.logout();
   }
 }
@@ -72,17 +74,20 @@ async function loginWithService(service, credentials){
 
   if(Meteor.isClient){
     Session.set('currentUser', get(loginResponse, 'user'));
-    let patient;
-    if(has(loginResponse, 'user.id')){
-      patient = Patients.findOne({id: get(loginResponse, 'user.id')});
-    } else if(has(loginResponse, 'user.patientId')){
-      patient = Patients.findOne({id: get(loginResponse, 'user.patientId')});
-    } 
-
-    if(patient){
-      Session.set('selectedPatient', patient);
-      Session.set('selectedPatientId', get(patient, 'id'));
+    Session.set('selectedPatientId', get(loginResponse, 'user.patientId'));
+
+    if(Patients.find().count() > 0){
+      let matchedPatient;
+      if(get(loginResponse, 'user.patientId')){
+        matchedPatient = Patients.findOne({id: get(loginResponse, 'user.patientId')});
+      } else if(has(loginResponse, 'user.id')){
+        matchedPatient = Patients.findOne({id: get(loginResponse, 'user.id')});
+      }   
+      if(matchedPatient){
+        Session.set('selectedPatient', matchedPatient);
+      }  
     }
+
     currentUserDep.changed();
   }
 

app/accounts/SignUp.jsx

@@ -64,7 +64,11 @@ const Signup = function({ history }){
 
   let selectedPatient;
   let selectedPatientCatch = useState(function(){
-    return Session.get('selectedPatient');
+    if(typeof Session.get('selectedPatient') === "object"){
+      return Session.get('selectedPatient');
+    } else {
+      return Patients.findOne({id: Session.get('selectedPatientId')});
+    }
   }, [])
 
 
@@ -79,8 +83,6 @@ const Signup = function({ history }){
   } else if(selectedPatientCatch.resourceType === "Patient"){
     selectedPatient = selectedPatientCatch;
   }
-
-  let patient = Session.get('selectedPatient');
 
 
   let familyName = "";

app/patient/AutoDashboard.jsx

@@ -53,11 +53,11 @@ export function AutoDashboard(props){
         return Session.get('selectedPatientId');
     }, []);
     data.selectedPatient = useTracker(function(){
-        if(Session.get('selectedPatient')){
-            return Session.get('selectedPatient');
-        } else if(Patients.findOne({id: Session.get('selectedPatientId')})){
-            return Patients.findOne({id: Session.get('selectedPatientId')})
-        }        
+        if(Session.get('selectedPatientId')){
+            return Patients.findOne({id: Session.get('selectedPatientId')});
+        } else if(get(Session.get('currentUser'), 'patientId')){
+            return Patients.findOne({id: get(Session.get('currentUser'), 'patientId')});
+        }   
     }, []);
     data.patients = useTracker(function(){
         return Patients.find().fetch();
@@ -435,7 +435,7 @@ export function AutoDashboard(props){
     </Grid>
 
     let patientChartLayout = <Grid container style={{marginTop: '20px', paddingBottom: '84px'}} justify="center">
-        <Grid item xs={12} md={6}>
+        <Grid item xs={12} sm={12} md={12} lg={6}>
             <PatientCard patient={data.selectedPatient} />
             <DynamicSpacer />
             <StyledCard scrollable >

app/patient/PatientChart.jsx

@@ -4,7 +4,7 @@ import AutoDashboard from "./AutoDashboard";
 import PatientDemographics from "./PatientDemographics";
 
 import { PageCanvas } from 'fhir-starter';
-import { CardHeader, CardContent } from '@material-ui/core';
+import { CardHeader, CardContent, Container } from '@material-ui/core';
 import { useLocation, useParams, useHistory } from "react-router-dom";
 
 import { oauth2 as SMART } from "fhirclient";
@@ -49,9 +49,8 @@ export default function PatientChart() {
 
     let paddingWidth = LayoutHelpers.calcCanvasPaddingWidth();
 
-    let contentToRender = <PageCanvas id='patientChart' headerHeight={headerHeight} paddingLeft={paddingWidth} paddingRight={paddingWidth} >
-      {/* <PatientDemographics /> */}
-      <AutoDashboard fhirServerEndpoint={fhirServerEndpoint} />
+    let contentToRender = <PageCanvas id='patientChart' headerHeight={headerHeight} paddingLeft={20} paddingRight={20} >
+        <AutoDashboard fhirServerEndpoint={fhirServerEndpoint} />
     </PageCanvas>    
     return (contentToRender);
 }