@openmrs/esm-patient-orders-app 11.3.1-pre.9388 → 11.3.1-pre.9390

package/dist/openmrs-esm-patient-orders-app.js

@@ -1 +1 @@
-var _openmrs_esm_patient_orders_app;(()=>{"use strict";var e,r,t,n,o,a,i,s,l,u,p,f,d,c,h,m,v,g,b,y,w,_={63200:(e,r,t)=>{var n={"./start":()=>Promise.all([t.e(7657),t.e(6654),t.e(1343),t.e(5434),t.e(8716),t.e(8625)]).then((()=>()=>t(38625)))},o=(e,r)=>(t.R=r,r=t.o(n,e)?n[e]():Promise.resolve().then((()=>{throw new Error('Module "'+e+'" does not exist in container.')})),t.R=void 0,r),a=(e,r)=>{if(t.S){var n="default",o=t.S[n];if(o&&o!==e)throw new Error("Container initialization failed as it has already been initialized with a different share scope");return t.S[n]=e,t.I(n,r)}};t.d(r,{get:()=>o,init:()=>a})}},P={};function j(e){var r=P[e];if(void 0!==r)return r.exports;var t=P[e]={id:e,exports:{}};return _[e].call(t.exports,t,t.exports,j),t.exports}j.m=_,j.c=P,j.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return j.d(r,{a:r}),r},r=Object.getPrototypeOf?e=>Object.getPrototypeOf(e):e=>e.__proto__,j.t=function(t,n){if(1&n&&(t=this(t)),8&n)return t;if("object"==typeof t&&t){if(4&n&&t.__esModule)return t;if(16&n&&"function"==typeof t.then)return t}var o=Object.create(null);j.r(o);var a={};e=e||[null,r({}),r([]),r(r)];for(var i=2&n&&t;"object"==typeof i&&!~e.indexOf(i);i=r(i))Object.getOwnPropertyNames(i).forEach((e=>a[e]=()=>t[e]));return a.default=()=>t,j.d(o,a),o},j.d=(e,r)=>{for(var t in r)j.o(r,t)&&!j.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},j.f={},j.e=e=>Promise.all(Object.keys(j.f).reduce(((r,t)=>(j.f[t](e,r),r)),[])),j.u=e=>e+".js",j.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),j.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),t={},n="@openmrs/esm-patient-orders-app:",j.l=(e,r,o,a)=>{if(t[e])t[e].push(r);else{var i,s;if(void 0!==o)for(var l=document.getElementsByTagName("script"),u=0;u<l.length;u++){var p=l[u];if(p.getAttribute("src")==e||p.getAttribute("data-webpack")==n+o){i=p;break}}i||(s=!0,(i=document.createElement("script")).charset="utf-8",i.timeout=120,j.nc&&i.setAttribute("nonce",j.nc),i.setAttribute("data-webpack",n+o),i.src=e),t[e]=[r];var f=(r,n)=>{i.onerror=i.onload=null,clearTimeout(d);var o=t[e];if(delete t[e],i.parentNode&&i.parentNode.removeChild(i),o&&o.forEach((e=>e(n))),r)return r(n)},d=setTimeout(f.bind(null,void 0,{type:"timeout",target:i}),12e4);i.onerror=f.bind(null,i.onerror),i.onload=f.bind(null,i.onload),s&&document.head.appendChild(i)}},j.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},(()=>{j.S={};var e={},r={};j.I=(t,n)=>{n||(n=[]);var o=r[t];if(o||(o=r[t]={}),!(n.indexOf(o)>=0)){if(n.push(o),e[t])return e[t];j.o(j.S,t)||(j.S[t]={});var a=j.S[t],i="@openmrs/esm-patient-orders-app",s=(e,r,t,n)=>{var o=a[e]=a[e]||{},s=o[r];(!s||!s.loaded&&(!n!=!s.eager?n:i>s.from))&&(o[r]={get:t,from:i,eager:!!n})},l=[];return"default"===t&&(s("@openmrs/esm-framework","8.0.1-pre.3504",(()=>Promise.all([j.e(5134),j.e(7657),j.e(5670),j.e(1343),j.e(5434),j.e(2941),j.e(8716)]).then((()=>()=>j(55670))))),s("@openmrs/esm-patient-common-lib","11.3.1-pre.9388",(()=>Promise.all([j.e(5134),j.e(7657),j.e(1343),j.e(5434),j.e(2941),j.e(8716),j.e(8803)]).then((()=>()=>j(18803))))),s("dayjs","1.11.13",(()=>j.e(3464).then((()=>()=>j(23464))))),s("react-i18next","16.0.0",(()=>Promise.all([j.e(6336),j.e(1343)]).then((()=>()=>j(16336))))),s("react-router-dom","6.16.0",(()=>Promise.all([j.e(2913),j.e(1343)]).then((()=>()=>j(52913))))),s("react","18.3.1",(()=>j.e(4041).then((()=>()=>j(14041))))),s("rxjs","6.6.7",(()=>j.e(2457).then((()=>()=>j(82457))))),s("swr/_internal","2.2.5",(()=>Promise.all([j.e(2372),j.e(1343)]).then((()=>()=>j(42372))))),s("swr/immutable","2.2.5",(()=>Promise.all([j.e(1343),j.e(5434),j.e(7495)]).then((()=>()=>j(29876))))),s("swr/infinite","2.2.5",(()=>Promise.all([j.e(1343),j.e(5434),j.e(89)]).then((()=>()=>j(52470)))))),e[t]=l.length?Promise.all(l).then((()=>e[t]=1)):1}}})(),(()=>{var e;j.g.importScripts&&(e=j.g.location+"");var r=j.g.document;if(!e&&r&&(r.currentScript&&"SCRIPT"===r.currentScript.tagName.toUpperCase()&&(e=r.currentScript.src),!e)){var t=r.getElementsByTagName("script");if(t.length)for(var n=t.length-1;n>-1&&(!e||!/^http(s?):/.test(e));)e=t[n--].src}if(!e)throw new Error("Automatic publicPath is not supported in this browser");e=e.replace(/^blob:/,"").replace(/#.*$/,"").replace(/\?.*$/,"").replace(/\/[^\/]+$/,"/"),j.p=e})(),o=e=>{var r=e=>e.split(".").map((e=>+e==e?+e:e)),t=/^([^-+]+)?(?:-([^+]+))?(?:\+(.+))?$/.exec(e),n=t[1]?r(t[1]):[];return t[2]&&(n.length++,n.push.apply(n,r(t[2]))),t[3]&&(n.push([]),n.push.apply(n,r(t[3]))),n},a=(e,r)=>{e=o(e),r=o(r);for(var t=0;;){if(t>=e.length)return t<r.length&&"u"!=(typeof r[t])[0];var n=e[t],a=(typeof n)[0];if(t>=r.length)return"u"==a;var i=r[t],s=(typeof i)[0];if(a!=s)return"o"==a&&"n"==s||"s"==s||"u"==a;if("o"!=a&&"u"!=a&&n!=i)return n<i;t++}},i=e=>{var r=e[0],t="";if(1===e.length)return"*";if(r+.5){t+=0==r?">=":-1==r?"<":1==r?"^":2==r?"~":r>0?"=":"!=";for(var n=1,o=1;o<e.length;o++)n--,t+="u"==(typeof(s=e[o]))[0]?"-":(n>0?".":"")+(n=2,s);return t}var a=[];for(o=1;o<e.length;o++){var s=e[o];a.push(0===s?"not("+l()+")":1===s?"("+l()+" || "+l()+")":2===s?a.pop()+" "+a.pop():i(s))}return l();function l(){return a.pop().replace(/^\((.+)\)$/,"$1")}},s=(e,r)=>{if(0 in e){r=o(r);var t=e[0],n=t<0;n&&(t=-t-1);for(var a=0,i=1,l=!0;;i++,a++){var u,p,f=i<e.length?(typeof e[i])[0]:"";if(a>=r.length||"o"==(p=(typeof(u=r[a]))[0]))return!l||("u"==f?i>t&&!n:""==f!=n);if("u"==p){if(!l||"u"!=f)return!1}else if(l)if(f==p)if(i<=t){if(u!=e[i])return!1}else{if(n?u>e[i]:u<e[i])return!1;u!=e[i]&&(l=!1)}else if("s"!=f&&"n"!=f){if(n||i<=t)return!1;l=!1,i--}else{if(i<=t||p<f!=n)return!1;l=!1}else"s"!=f&&"n"!=f&&(l=!1,i--)}}var d=[],c=d.pop.bind(d);for(a=1;a<e.length;a++){var h=e[a];d.push(1==h?c()|c():2==h?c()&c():h?s(h,r):!c())}return!!c()},l=(e,r)=>e&&j.o(e,r),u=e=>(e.loaded=1,e.get()),p=e=>Object.keys(e).reduce(((r,t)=>(e[t].eager&&(r[t]=e[t]),r)),{}),f=(e,r,t)=>{var n=t?p(e[r]):e[r];return Object.keys(n).reduce(((e,r)=>!e||!n[e].loaded&&a(e,r)?r:e),0)},d=(e,r,t,n)=>"Unsatisfied version "+t+" from "+(t&&e[r][t].from)+" of shared singleton module "+r+" (required "+i(n)+")",c=e=>{throw new Error(e)},h=e=>{"undefined"!=typeof console&&console.warn&&console.warn(e)},m=(e,r,t)=>t?t():((e,r)=>c("Shared module "+r+" doesn't exist in shared scope "+e))(e,r),v=(e=>function(r,t,n,o,a){var i=j.I(r);return i&&i.then&&!n?i.then(e.bind(e,r,j.S[r],t,!1,o,a)):e(r,j.S[r],t,n,o,a)})(((e,r,t,n,o,a)=>{if(!l(r,t))return m(e,t,a);var i=f(r,t,n);return s(o,i)||h(d(r,t,i,o)),u(r[t][i])})),g={},b={1343:()=>v("default","react",!1,[1,18],(()=>j.e(4041).then((()=>()=>j(14041))))),55434:()=>v("default","swr/_internal",!1,[1,2],(()=>j.e(2372).then((()=>()=>j(42372))))),8877:()=>v("default","react-router-dom",!1,[1,6],(()=>j.e(2913).then((()=>()=>j(52913))))),24818:()=>v("default","rxjs",!1,[1,6],(()=>j.e(2457).then((()=>()=>j(82457))))),98394:()=>v("default","swr/infinite",!1,[1,2],(()=>j.e(2470).then((()=>()=>j(52470))))),46372:()=>v("default","dayjs",!1,[1,1],(()=>j.e(3464).then((()=>()=>j(23464))))),54440:()=>v("default","@openmrs/esm-framework",!1,[1,8],(()=>Promise.all([j.e(5134),j.e(5670),j.e(2941)]).then((()=>()=>j(55670))))),72339:()=>v("default","react-i18next",!1,[1,16],(()=>j.e(6336).then((()=>()=>j(16336))))),88010:()=>v("default","swr/immutable",!1,[1,2],(()=>j.e(9876).then((()=>()=>j(29876))))),36274:()=>v("default","@openmrs/esm-patient-common-lib",!1,[1,11],(()=>Promise.all([j.e(5134),j.e(2941),j.e(8803)]).then((()=>()=>j(18803)))))},y={1343:[1343],2941:[8877,24818,98394],5434:[55434],8625:[36274],8716:[46372,54440,72339,88010]},w={},j.f.consumes=(e,r)=>{j.o(y,e)&&y[e].forEach((e=>{if(j.o(g,e))return r.push(g[e]);if(!w[e]){var t=r=>{g[e]=0,j.m[e]=t=>{delete j.c[e],t.exports=r()}};w[e]=!0;var n=r=>{delete g[e],j.m[e]=t=>{throw delete j.c[e],r}};try{var o=b[e]();o.then?r.push(g[e]=o.then(t).catch(n)):t(o)}catch(e){n(e)}}}))},(()=>{var e={113:0};j.f.j=(r,t)=>{var n=j.o(e,r)?e[r]:void 0;if(0!==n)if(n)t.push(n[2]);else if(/^(1343|2941|5434|8716)$/.test(r))e[r]=0;else{var o=new Promise(((t,o)=>n=e[r]=[t,o]));t.push(n[2]=o);var a=j.p+j.u(r),i=new Error;j.l(a,(t=>{if(j.o(e,r)&&(0!==(n=e[r])&&(e[r]=void 0),n)){var o=t&&("load"===t.type?"missing":t.type),a=t&&t.target&&t.target.src;i.message="Loading chunk "+r+" failed.\n("+o+": "+a+")",i.name="ChunkLoadError",i.type=o,i.request=a,n[1](i)}}),"chunk-"+r,r)}};var r=(r,t)=>{var n,o,[a,i,s]=t,l=0;if(a.some((r=>0!==e[r]))){for(n in i)j.o(i,n)&&(j.m[n]=i[n]);s&&s(j)}for(r&&r(t);l<a.length;l++)o=a[l],j.o(e,o)&&e[o]&&e[o][0](),e[o]=0},t=globalThis.webpackChunk_openmrs_esm_patient_orders_app=globalThis.webpackChunk_openmrs_esm_patient_orders_app||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})(),j.nc=void 0;var S=j(63200);_openmrs_esm_patient_orders_app=S})();
+var _openmrs_esm_patient_orders_app;(()=>{"use strict";var e,r,t,n,o,a,i,s,l,u,p,f,d,c,h,m,v,g,b,y,w,_={63200:(e,r,t)=>{var n={"./start":()=>Promise.all([t.e(7657),t.e(6654),t.e(1343),t.e(5434),t.e(8716),t.e(8625)]).then((()=>()=>t(38625)))},o=(e,r)=>(t.R=r,r=t.o(n,e)?n[e]():Promise.resolve().then((()=>{throw new Error('Module "'+e+'" does not exist in container.')})),t.R=void 0,r),a=(e,r)=>{if(t.S){var n="default",o=t.S[n];if(o&&o!==e)throw new Error("Container initialization failed as it has already been initialized with a different share scope");return t.S[n]=e,t.I(n,r)}};t.d(r,{get:()=>o,init:()=>a})}},P={};function j(e){var r=P[e];if(void 0!==r)return r.exports;var t=P[e]={id:e,exports:{}};return _[e].call(t.exports,t,t.exports,j),t.exports}j.m=_,j.c=P,j.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return j.d(r,{a:r}),r},r=Object.getPrototypeOf?e=>Object.getPrototypeOf(e):e=>e.__proto__,j.t=function(t,n){if(1&n&&(t=this(t)),8&n)return t;if("object"==typeof t&&t){if(4&n&&t.__esModule)return t;if(16&n&&"function"==typeof t.then)return t}var o=Object.create(null);j.r(o);var a={};e=e||[null,r({}),r([]),r(r)];for(var i=2&n&&t;"object"==typeof i&&!~e.indexOf(i);i=r(i))Object.getOwnPropertyNames(i).forEach((e=>a[e]=()=>t[e]));return a.default=()=>t,j.d(o,a),o},j.d=(e,r)=>{for(var t in r)j.o(r,t)&&!j.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},j.f={},j.e=e=>Promise.all(Object.keys(j.f).reduce(((r,t)=>(j.f[t](e,r),r)),[])),j.u=e=>e+".js",j.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),j.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),t={},n="@openmrs/esm-patient-orders-app:",j.l=(e,r,o,a)=>{if(t[e])t[e].push(r);else{var i,s;if(void 0!==o)for(var l=document.getElementsByTagName("script"),u=0;u<l.length;u++){var p=l[u];if(p.getAttribute("src")==e||p.getAttribute("data-webpack")==n+o){i=p;break}}i||(s=!0,(i=document.createElement("script")).charset="utf-8",i.timeout=120,j.nc&&i.setAttribute("nonce",j.nc),i.setAttribute("data-webpack",n+o),i.src=e),t[e]=[r];var f=(r,n)=>{i.onerror=i.onload=null,clearTimeout(d);var o=t[e];if(delete t[e],i.parentNode&&i.parentNode.removeChild(i),o&&o.forEach((e=>e(n))),r)return r(n)},d=setTimeout(f.bind(null,void 0,{type:"timeout",target:i}),12e4);i.onerror=f.bind(null,i.onerror),i.onload=f.bind(null,i.onload),s&&document.head.appendChild(i)}},j.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},(()=>{j.S={};var e={},r={};j.I=(t,n)=>{n||(n=[]);var o=r[t];if(o||(o=r[t]={}),!(n.indexOf(o)>=0)){if(n.push(o),e[t])return e[t];j.o(j.S,t)||(j.S[t]={});var a=j.S[t],i="@openmrs/esm-patient-orders-app",s=(e,r,t,n)=>{var o=a[e]=a[e]||{},s=o[r];(!s||!s.loaded&&(!n!=!s.eager?n:i>s.from))&&(o[r]={get:t,from:i,eager:!!n})},l=[];return"default"===t&&(s("@openmrs/esm-framework","8.0.1-pre.3504",(()=>Promise.all([j.e(5134),j.e(7657),j.e(5670),j.e(1343),j.e(5434),j.e(2941),j.e(8716)]).then((()=>()=>j(55670))))),s("@openmrs/esm-patient-common-lib","11.3.1-pre.9390",(()=>Promise.all([j.e(5134),j.e(7657),j.e(1343),j.e(5434),j.e(2941),j.e(8716),j.e(8803)]).then((()=>()=>j(18803))))),s("dayjs","1.11.13",(()=>j.e(3464).then((()=>()=>j(23464))))),s("react-i18next","16.0.0",(()=>Promise.all([j.e(6336),j.e(1343)]).then((()=>()=>j(16336))))),s("react-router-dom","6.16.0",(()=>Promise.all([j.e(2913),j.e(1343)]).then((()=>()=>j(52913))))),s("react","18.3.1",(()=>j.e(4041).then((()=>()=>j(14041))))),s("rxjs","6.6.7",(()=>j.e(2457).then((()=>()=>j(82457))))),s("swr/_internal","2.2.5",(()=>Promise.all([j.e(2372),j.e(1343)]).then((()=>()=>j(42372))))),s("swr/immutable","2.2.5",(()=>Promise.all([j.e(1343),j.e(5434),j.e(7495)]).then((()=>()=>j(29876))))),s("swr/infinite","2.2.5",(()=>Promise.all([j.e(1343),j.e(5434),j.e(89)]).then((()=>()=>j(52470)))))),e[t]=l.length?Promise.all(l).then((()=>e[t]=1)):1}}})(),(()=>{var e;j.g.importScripts&&(e=j.g.location+"");var r=j.g.document;if(!e&&r&&(r.currentScript&&"SCRIPT"===r.currentScript.tagName.toUpperCase()&&(e=r.currentScript.src),!e)){var t=r.getElementsByTagName("script");if(t.length)for(var n=t.length-1;n>-1&&(!e||!/^http(s?):/.test(e));)e=t[n--].src}if(!e)throw new Error("Automatic publicPath is not supported in this browser");e=e.replace(/^blob:/,"").replace(/#.*$/,"").replace(/\?.*$/,"").replace(/\/[^\/]+$/,"/"),j.p=e})(),o=e=>{var r=e=>e.split(".").map((e=>+e==e?+e:e)),t=/^([^-+]+)?(?:-([^+]+))?(?:\+(.+))?$/.exec(e),n=t[1]?r(t[1]):[];return t[2]&&(n.length++,n.push.apply(n,r(t[2]))),t[3]&&(n.push([]),n.push.apply(n,r(t[3]))),n},a=(e,r)=>{e=o(e),r=o(r);for(var t=0;;){if(t>=e.length)return t<r.length&&"u"!=(typeof r[t])[0];var n=e[t],a=(typeof n)[0];if(t>=r.length)return"u"==a;var i=r[t],s=(typeof i)[0];if(a!=s)return"o"==a&&"n"==s||"s"==s||"u"==a;if("o"!=a&&"u"!=a&&n!=i)return n<i;t++}},i=e=>{var r=e[0],t="";if(1===e.length)return"*";if(r+.5){t+=0==r?">=":-1==r?"<":1==r?"^":2==r?"~":r>0?"=":"!=";for(var n=1,o=1;o<e.length;o++)n--,t+="u"==(typeof(s=e[o]))[0]?"-":(n>0?".":"")+(n=2,s);return t}var a=[];for(o=1;o<e.length;o++){var s=e[o];a.push(0===s?"not("+l()+")":1===s?"("+l()+" || "+l()+")":2===s?a.pop()+" "+a.pop():i(s))}return l();function l(){return a.pop().replace(/^\((.+)\)$/,"$1")}},s=(e,r)=>{if(0 in e){r=o(r);var t=e[0],n=t<0;n&&(t=-t-1);for(var a=0,i=1,l=!0;;i++,a++){var u,p,f=i<e.length?(typeof e[i])[0]:"";if(a>=r.length||"o"==(p=(typeof(u=r[a]))[0]))return!l||("u"==f?i>t&&!n:""==f!=n);if("u"==p){if(!l||"u"!=f)return!1}else if(l)if(f==p)if(i<=t){if(u!=e[i])return!1}else{if(n?u>e[i]:u<e[i])return!1;u!=e[i]&&(l=!1)}else if("s"!=f&&"n"!=f){if(n||i<=t)return!1;l=!1,i--}else{if(i<=t||p<f!=n)return!1;l=!1}else"s"!=f&&"n"!=f&&(l=!1,i--)}}var d=[],c=d.pop.bind(d);for(a=1;a<e.length;a++){var h=e[a];d.push(1==h?c()|c():2==h?c()&c():h?s(h,r):!c())}return!!c()},l=(e,r)=>e&&j.o(e,r),u=e=>(e.loaded=1,e.get()),p=e=>Object.keys(e).reduce(((r,t)=>(e[t].eager&&(r[t]=e[t]),r)),{}),f=(e,r,t)=>{var n=t?p(e[r]):e[r];return Object.keys(n).reduce(((e,r)=>!e||!n[e].loaded&&a(e,r)?r:e),0)},d=(e,r,t,n)=>"Unsatisfied version "+t+" from "+(t&&e[r][t].from)+" of shared singleton module "+r+" (required "+i(n)+")",c=e=>{throw new Error(e)},h=e=>{"undefined"!=typeof console&&console.warn&&console.warn(e)},m=(e,r,t)=>t?t():((e,r)=>c("Shared module "+r+" doesn't exist in shared scope "+e))(e,r),v=(e=>function(r,t,n,o,a){var i=j.I(r);return i&&i.then&&!n?i.then(e.bind(e,r,j.S[r],t,!1,o,a)):e(r,j.S[r],t,n,o,a)})(((e,r,t,n,o,a)=>{if(!l(r,t))return m(e,t,a);var i=f(r,t,n);return s(o,i)||h(d(r,t,i,o)),u(r[t][i])})),g={},b={1343:()=>v("default","react",!1,[1,18],(()=>j.e(4041).then((()=>()=>j(14041))))),55434:()=>v("default","swr/_internal",!1,[1,2],(()=>j.e(2372).then((()=>()=>j(42372))))),8877:()=>v("default","react-router-dom",!1,[1,6],(()=>j.e(2913).then((()=>()=>j(52913))))),24818:()=>v("default","rxjs",!1,[1,6],(()=>j.e(2457).then((()=>()=>j(82457))))),98394:()=>v("default","swr/infinite",!1,[1,2],(()=>j.e(2470).then((()=>()=>j(52470))))),46372:()=>v("default","dayjs",!1,[1,1],(()=>j.e(3464).then((()=>()=>j(23464))))),54440:()=>v("default","@openmrs/esm-framework",!1,[1,8],(()=>Promise.all([j.e(5134),j.e(5670),j.e(2941)]).then((()=>()=>j(55670))))),72339:()=>v("default","react-i18next",!1,[1,16],(()=>j.e(6336).then((()=>()=>j(16336))))),88010:()=>v("default","swr/immutable",!1,[1,2],(()=>j.e(9876).then((()=>()=>j(29876))))),36274:()=>v("default","@openmrs/esm-patient-common-lib",!1,[1,11],(()=>Promise.all([j.e(5134),j.e(2941),j.e(8803)]).then((()=>()=>j(18803)))))},y={1343:[1343],2941:[8877,24818,98394],5434:[55434],8625:[36274],8716:[46372,54440,72339,88010]},w={},j.f.consumes=(e,r)=>{j.o(y,e)&&y[e].forEach((e=>{if(j.o(g,e))return r.push(g[e]);if(!w[e]){var t=r=>{g[e]=0,j.m[e]=t=>{delete j.c[e],t.exports=r()}};w[e]=!0;var n=r=>{delete g[e],j.m[e]=t=>{throw delete j.c[e],r}};try{var o=b[e]();o.then?r.push(g[e]=o.then(t).catch(n)):t(o)}catch(e){n(e)}}}))},(()=>{var e={113:0};j.f.j=(r,t)=>{var n=j.o(e,r)?e[r]:void 0;if(0!==n)if(n)t.push(n[2]);else if(/^(1343|2941|5434|8716)$/.test(r))e[r]=0;else{var o=new Promise(((t,o)=>n=e[r]=[t,o]));t.push(n[2]=o);var a=j.p+j.u(r),i=new Error;j.l(a,(t=>{if(j.o(e,r)&&(0!==(n=e[r])&&(e[r]=void 0),n)){var o=t&&("load"===t.type?"missing":t.type),a=t&&t.target&&t.target.src;i.message="Loading chunk "+r+" failed.\n("+o+": "+a+")",i.name="ChunkLoadError",i.type=o,i.request=a,n[1](i)}}),"chunk-"+r,r)}};var r=(r,t)=>{var n,o,[a,i,s]=t,l=0;if(a.some((r=>0!==e[r]))){for(n in i)j.o(i,n)&&(j.m[n]=i[n]);s&&s(j)}for(r&&r(t);l<a.length;l++)o=a[l],j.o(e,o)&&e[o]&&e[o][0](),e[o]=0},t=globalThis.webpackChunk_openmrs_esm_patient_orders_app=globalThis.webpackChunk_openmrs_esm_patient_orders_app||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})(),j.nc=void 0;var S=j(63200);_openmrs_esm_patient_orders_app=S})();

package/dist/openmrs-esm-patient-orders-app.js.buildmanifest.json

@@ -48,7 +48,7 @@
       "auxiliaryFiles": [
         "openmrs-esm-patient-orders-app.js.map"
       ],
-      "hash": "1ac75a42bd9672b8",
+      "hash": "634940a33e54f674",
       "childrenByOrder": {}
     },
     {
@@ -231,9 +231,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 74247,
+      "size": 89187,
       "sizes": {
-        "javascript": 74247
+        "javascript": 89187
       },
       "names": [],
       "idHints": [],
@@ -247,7 +247,7 @@
       "auxiliaryFiles": [
         "1571.js.map"
       ],
-      "hash": "00448f68d162434c",
+      "hash": "cb0b5d57f8cb62a7",
       "childrenByOrder": {}
     },
     {
@@ -372,6 +372,30 @@
       "hash": "dd7d0bc9b366d595",
       "childrenByOrder": {}
     },
+    {
+      "rendered": true,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "size": 138371,
+      "sizes": {
+        "javascript": 138371
+      },
+      "names": [],
+      "idHints": [],
+      "runtime": [
+        "@openmrs/esm-patient-orders-app",
+        "main"
+      ],
+      "files": [
+        "2717.js"
+      ],
+      "auxiliaryFiles": [
+        "2717.js.map"
+      ],
+      "hash": "2e152dbafb534a1d",
+      "childrenByOrder": {}
+    },
     {
       "rendered": true,
       "initial": false,
@@ -585,9 +609,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 4942,
+      "size": 5009,
       "sizes": {
-        "javascript": 4942
+        "javascript": 5009
       },
       "names": [],
       "idHints": [],
@@ -599,7 +623,7 @@
         "4300.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "d0ba9d42c93059ba",
+      "hash": "d422049e939b083c",
       "childrenByOrder": {}
     },
     {
@@ -993,7 +1017,7 @@
       "auxiliaryFiles": [
         "6542.js.map"
       ],
-      "hash": "24ad0ff86944c54c",
+      "hash": "6839facbca7d3f48",
       "childrenByOrder": {}
     },
     {
@@ -1181,30 +1205,6 @@
       "hash": "648bab76e9ecbf7e",
       "childrenByOrder": {}
     },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "size": 138371,
-      "sizes": {
-        "javascript": 138371
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@openmrs/esm-patient-orders-app",
-        "main"
-      ],
-      "files": [
-        "7202.js"
-      ],
-      "auxiliaryFiles": [
-        "7202.js.map"
-      ],
-      "hash": "e9b7b095c9b65bea",
-      "childrenByOrder": {}
-    },
     {
       "rendered": true,
       "initial": false,
@@ -1299,7 +1299,7 @@
       "auxiliaryFiles": [
         "8154.js.map"
       ],
-      "hash": "a66005cd20fd8a5f",
+      "hash": "4e23aa4f55c34a04",
       "childrenByOrder": {}
     },
     {
@@ -1395,9 +1395,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 278507,
+      "size": 288526,
       "sizes": {
-        "javascript": 278465,
+        "javascript": 288484,
         "consume-shared": 42
       },
       "names": [],
@@ -1411,7 +1411,7 @@
       "auxiliaryFiles": [
         "8625.js.map"
       ],
-      "hash": "5e2e3f83eb821582",
+      "hash": "34a2b7c59d4bb3a6",
       "childrenByOrder": {}
     },
     {
@@ -1440,10 +1440,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 3242284,
+      "size": 3252303,
       "sizes": {
         "consume-shared": 294,
-        "javascript": 3218908,
+        "javascript": 3228927,
         "share-init": 420,
         "runtime": 22662
       },
@@ -1460,7 +1460,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "1c110877f3ac00ae",
+      "hash": "18f65bdca9fba676",
       "childrenByOrder": {}
     },
     {
@@ -1469,9 +1469,9 @@
       "entry": false,
       "recorded": false,
       "reason": "reused as split chunk (cache group: default)",
-      "size": 251708,
+      "size": 251776,
       "sizes": {
-        "javascript": 251708
+        "javascript": 251776
       },
       "names": [],
       "idHints": [],
@@ -1485,7 +1485,7 @@
       "auxiliaryFiles": [
         "8803.js.map"
       ],
-      "hash": "7f1fddb2ff091c31",
+      "hash": "8525371c7f8063c0",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0"},"optionalBackendDependencies":{"fhirproxy":"^1.0.0-SNAPSHOT","stockmanagement":"^1.4.0 || ^2.0.0 || >=3.0.0-0","billing":"^1.2.0-SNAPSHOT"},"extensions":[{"name":"order-price-details","component":"orderPriceDetailsExtension","slot":"order-item-additional-info-slot","order":0},{"name":"order-stock-details","component":"orderStockDetailsExtension","slot":"order-item-additional-info-slot","order":1},{"name":"order-basket-action-menu","component":"orderBasketActionMenu","slots":["action-menu-patient-chart-items-slot","action-menu-ward-patient-items-slot"]},{"name":"lab-result","component":"labResult","slot":"completed-lab-order-results-slot","meta":{"fullWidth":false}},{"name":"print-lab-results-action-button","component":"printLabResultsButton","slot":"print-lab-results-action-button-slot","meta":{"fullWidth":false}},{"name":"patient-orders-summary-dashboard","component":"ordersDashboardLink","slot":"patient-chart-dashboard-slot","meta":{"slot":"patient-chart-orders-dashboard-slot","path":"Orders","hideDashboardTitle":true},"order":4},{"name":"patient-orders-dashboard","component":"ordersDashboard","slot":"patient-chart-orders-dashboard-slot","meta":{"fullWidth":false}}],"workspaces":[{"name":"order-basket","title":"orderBasketWorkspaceTitle","component":"orderBasketWorkspace","type":"order","canHide":true},{"name":"patient-orders-form-workspace","title":"orderCancellation","component":"patientOrdersFormWorkspace","type":"order","canHide":false},{"name":"test-results-form-workspace","title":"enterTestResults","component":"testResultsFormWorkspace","type":"lab-results","canHide":false},{"name":"orderable-concept-workspace","title":"searchOrderables","component":"orderableConceptSearch","type":"order"}],"modals":[{"component":"printLabResultModal","name":"print-lab-results-modal"}],"version":"11.3.1-pre.9388"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0"},"optionalBackendDependencies":{"fhirproxy":"^1.0.0-SNAPSHOT","stockmanagement":"^1.4.0 || ^2.0.0 || >=3.0.0-0","billing":"^1.2.0-SNAPSHOT"},"extensions":[{"name":"order-price-details","component":"orderPriceDetailsExtension","slot":"order-item-additional-info-slot","order":0},{"name":"order-stock-details","component":"orderStockDetailsExtension","slot":"order-item-additional-info-slot","order":1},{"name":"order-basket-action-menu","component":"orderBasketActionMenu","slots":["action-menu-patient-chart-items-slot","action-menu-ward-patient-items-slot"]},{"name":"lab-result","component":"labResult","slot":"completed-lab-order-results-slot","meta":{"fullWidth":false}},{"name":"print-lab-results-action-button","component":"printLabResultsButton","slot":"print-lab-results-action-button-slot","meta":{"fullWidth":false}},{"name":"patient-orders-summary-dashboard","component":"ordersDashboardLink","slot":"patient-chart-dashboard-slot","meta":{"slot":"patient-chart-orders-dashboard-slot","path":"Orders","hideDashboardTitle":true},"order":4},{"name":"patient-orders-dashboard","component":"ordersDashboard","slot":"patient-chart-orders-dashboard-slot","meta":{"fullWidth":false}}],"workspaces":[{"name":"order-basket","title":"orderBasketWorkspaceTitle","component":"orderBasketWorkspace","type":"order","canHide":true},{"name":"patient-orders-form-workspace","title":"orderCancellation","component":"patientOrdersFormWorkspace","type":"order","canHide":false},{"name":"test-results-form-workspace","title":"enterTestResults","component":"testResultsFormWorkspace","type":"lab-results","canHide":false},{"name":"orderable-concept-workspace","title":"searchOrderables","component":"orderableConceptSearch","type":"order"}],"modals":[{"component":"printLabResultModal","name":"print-lab-results-modal"}],"version":"11.3.1-pre.9390"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-orders-app",
-  "version": "11.3.1-pre.9388",
+  "version": "11.3.1-pre.9390",
   "license": "MPL-2.0",
   "description": "Microfrontend for the OpenMRS SPA providing the order basket for the patient chart",
   "browser": "dist/openmrs-esm-patient-orders-app.js",
@@ -52,7 +52,7 @@
     "swr": "2.x"
   },
   "devDependencies": {
-    "@openmrs/esm-patient-common-lib": "11.3.1-pre.9388",
+    "@openmrs/esm-patient-common-lib": "11.3.1-pre.9390",
     "webpack": "^5.99.9"
   },
   "stableVersion": "11.3.0"

package/src/components/test-order.component.tsx

@@ -14,7 +14,7 @@ import {
   TableHeader,
   TableRow,
 } from '@carbon/react';
-import { useLabEncounter, useOrderConceptByUuid } from '../lab-results/lab-results.resource';
+import { useLabEncounter, useOrderConceptByUuid, useOrderConceptsByUuids } from '../lab-results/lab-results.resource';
 import { getObservationDisplayValue } from '../utils';
 import styles from './test-order.scss';
 
@@ -46,52 +46,56 @@ const TestOrder: React.FC<TestOrderProps> = ({ testOrder }) => {
     [t, testOrder?.orderType?.display],
   );
 
-  const testResultObs = useMemo(() => {
-    if (!encounter || !concept) return null;
-    return encounter.obs?.find((obs) => obs.concept.uuid === concept.uuid);
-  }, [concept, encounter]);
+  const [testResultObs, obsUuids] = useMemo(() => {
+    if (!encounter) return [[], []];
+    const testObs = encounter.obs?.filter((obs) => obs.order?.uuid === testOrder.uuid) ?? [];
+    return [testObs, testObs.map((obs) => obs.concept?.uuid).filter(Boolean)];
+  }, [encounter, testOrder.uuid]);
+
+  const { isLoading: isLoadingResultsConcepts, concepts: conceptList } = useOrderConceptsByUuids(obsUuids);
 
   const testRows = useMemo(() => {
-    if (!concept) return [];
-
-    // For panel tests (with set members)
-    if (concept.setMembers && concept.setMembers.length > 0) {
-      return concept.setMembers.map((memberConcept) => {
-        const memberObs = testResultObs?.groupMembers?.find((obs) => obs.concept.uuid === memberConcept.uuid);
-
-        let resultValue: React.ReactNode;
-        if (isLoadingResult) {
-          resultValue = <SkeletonText />;
-        } else if (memberObs) {
-          resultValue = getObservationDisplayValue(memberObs.value ?? memberObs);
-        } else {
-          resultValue = '--';
-        }
-
-        return {
-          id: memberConcept.uuid,
-          testType: <div className={styles.testType}>{memberConcept.display || '--'}</div>,
-          result: resultValue,
-          normalRange:
-            memberConcept.lowNormal != null && memberConcept.hiNormal != null
-              ? `${memberConcept.lowNormal} - ${memberConcept.hiNormal}`
-              : t('notApplicable', 'Not applicable'),
-        };
-      });
-    }
-
-    // For single tests (no set members)
-    let resultValue: React.ReactNode;
-    if (isLoadingResult) {
-      resultValue = <SkeletonText />;
-    } else if (testResultObs) {
-      resultValue = getObservationDisplayValue(testResultObs.value ?? testResultObs);
-    } else {
-      resultValue = '--';
-    }
-
-    return [
-      {
+    if (!Array.isArray(testResultObs) || testResultObs.length === 0) return [];
+
+    return testResultObs.flatMap((obs) => {
+      const concept = conceptList.find((c) => c.uuid === obs.concept.uuid);
+      if (!concept) return [];
+
+      // Handle panel tests (with set members / groupMembers)
+      if (concept.setMembers && concept.setMembers.length > 0) {
+        return concept.setMembers.map((memberConcept) => {
+          const memberObs = obs.groupMembers?.find((gm) => gm.concept.uuid === memberConcept.uuid);
+
+          let resultValue: React.ReactNode;
+          if (isLoadingResult) {
+            resultValue = <SkeletonText />;
+          } else if (memberObs) {
+            resultValue = getObservationDisplayValue(memberObs.value ?? memberObs);
+          } else {
+            resultValue = '--';
+          }
+
+          return {
+            id: memberConcept.uuid,
+            testType: <div className={styles.testType}>{memberConcept.display || '--'}</div>,
+            result: resultValue,
+            normalRange:
+              memberConcept.lowNormal != null && memberConcept.hiNormal != null
+                ? `${memberConcept.lowNormal} - ${memberConcept.hiNormal}`
+                : t('notApplicable', 'Not applicable'),
+          };
+        });
+      }
+
+      // Handle single test (no set members)
+      let resultValue: React.ReactNode;
+      if (isLoadingResult) {
+        resultValue = <SkeletonText />;
+      } else {
+        resultValue = getObservationDisplayValue(obs.value ?? obs);
+      }
+
+      return {
         id: concept.uuid,
         testType: <div className={styles.testType}>{concept.display || '--'}</div>,
         result: resultValue,
@@ -99,11 +103,11 @@ const TestOrder: React.FC<TestOrderProps> = ({ testOrder }) => {
           concept.lowNormal != null && concept.hiNormal != null
             ? `${concept.lowNormal} - ${concept.hiNormal}`
             : t('notApplicable', 'Not applicable'),
-      },
-    ];
-  }, [concept, isLoadingResult, testResultObs, t]);
+      };
+    });
+  }, [isLoadingResult, testResultObs, conceptList, t]);
 
-  if (isLoadingTestConcepts || isLoadingResult) {
+  if (isLoadingResultsConcepts || isLoadingResult) {
     return <DataTableSkeleton role="progressbar" compact={!isTablet} zebra />;
   }
 

package/src/lab-results/lab-results-form.component.tsx

@@ -5,30 +5,41 @@ import { type Control, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { useSWRConfig } from 'swr';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { restBaseUrl, showSnackbar, useAbortController, useLayoutType } from '@openmrs/esm-framework';
-import { type DefaultPatientWorkspaceProps, type Order } from '@openmrs/esm-patient-common-lib';
+import {
+  restBaseUrl,
+  showSnackbar,
+  useAbortController,
+  useLayoutType,
+  ExtensionSlot,
+  usePatient,
+} from '@openmrs/esm-framework';
+import { type DefaultPatientWorkspaceProps, type Order, useOrderBasket } from '@openmrs/esm-patient-common-lib';
 import { type ObservationValue } from '../types/encounter';
 import {
-  createObservationPayload,
+  createCompositeObservationPayload,
   isCoded,
   isNumeric,
   isPanel,
   isText,
   updateObservation,
   updateOrderResult,
-  useCompletedLabResults,
-  useOrderConceptByUuid,
+  useCompletedLabResultsArray,
+  useOrderConceptsByUuids,
 } from './lab-results.resource';
-import { createLabResultsFormSchema } from './lab-results-schema.resource';
-
+import { createLabResultsFormCompositeSchema } from './lab-results-schema.resource';
 import ResultFormField from './lab-results-form-field.component';
 import styles from './lab-results-form.scss';
+import orderStyles from '../order-basket/order-basket.scss';
 
 export interface LabResultsFormProps extends DefaultPatientWorkspaceProps {
   order: Order;
   invalidateLabOrders?: () => void;
 }
 
+interface OrderBasketSlotProps {
+  patient: fhir.Patient;
+}
+
 const LabResultsForm: React.FC<LabResultsFormProps> = ({
   closeWorkspace,
   closeWorkspaceWithSavedChanges,
@@ -43,11 +54,15 @@ const LabResultsForm: React.FC<LabResultsFormProps> = ({
   const { t } = useTranslation();
   const abortController = useAbortController();
   const isTablet = useLayoutType() === 'tablet';
-  const { concept, isLoading: isLoadingConcepts } = useOrderConceptByUuid(order.concept.uuid);
+  const [orderConceptUuids, setOrderConceptUuids] = useState([order.concept.uuid]);
+  const { isLoading: isLoadingResultConcepts, concepts: conceptArray } = useOrderConceptsByUuids(orderConceptUuids);
   const [showEmptyFormErrorNotification, setShowEmptyFormErrorNotification] = useState(false);
-  const schema = useMemo(() => createLabResultsFormSchema(concept), [concept]);
-  const { completeLabResult, isLoading, mutate: mutateResults } = useCompletedLabResults(order);
+  const compositeSchema = useMemo(() => createLabResultsFormCompositeSchema(conceptArray), [conceptArray]);
   const { mutate } = useSWRConfig();
+  const { isLoading: isLoadingPatient, patient } = usePatient(order.patient.uuid);
+  const { orders, clearOrders } = useOrderBasket(patient);
+  const [isSavingOrders, setIsSavingOrders] = useState(false);
+  const { isLoading, completeLabResults, mutate: mutateResults } = useCompletedLabResultsArray(order);
 
   const mutateOrderData = useCallback(() => {
     mutate(
@@ -57,6 +72,16 @@ const LabResultsForm: React.FC<LabResultsFormProps> = ({
     );
   }, [mutate, order.patient.uuid]);
 
+  const handleCancel = useCallback(() => {
+    clearOrders();
+  }, [clearOrders]);
+
+  const handleSave = useCallback(() => {
+    const newConceptUuids = orders.map((order) => order['testType']['conceptUuid']);
+    setOrderConceptUuids([order.concept.uuid, ...newConceptUuids]);
+    clearOrders();
+  }, [clearOrders, orders, order.concept.uuid]);
+
   const {
     control,
     formState: { errors, isDirty, isSubmitting },
@@ -64,40 +89,53 @@ const LabResultsForm: React.FC<LabResultsFormProps> = ({
     handleSubmit,
   } = useForm<Record<string, ObservationValue>>({
     defaultValues: {} as Record<string, ObservationValue>,
-    resolver: zodResolver(schema),
+    resolver: zodResolver(compositeSchema),
     mode: 'all',
   });
+  useEffect(() => {
+    if (Array.isArray(completeLabResults) && completeLabResults.length > 1) {
+      const conceptUuids = completeLabResults.map((r) => r.concept.uuid);
+      setOrderConceptUuids(conceptUuids);
+    }
+  }, [completeLabResults]);
+
+  const extensionProps = {
+    patient,
+  } satisfies OrderBasketSlotProps;
 
   useEffect(() => {
-    if (concept && completeLabResult && order?.fulfillerStatus === 'COMPLETED') {
-      if (isCoded(concept) && typeof completeLabResult?.value === 'object' && completeLabResult?.value?.uuid) {
-        setValue(concept.uuid, completeLabResult.value.uuid);
-      } else if (isNumeric(concept) && completeLabResult?.value) {
-        setValue(concept.uuid, parseFloat(completeLabResult.value as string));
-      } else if (isText(concept) && completeLabResult?.value) {
-        setValue(concept.uuid, completeLabResult?.value);
-      } else if (isPanel(concept)) {
-        concept.setMembers.forEach((member) => {
-          const obs = completeLabResult.groupMembers.find((v) => v.concept.uuid === member.uuid);
-          let value: ObservationValue;
-          if (isCoded(member)) {
-            value = typeof obs?.value === 'object' ? obs.value.uuid : obs?.value;
-          } else if (isNumeric(member)) {
-            value = obs?.value ? parseFloat(obs.value as string) : undefined;
-          } else if (isText(member)) {
-            value = obs?.value;
-          }
-          if (value) setValue(member.uuid, value);
-        });
+    conceptArray.forEach((concept, index) => {
+      const completeLabResult = completeLabResults.find((r) => r.concept.uuid === concept.uuid);
+      if (concept && completeLabResult && order?.fulfillerStatus === 'COMPLETED') {
+        if (isCoded(concept) && typeof completeLabResult?.value === 'object' && completeLabResult?.value?.uuid) {
+          setValue(concept.uuid, completeLabResult.value.uuid);
+        } else if (isNumeric(concept) && completeLabResult?.value) {
+          setValue(concept.uuid, parseFloat(completeLabResult.value as string));
+        } else if (isText(concept) && completeLabResult?.value) {
+          setValue(concept.uuid, completeLabResult?.value);
+        } else if (isPanel(concept)) {
+          concept.setMembers.forEach((member) => {
+            const obs = completeLabResult.groupMembers.find((v) => v.concept.uuid === member.uuid);
+            let value: ObservationValue;
+            if (isCoded(member)) {
+              value = typeof obs?.value === 'object' ? obs.value.uuid : obs?.value;
+            } else if (isNumeric(member)) {
+              value = obs?.value ? parseFloat(obs.value as string) : undefined;
+            } else if (isText(member)) {
+              value = obs?.value;
+            }
+            if (value) setValue(member.uuid, value);
+          });
+        }
       }
-    }
-  }, [concept, completeLabResult, order, setValue]);
+    });
+  }, [conceptArray, completeLabResults, order?.fulfillerStatus, setValue]);
 
   useEffect(() => {
     promptBeforeClosing(() => isDirty);
   }, [isDirty, promptBeforeClosing]);
 
-  if (isLoadingConcepts) {
+  if (isLoadingResultConcepts) {
     return (
       <div className={styles.loaderContainer}>
         <InlineLoading
@@ -133,6 +171,7 @@ const LabResultsForm: React.FC<LabResultsFormProps> = ({
     // Handle update operation for completed lab order results
     if (order.fulfillerStatus === 'COMPLETED') {
       const updateTasks = Object.entries(formValues).map(([conceptUuid, value]) => {
+        const completeLabResult = completeLabResults.find((r) => r.concept.uuid === conceptUuid);
         const obs = completeLabResult?.groupMembers?.find((v) => v.concept.uuid === conceptUuid) ?? completeLabResult;
         return updateObservation(obs?.uuid, { value });
       });
@@ -162,7 +201,7 @@ const LabResultsForm: React.FC<LabResultsFormProps> = ({
     // Handle Creation logic
 
     // Set the observation status to 'FINAL' as we're not capturing it in the form
-    const obsPayload = createObservationPayload(concept, order, formValues, 'FINAL');
+    const obsPayload = createCompositeObservationPayload(conceptArray, order, formValues, 'FINAL');
     const orderDiscontinuationPayload = {
       previousOrder: order.uuid,
       type: 'testorder',
@@ -210,17 +249,58 @@ const LabResultsForm: React.FC<LabResultsFormProps> = ({
     <Form className={styles.form} onSubmit={handleSubmit(saveLabResults)}>
       <Layer level={isTablet ? 1 : 0}>
         <div className={styles.grid}>
-          {concept && (
+          {conceptArray?.length > 0 && (
             <Stack gap={5}>
               {!isLoading ? (
-                <ResultFormField
-                  defaultValue={completeLabResult}
-                  concept={concept}
-                  control={control as unknown as Control<Record<string, unknown>>}
-                />
+                conceptArray.map((c) => (
+                  <ResultFormField
+                    defaultValue={completeLabResults.find((r) => r.concept.uuid === c.uuid)}
+                    concept={c}
+                    control={control as unknown as Control<Record<string, unknown>>}
+                  />
+                ))
               ) : (
                 <InlineLoading description={t('loadingInitialValues', 'Loading initial values') + '...'} />
               )}
+              {order.fulfillerStatus !== 'COMPLETED' && (
+                <div className={orderStyles.orderBasketContainer}>
+                  <div className={styles.heading}>
+                    <span>{t('addOrderTests', 'Add Tests to this order')}</span>
+                  </div>
+                  <ExtensionSlot
+                    className={classNames(orderStyles.orderBasketSlot, {
+                      [orderStyles.orderBasketSlotTablet]: isTablet,
+                    })}
+                    name="result-order-basket-slot"
+                    state={extensionProps}
+                  />
+                </div>
+              )}
+
+              {orders?.length > 0 && (
+                <div className={orderStyles.orderBasketContainer}>
+                  <ButtonSet className={styles.buttonSet}>
+                    <Button size="sm" className={styles.actionButton} kind="secondary" onClick={handleCancel}>
+                      {t('cancelOrder', 'Cancel order')}
+                    </Button>
+                    <Button
+                      className={styles.actionButton}
+                      kind="primary"
+                      onClick={handleSave}
+                      size="sm"
+                      disabled={
+                        isSavingOrders || !orders?.length || orders?.some(({ isOrderIncomplete }) => isOrderIncomplete)
+                      }
+                    >
+                      {isSavingOrders ? (
+                        <InlineLoading description={t('saving', 'Saving') + '...'} />
+                      ) : (
+                        <span>{t('saveTests', 'Save Tests')}</span>
+                      )}
+                    </Button>
+                  </ButtonSet>
+                </div>
+              )}
             </Stack>
           )}
           {showEmptyFormErrorNotification && (