Merge branch '20220812' of http://git.shengws.com/csx/Vue_New into 20220812

config/dev.env.js

@@ -7,8 +7,8 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
-  // BASE_API: '"http://localhost:9531"',
+  // BASE_API: '"http://api.xt.test.sgjyun.com"',
+  BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -29,8 +29,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-   host: 'xt.test.sgjyun.com',
-   // host: 'localhost',
+   // host: 'xt.test.sgjyun.com',
+   host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

package-lock.json

@@ -621,7 +621,7 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="
     },
     "assign-symbols": {
       "version": "1.0.0",
@@ -647,7 +647,7 @@
     "async-foreach": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
-      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI="
+      "integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA=="
     },
     "async-limiter": {
       "version": "1.0.0",
@@ -666,7 +666,7 @@
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "atob": {
       "version": "2.1.2",
@@ -691,7 +691,7 @@
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="
     },
     "aws4": {
       "version": "1.11.0",
@@ -1677,7 +1677,7 @@
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
       "requires": {
         "tweetnacl": "^0.14.3"
       }
@@ -2100,7 +2100,7 @@
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="
     },
     "center-align": {
       "version": "0.1.3",
@@ -2699,7 +2699,7 @@
     "console-control-strings": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
     },
     "consolidate": {
       "version": "0.14.5",
@@ -3333,7 +3333,7 @@
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -3508,7 +3508,7 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
     },
     "delegate": {
       "version": "3.2.0",
@@ -3518,7 +3518,7 @@
     "delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="
     },
     "depd": {
       "version": "1.1.2",
@@ -3696,7 +3696,7 @@
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
       "requires": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
@@ -4588,7 +4588,7 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="
     },
     "fast-deep-equal": {
       "version": "2.0.1",
@@ -4835,7 +4835,7 @@
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="
     },
     "form-data": {
       "version": "2.3.3",
@@ -5684,7 +5684,7 @@
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -5834,7 +5834,7 @@
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+      "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="
     },
     "har-validator": {
       "version": "5.1.5",
@@ -5913,7 +5913,7 @@
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
     },
     "has-value": {
       "version": "1.0.0",
@@ -6358,7 +6358,7 @@
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
       "requires": {
         "assert-plus": "^1.0.0",
         "jsprim": "^1.2.2",
@@ -6911,7 +6911,7 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -6950,7 +6950,7 @@
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="
     },
     "jest-get-type": {
       "version": "22.4.3",
@@ -7004,7 +7004,7 @@
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="
     },
     "jsesc": {
       "version": "1.3.0",
@@ -7048,7 +7048,7 @@
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
     },
     "json3": {
       "version": "3.3.2",
@@ -9456,7 +9456,7 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
     },
     "pify": {
       "version": "3.0.0",
@@ -14744,7 +14744,7 @@
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "requires": {
         "safe-buffer": "^5.0.1"
       }
@@ -14752,7 +14752,7 @@
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
     },
     "type-check": {
       "version": "0.3.2",
@@ -15125,7 +15125,7 @@
     "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
       "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",

src/api/batch/batch.js

@@ -0,0 +1,107 @@
+import request from '@/utils/request'
+
+export function prescriptiontemplate(params,data) {
+  return request({
+    url: '/api/his/addstemplate',
+    method: 'post',
+    data:data,
+    params:params,
+  })
+}
+export function replacesavedrug(params,data) {
+  return request({
+    url: '/api/his/replacesavedrug',
+    method: 'post',
+    data:data,
+    params:params,
+  })
+}
+export function replacesaveproject(params,data) {
+  return request({
+    url: '/api/his/replacesaveproject',
+    method: 'post',
+    data:data,
+    params:params,
+  })
+}
+
+export function getdialysismodename(query) {
+  return request({
+    url: '/api/his/getdialysismodename',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getdrugsname(query) {
+  return request({
+    url: '/api/his/getdrugsname',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getmodeconfigs(query) {
+  return request({
+    url: '/api/his/getmodeconfigs',
+    method: 'get',
+    params: query
+  })
+}
+
+//根据id获取药品耗材项目基本信息
+export function getdrugsinformation(query) {
+  return request({
+    url: '/api/his/getdrugsinformation',
+    method: 'get',
+    params: query
+  })
+}
+//替换——获取患者名字
+export function replacepeoplename(query) {
+  return request({
+    url: '/api/his/replacepeoplename',
+    method: 'get',
+    params: query
+  })
+}
+//替换——配置
+export function replaceconfig(query) {
+  return request({
+    url: '/api/his/replaceconfig',
+    method: 'get',
+    params: query
+  })
+}
+//批量删除——药品
+export function deletedrugsbatch(query) {
+  return request({
+    url: '/api/his/deletedrugsbatch',
+    method: 'get',
+    params: query
+  })
+}
+//批量删除——项目
+export function batchdeleteitems(query) {
+  return request({
+    url: '/api/his/batchdeleteitems',
+    method: 'get',
+    params: query
+  })
+}
+//根据患者id、透析模式获取处方模板信息
+export function ptemplateinformation(query) {
+  return request({
+    url: '/api/his/ptemplateinformation',
+    method: 'get',
+    params: query
+  })
+}
+//删除一条记录
+export function deleteone(query) {
+  return request({
+    url: '/api/his/deleteone',
+    method: 'get',
+    params: query
+  })
+}

src/api/data.js

@@ -43,9 +43,9 @@ export function updateTemplate(params) {
   })
 }
 
-export function updateFieldIsShow(id, is_show) {
+export function updateFieldIsShow(id, is_show, is_write) {
   return request({
-    url: '/api/filed/show?id=' + id + '&is_show=' + is_show,
+    url: '/api/filed/show?id=' + id + '&is_show=' + is_show + '&is_write=' + is_write,
     method: 'post'
   })
 }

src/api/dialysis_record.js

@@ -172,3 +172,11 @@ export function getInitPrintData(params) {
     params: params
   })
 }
+
+export function getInitPrintDataOne(params) {
+  return request({
+    url: '/api/getinitprintdateone',
+    method: 'get',
+    params: params
+  })
+}

src/api/his/his.js

@@ -697,4 +697,26 @@ export function getExportChargeData(params) {
   })
 }
 
+export function getHisDataFive(params) {
+  return request({
+    url: '/handleExportData',
+    method: 'get',
+    params: params
+  })
+}
+
+
+
+
+export function getHisDataSix(params) {
+  return request({
+    url: '/handleExportData10138',
+    method: 'get',
+    params: params
+  })
+}
+
+
+
+
 

src/api/his/his_export.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function handleData10106(params) {
+  return request({
+    url: '/handleData10106',
+    method: 'get',
+    params: params
+  })
+}

src/api/pharmacy.js

@@ -104,3 +104,19 @@ export function getcurrentname(params) {
     params: params
   })
 }
+//获取分区列表
+export function getpartitionlist(params) {
+  return request({
+    url: '/api/pharmacy/getpartitionlist',
+    method: 'get',
+    params: params
+  })
+}
+//获取给药途径
+export function routeofadministration(params) {
+  return request({
+    url: '/api/pharmacy/routeofadministration',
+    method: 'get',
+    params: params
+  })
+}

src/lang/zh.js

@@ -184,9 +184,6 @@ export default {
     selfPreparedMedicineIndex: '自备药管理',
     selfPreparedMedicine: '自备药管理',
     wareHouseManage: '仓库管理',
-    inventoryTransfer: '库存调拨',
-    wareHouseManage: '仓库管理',
-
     inventoryTransfer: '库存调拨',
 
     // consumablesManagement: '耗材管理',

src/router/modules/hisTool.js

@@ -26,6 +26,22 @@ export default {
       hidden: true,
       is_menu: false
     },
+    {
+      path: '/hisTool/batchDelete',
+      component: () => import('@/xt_pages/outpatientDoctorStation/batch_delete'),
+      name: 'batchDelete',
+      meta: { title: 'batchDelete', noCache: true },
+      hidden: true,
+      is_menu: false
+    },
+    {
+      path: '/hisTool/batchReplacement',
+      component: () => import('@/xt_pages/outpatientDoctorStation/batch_replacement'),
+      name: 'batchReplacement',
+      meta: { title: 'batchReplacement', noCache: true },
+      hidden: true,
+      is_menu: false
+    },
     {
       path: '/hisTool/modeTemplateDetail',
       component: () => import('@/xt_pages/outpatientDoctorStation/modeTemplateDetail'),

src/store/modules/globalConfig.js

@@ -844,7 +844,7 @@ const global_config = {
       },
       11: {
         id: 11,
-        name: '那曲肝素',
+        name: '那屈肝素',
         type: 1,
         shouji: 1,
         weichi: 1,
@@ -874,7 +874,7 @@ const global_config = {
       },
       13: {
         id: 13,
-        name: '那曲肝素钙',
+        name: '那屈肝素钙',
         type: 1,
         shouji: 2,
         weichi: 2,

src/store/modules/xt_user.js

@@ -11,7 +11,7 @@ const xt_user = {
     zone_selected: 0,
     patient_state_selected: 0,
     treat_state_selected: 0,
-    selected_date:new Date(),
+    selected_date: new Date(),
     app_id: 0,
     user: {
       id: 0,
@@ -55,17 +55,17 @@ const xt_user = {
     urlfors: [],
     fileds: [],
 
-    //监测的搜索状态
+    // 监测的搜索状态
     search_mode: 1,
-    //监测的搜索值
-    search_value:''
+    // 监测的搜索值
+    search_value: ''
   },
 
   mutations: {
-    SET_SEARCH_VALUE:(state, search_value) => {
+    SET_SEARCH_VALUE: (state, search_value) => {
       state.search_value = search_value
     },
-    SET_SEARCH_MODE:(state, search_mode) => {
+    SET_SEARCH_MODE: (state, search_mode) => {
       state.search_mode = search_mode
     },
     SET_SCHEDULE_TYPE_SELECTED: (state, schedule_type_selected) => {
@@ -380,7 +380,8 @@ const xt_user = {
     }) {
       commit('CLEAR_USER_INFO')
       removeAdminUserInfoCache()
-    }, updateFiledConfigList({ commit }, object) {
+    },
+    updateFiledConfigList({ commit }, object) {
       var oldFiledList = getFiledConfigList()
       console.log('oldFiledList', oldFiledList)
       var infoJSON = JSON.parse(oldFiledList)
@@ -389,6 +390,7 @@ const xt_user = {
         for (let i = 0; i < infoJSON.length; i++) {
           if (infoJSON[i].id == object.id) {
             infoJSON[i].is_show = object.is_show
+            infoJSON[i].is_write = object.is_write
           }
         }
 

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -49,7 +49,7 @@
 
           <el-table
             v-if="state == 1"
-            :height="tableHeight"
+            height="60vh"
             :data="waiting_drug"
             border
             style="width: 100%"
@@ -114,22 +114,74 @@
       </div>
       <div class="mainRight">
         <div class="titlelist">
-          <!--          <el-button type="primary" @click="tt">调试</el-button>-->
-          <el-button type="primary" @click="dispense" v-if="state == 1"
-            >发药</el-button
-          >
-          <el-button type="primary" @click="toPrint">打印</el-button>
-          <!--          <el-button @click="tt">调试</el-button>-->
-          <!--          <el-button type="primary" @click="toSetting">设置</el-button>-->
+          <div>
+            班次：
+            <el-select
+              v-model="shift"
+              placeholder="请选择"
+              @change="getdrugsdetails"
+            >
+              <el-option
+                v-for="item in banshift"
+                :key="item.value"
+                :label="item.text"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+            分区：
+            <el-select
+              v-model="partition"
+              placeholder="请选择"
+              @change="getdrugsdetails"
+            >
+              <el-option
+                v-for="item in fen"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+            给药途径：
+            <el-select
+              v-model="deliveryway"
+              placeholder="请选择"
+              @change="getdruglist02"
+            >
+              <el-option
+                v-for="item in routeofadministration"
+                :key="item.name"
+                :label="item.name"
+                :value="item.name"
+              >
+              </el-option>
+            </el-select>
+          </div>
+          <div>
+            <el-button type="primary" @click="toExport" v-if="state == 2"
+              >导出</el-button
+            >
+            <!-- <el-button type="primary" @click="tt">调试</el-button>-->
+            <el-button type="primary" @click="dispense" v-if="state == 1"
+              >发药</el-button
+            >
+            <el-button type="primary" @click="toPrint">打印</el-button>
+            <!--                    <el-button @click="tt">调试</el-button>-->
+          </div>
         </div>
+
         <el-divider></el-divider>
-        <div>
+        <div class="right_table">
           <el-table
+            ref="table_01"
             :height="tableHeight"
             :data="tableData"
+            :summary-method="getSummaries_t1"
+            show-summary
             border
             highlight-current-row
-            style="width: 1328px"
+            style="width: 100%"
             :row-style="{ color: '#303133' }"
             :header-cell-style="{
               backgroundColor: 'rgb(245, 247, 250)',
@@ -219,15 +271,25 @@
             </el-table-column>
           </el-table>
         </div>
-        <div>
+        <div class="right_table">
           <el-table
+            ref="table_01"
             :height="tableHeight"
             :data="tableData"
+            :summary-method="getSummaries_t2"
+            show-summary
             border
-            style="width: 1328px"
+            highlight-current-row
+            style="width: 100%"
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266',
+            }"
+            @selection-change="handleSelectionChange"
             v-if="state == 2"
           >
-            <!--            <el-table-column type="selection" width="55"> </el-table-column>-->
+            <!-- <el-table-column type="selection" width="55"> </el-table-column>-->
             <el-table-column
               type="index"
               label="序号"
@@ -317,8 +379,11 @@
             </el-table-column>
           </el-table>
         </div>
-        <div style="margin-top: 25px" v-if="state == 1">
-          领药人：
+
+        <!-- <div style="background-color: #f5f7fa;display:flex;padding: 10px;justify-content:space-around;position:absolute;width:75.6%;margin-top: 27.5%;
+"><div style="width: 40%;padding-left:3%">合计 </div> <div style="width: 40%;display: flex;justify-content:center;padding-left: 37%">{{total}}</div></div> -->
+        <div style="margin-top: 25px; display: flex" v-if="state == 1">
+          <span style="line-height: 36px;">领药人：</span> 
           <el-select v-model="admin_user_id" placeholder="请选择">
             <el-option
               v-for="item in doctorList"
@@ -328,6 +393,11 @@
             >
             </el-option>
           </el-select>
+
+          <span
+            style="display: inline-block;padding-left: 30px;line-height: 36px;}"
+            >选中： {{ select_total }}</span
+          >
         </div>
       </div>
 
@@ -382,6 +452,8 @@ import {
   getpatientswithdrugs,
   medicinedeparture,
   getcurrentname,
+  getpartitionlist,
+  routeofadministration,
 } from "@/api/pharmacy";
 const moment = require("moment");
 export default {
@@ -395,7 +467,7 @@ export default {
         { path: false, name: "药房管理" },
         { path: "/Pharmacy/DrugDispensing", name: "药品发药" },
       ],
-      tableHeight: 400,
+      tableHeight: 490,
       datepick: "",
       state: 1,
       waitmount: 0,
@@ -417,24 +489,31 @@ export default {
       issued_drug: [], //已发药列表
       currentRow: null,
       tmp: 0,
+      banshift: [
+        { value: 0, text: "全部班" },
+        { value: 1, text: "上午" },
+        { value: 2, text: "下午" },
+        { value: 3, text: "晚上" },
+      ],
+      shift: 0, //班次
+      fen: [],
+      partition: 0, //分区
+      routeofadministration: [],
+      deliveryway: "全部", //给药途径
+      total: "", //合计
+      select_total: "",
     };
   },
 
   methods: {
-    tt() {
-      console.log("this.currentRow", this.currentRow);
-      this.$router.go(0);
-    },
+    tt() {},
     async fun3() {
-      console.log("fun3");
       this.fun1().then((val) => {
         this.fun2();
       });
     },
     async fun4(tps) {
-      console.log("fun3", tps);
       this.fun1().then((val) => {
-        console.log("this.issued_drug", this.issued_drug);
         for (let i = 0; i < this.issued_drug.length; i++) {
           if (tps == this.issued_drug[i].id) {
             this.$refs.table02.setCurrentRow(this.issued_drug[i]);
@@ -446,7 +525,6 @@ export default {
     async fun5(tps) {
       console.log("fun3", tps);
       this.fun1().then((val) => {
-        console.log("this.issued_drug", this.waiting_drug);
         for (let i = 0; i < this.waiting_drug.length; i++) {
           if (tps == this.waiting_drug[i].id) {
             this.$refs.table01.setCurrentRow(this.waiting_drug[i]);
@@ -455,6 +533,101 @@ export default {
         }
       });
     },
+
+    // 单位去重
+    unique_unit(arr) {
+      return arr.filter(function (item, index, arr) {
+        //当前元素，在原始数组中的第一个索引==当前索引值，否则返回当前元素
+        return arr.indexOf(item, 0) === index;
+      });
+    },
+
+    getSummaries_t1(param) {
+      const { columns, data } = param;
+      const sums = [];
+      let dose_unit = [];
+      let unit_1 = [];
+      let unit_2 = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+          return;
+        }
+        if (index === 7) {
+          // 单位裁切
+          data.forEach((el, index) => {
+            dose_unit.push(el.total.substr(el.total.length - 1, 1));
+          });
+          dose_unit = this.unique_unit(dose_unit);
+          // 数据合计
+          data.forEach((el, index) => {
+            if (el.total.substr(el.total.length - 1, 1) === dose_unit[0]) {
+              unit_1.push(el.total.substr(0, el.total.length - 1));
+            }
+            if (el.total.substr(el.total.length - 1, 1) === dose_unit[1]) {
+              unit_2.push(el.total.substr(0, el.total.length - 1));
+            }
+          });
+          unit_1 = eval(unit_1.join("+"));
+          unit_2 = eval(unit_2.join("+"));
+
+          if (dose_unit[0] == undefined) {
+            sums[index] = "";
+          } else if (dose_unit[1] == undefined || unit_2 == undefined) {
+            sums[index] = `${unit_1}${dose_unit[0]}`;
+          } else {
+            sums[index] = `${unit_1}${dose_unit[0]}+${unit_2}${dose_unit[1]}`;
+          }
+          return;
+        }
+      });
+
+      return sums;
+    },
+
+    getSummaries_t2(param) {
+      const { columns, data } = param;
+      const sums = [];
+      let dose_unit = [];
+      let unit_1 = [];
+      let unit_2 = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+          return;
+        }
+        if (index === 6) {
+          // 单位裁切
+          data.forEach((el, index) => {
+            dose_unit.push(el.total.substr(el.total.length - 1, 1));
+          });
+          dose_unit = this.unique_unit(dose_unit);
+          // 数据合计
+          data.forEach((el, index) => {
+            if (el.total.substr(el.total.length - 1, 1) === dose_unit[0]) {
+              unit_1.push(el.total.substr(0, el.total.length - 1));
+            }
+            if (el.total.substr(el.total.length - 1, 1) === dose_unit[1]) {
+              unit_2.push(el.total.substr(0, el.total.length - 1));
+            }
+          });
+          unit_1 = eval(unit_1.join("+"));
+          unit_2 = eval(unit_2.join("+"));
+
+          // sums[index] = unit_1+dose_unit[0]+ "+" +unit_2+dose_unit[1];
+          if (dose_unit[0] == undefined) {
+            sums[index] = "";
+          } else if (dose_unit[1] == undefined || unit_2 == undefined) {
+            sums[index] = `${unit_1}${dose_unit[0]}`;
+          } else {
+            sums[index] = `${unit_1}${dose_unit[0]}+${unit_2}${dose_unit[1]}`;
+          }
+          return;
+        }
+      });
+      return sums;
+    },
+
     changeTimes() {
       // alert("aa")
       // this.getdruglist();
@@ -495,9 +668,215 @@ export default {
         this.start_time
       );
     },
-    //列表选择
+    toExport() {
+      if (this.state == 1 && this.multipleSelection.length == 0) {
+        this.$message.error("未选择任何数据");
+        return;
+      }
+      if (this.state == 2 && this.tableData == null) {
+        this.$message.error("未选择任何数据");
+        return;
+      }
+      // for (let i = 0; i < this.tableData.length; i++) {
+      //   this.tableData[i].index = i + 1;
+      //   this.tableData[i].name = this.tableData[i].dose + this.tableData[i].dose_unit + "*" + this.tableData[i].min_number + this.tableData[i].min_unit +
+      //     "/" +
+      //     this.tableData[i].max_unit;
+      //
+      //   this.tableData[i].total_price = (
+      //     this.tableData[i].warehousing_count * this.exportList[i].price
+      //   ).toFixed(2);
+      //   for (let j = 0; j < this.manufacturerList.length; j++) {
+      //     if (this.exportList[i].manufacturer == this.manufacturerList[j].id) {
+      //       this.exportList[i].manufacturer =
+      //         this.manufacturerList[j].manufacturer_name;
+      //     }
+      //     if (this.exportList[i].manufacturer == 0) {
+      //       this.exportList[i].manufacturer = "";
+      //     }
+      //   }
+      //
+      //   for (let z = 0; z < this.dealerList.length; z++) {
+      //     if (this.exportList[i].dealer == this.dealerList[z].id) {
+      //       this.exportList[i].dealer = this.dealerList[z].dealer_name;
+      //     }
+      //     if (this.exportList[i].dealer == 0) {
+      //       this.exportList[i].dealer = "";
+      //     }
+      //   }
+      // }
+
+      if (this.state == 1) {
+        import("@/vendor/Export2Excel").then((excel) => {
+          for (let i = 0; i < this.multipleSelection.length; i++) {
+            this.multipleSelection[i].index = i + 1;
+            this.multipleSelection[i].time = this.start_time;
+            this.multipleSelection[i].yname = this.currentRow.name;
+          }
+
+          const tHeader = [
+            "序号",
+            "时间",
+            "患者名称",
+            "药品名称",
+            "单次用量",
+            "用法",
+            "频率",
+            "天数",
+            "总量",
+            "数据来源",
+          ];
+          const filterVal = [
+            "index",
+            "time",
+            "name",
+            "yname",
+            "single_dosage",
+            "usage",
+            "frequency",
+            "days",
+            "total",
+            "data_sources",
+          ];
+
+          const data = this.formatJson(filterVal, this.multipleSelection);
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: "发药单详情",
+          });
+          this.downloadLoading = false;
+        });
+      } else if (this.state == 2) {
+        import("@/vendor/Export2Excel").then((excel) => {
+          for (let i = 0; i < this.tableData.length; i++) {
+            this.tableData[i].index = i + 1;
+            this.tableData[i].time = this.start_time;
+            this.tableData[i].yname = this.currentRow.name;
+          }
+
+          const tHeader = [
+            "序号",
+            "日期",
+            "患者名称",
+            "药品名称",
+            "单次用量",
+            "用法",
+            "频率",
+            "天数",
+            "总量",
+            "数据来源",
+            "领药人",
+          ];
+          const filterVal = [
+            "index",
+            "time",
+            "name",
+            "yname",
+            "single_dosage",
+            "usage",
+            "frequency",
+            "days",
+            "total",
+            "data_sources",
+            "people",
+          ];
+
+          const data = this.formatJson(filterVal, this.tableData);
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: "发药单详情",
+          });
+          this.downloadLoading = false;
+        });
+      } else {
+        this.$message.error("药品状态异常");
+        return;
+      }
+      // import("@/vendor/Export2Excel").then((excel) => {
+      //   // for (let i = 0; i < this.tableData.length; i++) {
+      //   //   for (let j = 0; j < this.drugTypeList.length; j++) {
+      //   //     if (this.exportList[i].drug_type == this.drugTypeList[j].id) {
+      //   //       this.exportList[i].drug_type = this.drugTypeList[j].name;
+      //   //     }
+      //   //   }
+      //   // }
+      //
+      //   const tHeader = [
+      //     "序号",
+      //     "患者名称",
+      //     "单次用量",
+      //     "用法",
+      //     "频率",
+      //     "天数",
+      //     "总量",
+      //     "数据来源",
+      //   ];
+      //   const filterVal = [
+      //     "index",
+      //     "drug_name",
+      //     "drug_type",
+      //     "unit",
+      //     "batch_number",
+      //     "warehousing_count",
+      //     "price",
+      //     "total_price",
+      //   ];
+      //
+      //   const data = this.tableData;
+      //   excel.export_json_to_excel({
+      //     header: tHeader,
+      //     data,
+      //     filename: "药品入库单详情",
+      //   });
+      //   this.downloadLoading = false;
+      // });
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
+    },
+    //列表选择与合计
     handleSelectionChange(val) {
       this.multipleSelection = val;
+
+      let coculate = val;
+      let sums = "";
+      let dose_unit = [];
+      let unit_1 = [];
+      let unit_2 = [];
+
+      coculate.forEach((el, index) => {
+        dose_unit.push(el.total.substr(el.total.length - 1, 1));
+      });
+      dose_unit = this.unique_unit(dose_unit);
+
+      // 数据合计
+      coculate.forEach((el, index) => {
+        if (el.total.substr(el.total.length - 1, 1) === dose_unit[0]) {
+          unit_1.push(el.total.substr(0, el.total.length - 1));
+        }
+      });
+
+      coculate.forEach((el, index) => {
+        if (el.total.substr(el.total.length - 1, 1) === dose_unit[1]) {
+          console.log(el, "oooel");
+          unit_2.push(el.total.substr(0, el.total.length - 1));
+        }
+      });
+
+      unit_1 = eval(unit_1.join("+"));
+      unit_2 = eval(unit_2.join("+"));
+
+      if (dose_unit[0] == undefined) {
+        sums = "";
+      } else if (dose_unit[1] == undefined) {
+        sums = `${unit_1}${dose_unit[0]}`;
+      } else {
+        sums = `${unit_1}${dose_unit[0]}+${unit_2}${dose_unit[1]}`;
+      }
+      // sums = `${unit_1}${dose_unit[0]}+${unit_2}${dose_unit[1]}`;
+      this.select_total = sums;
     },
     //默认选中
     selectedbydefault() {
@@ -564,10 +943,38 @@ export default {
       });
     },
     //获取药品列表
+    getdruglist02() {
+      // var tps = this.currentRow.id;
+      this.tableData = [];
+      var params = {
+        keyword: this.keywords,
+        time: this.start_time,
+        deliveryway: this.deliveryway,
+      };
+      waitingmedicine(params).then((res) => {
+        if (res.data.state == 1) {
+          this.waiting_drug = res.data.data.list;
+        }
+      });
+      dispensemedicine(params).then((res) => {
+        if (res.data.state == 1) {
+          this.issued_drug = res.data.data.list;
+        }
+      });
+      if (this.state == 2) {
+        this.handleCurrentChange(this.currentRow);
+        // this.fun5(tps);
+      } else {
+        this.handleCurrentChange(this.currentRow);
+        // this.fun4(tps);
+      }
+    },
+    //获取药品列表
     getdruglist() {
       var params = {
         keyword: this.keywords,
         time: this.start_time,
+        deliveryway: this.deliveryway,
       };
       waitingmedicine(params).then((res) => {
         if (res.data.state == 1) {
@@ -584,6 +991,7 @@ export default {
       var params = {
         keyword: this.keywords,
         time: this.start_time,
+        deliveryway: this.deliveryway,
       };
       await waitingmedicine(params).then((res) => {
         if (res.data.state == 1) {
@@ -633,6 +1041,8 @@ export default {
     },
     handleCurrentChange(val) {
       this.currentRow = val;
+      console.log("currentRow", this.currentRow);
+      this.total = "";
       if (this.state == 1) {
         this.getdrugsdetails(0);
       }
@@ -641,14 +1051,23 @@ export default {
       }
     },
     getdrugsdetails(val) {
+      if (this.state == 1) {
+        val = 0;
+      } else {
+        val = 1;
+      }
       var params = {
         drug_id: this.currentRow.id,
         is_medicine: val,
         time: this.start_time,
+        shift: this.shift,
+        partition: this.partition,
+        deliveryway: this.deliveryway,
       };
       getpatientswithdrugs(params).then((res) => {
         if (res.data.state == 1) {
           this.tableData = res.data.data.list; //列表数据
+          this.total = res.data.data.total; //合计
         } else {
           this.$message.error(res.data.msg);
         }
@@ -676,6 +1095,20 @@ export default {
         }
       });
     },
+    getrouteofadministration() {
+      var params = {};
+      routeofadministration(params).then((res) => {
+        if (res.data.state == 1) {
+          this.routeofadministration = res.data.data.list;
+        }
+      });
+    },
+    getgetpartitionlist() {
+      var params = {};
+      getpartitionlist(params).then((res) => {
+        this.fen = res.data.data.list;
+      });
+    },
     getUserlist(drug_id) {
       var params = {
         start_time: this.start_time,
@@ -706,6 +1139,17 @@ export default {
     this.getlist();
     // this.getdruglist();
     this.fun3();
+    this.getrouteofadministration();
+    this.getgetpartitionlist();
+  },
+  updated() {
+    this.$nextTick(() => {
+      if (this.$refs["table_01"]) {
+        this.$refs["table_01"].doLayout();
+      } else if (this.$refs["table_02"]) {
+        this.$refs["table_02"].doLayout();
+      }
+    });
   },
 };
 </script>
@@ -740,10 +1184,17 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
-  overflow-y: auto;
+  overflow-y: hidden;
   .titlelist {
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
+    white-space: nowrap;
+    color: #909399;
+    font-size: 14px;
+
+    /deep/ .el-input__inner {
+      font-size: 13px !important;
+    }
   }
   .el-button {
     height: 34px;
@@ -759,7 +1210,17 @@ export default {
 }
 
 /deep/ .el-table--scrollable-x .el-table__body-wrapper {
-  overflow: auto;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+/deep/ .right_table {
+  .el-table__body-wrapper {
+    overflow-y: auto;
+    overflow-x: scroll !important;
+  }
+  // /deep/ .el-table__footer-wrapper {
+  //   margin-top: -2px !important;
+  // }
 }
 /deep/ .gutter {
   width: 15px !important;

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -53,7 +53,7 @@
           </div>
 
           <el-table
-            :height="tableHeight"
+            height="60vh"
             ref="table01"
             :data="waitmount_data"
             highlight-current-row
@@ -61,7 +61,7 @@
             border
             style="width: 100%"
             v-if="state == 1"
-             :row-style="{ color: '#303133' }"
+            :row-style="{ color: '#303133' }"
             :header-cell-style="{
               backgroundColor: 'rgb(245, 247, 250)',
               color: '#606266',
@@ -87,7 +87,7 @@
             highlight-current-row
             @current-change="handleCurrentChange"
             border
-             :row-style="{ color: '#303133' }"
+            :row-style="{ color: '#303133' }"
             :header-cell-style="{
               backgroundColor: 'rgb(245, 247, 250)',
               color: '#606266',
@@ -112,17 +112,54 @@
       </div>
       <div class="mainRight">
         <div class="titlelist">
-          <el-button type="primary" @click="dispense" v-if="state == 1"
-            >发药</el-button
-          >
-          <el-button type="primary" @click="endispense" v-if="state == 2"
-            >退药</el-button
-          >
-          <el-button type="primary" @click="toPrint">打印</el-button>
-          <!--          <el-button @click="tiaoshi">调试</el-button>-->
-          <el-button type="primary" v-if="state == 1" @click="toSetting"
-            >设置</el-button
-          >
+          <div>
+            班次：
+            <el-select
+              v-model="shift"
+              placeholder="请选择"
+              @change="searchAction"
+            >
+              <el-option
+                v-for="item in banshift"
+                :key="item.value"
+                :label="item.text"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+            分区：
+            <el-select
+              v-model="partition"
+              placeholder="请选择"
+              @change="searchAction"
+            >
+              <el-option
+                v-for="item in fen"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </div>
+
+          <div>
+            <el-button type="primary" @click="toExport" v-if="state == 2"
+              >导出</el-button
+            >
+
+            <el-button type="primary" @click="dispense" v-if="state == 1"
+              >发药</el-button
+            >
+            <el-button type="primary" @click="endispense" v-if="state == 2"
+              >退药</el-button
+            >
+            <el-button type="primary" @click="toPrint">打印</el-button>
+            <!--                    <el-button @click="tiaoshi">调试</el-button>-->
+            <el-button type="primary" v-if="state == 1" @click="toSetting"
+              >设置</el-button
+            >
+          </div>
         </div>
         <el-divider style="margin-top: 10px"></el-divider>
         <div>
@@ -243,6 +280,7 @@ import {
   getpharmacycontent,
   dispensingmedicine,
   drugwithdrawal,
+  getpartitionlist,
 } from "@/api/pharmacy";
 const moment = require("moment");
 export default {
@@ -272,6 +310,15 @@ export default {
       currentRow: null,
       dialogVisible: false,
       is_open: "2",
+      banshift: [
+        { value: 0, text: "全部班" },
+        { value: 1, text: "上午" },
+        { value: 2, text: "下午" },
+        { value: 3, text: "晚上" },
+      ],
+      shift: 0, //班次
+      fen: [],
+      partition: 0, //分区
     };
   },
   watch: {},
@@ -279,12 +326,26 @@ export default {
     this.init();
     this.gettodaynumber();
     this.fun3();
+    this.getgetpartitionlist();
     // this.getwaitmount();//fun3
     // this.selectedbydefault();
   },
   methods: {
+    getgetpartitionlist() {
+      var params = {};
+      getpartitionlist(params).then((res) => {
+        if (res.data.state == 1) {
+          this.fen = res.data.data.list;
+        }
+      });
+    },
     tiaoshi() {
-      console.log("this.tableData", this.tableData);
+      console.log("this.shift", this.shift);
+      console.log("this.partition", this.partition);
+      console.log("this.waitmount_data", this.waitmount_data);
+      console.log("this.alreadmount_data", this.alreadmount_data);
+      console.log("this.waitmount", this.waitmount);
+      console.log("this.alreadmount", this.alreadmount);
     },
     async fun3() {
       console.log("fun3");
@@ -344,6 +405,8 @@ export default {
       this.state = 1;
       this.tableData = null;
       this.currentRow = null;
+      this.partition = 0;
+      this.shift = 0;
     },
     testsss() {
       this.state = 1;
@@ -397,15 +460,31 @@ export default {
       var params = {
         keyword: this.keywords,
         time: this.start_time,
+        shift: this.shift,
+        partition: this.partition,
       };
       waitingdrug(params).then((res) => {
         if (res.data.state == 1) {
           this.waitmount_data = res.data.data.list;
+          if (this.shift != 0 || this.partition != 0) {
+            if (this.waitmount_data == null) {
+              this.waitmount = 0;
+            } else {
+              this.waitmount = this.waitmount_data.length;
+            }
+          }
         }
       });
       issueddrugs(params).then((res) => {
         if (res.data.state == 1) {
           this.alreadmount_data = res.data.data.list;
+          if (this.shift != 0 || this.partition != 0) {
+            if (this.alreadmount_data == null) {
+              this.alreadmount = 0;
+            } else {
+              this.alreadmount = this.alreadmount_data.length;
+            }
+          }
         }
       });
     },
@@ -415,6 +494,8 @@ export default {
       var params = {
         keyword: this.keywords,
         time: this.start_time,
+        shift: this.shift,
+        partition: this.partition,
       };
       await waitingdrug(params).then((res) => {
         if (res.data.state == 1) {
@@ -460,11 +541,64 @@ export default {
         this.start_time
       );
     },
+    toExport() {
+      import("@/vendor/Export2Excel").then((excel) => {
+        for (let i = 0; i < this.tableData.length; i++) {
+          this.tableData[i].index = i + 1;
+          this.tableData[i].time = this.start_time;
+          this.tableData[i].uname = this.currentRow.Name;
+        }
+
+        const tHeader = [
+          "序号",
+          "日期",
+          "患者名称",
+          "名称",
+          "单次用量",
+          "用法",
+          "频率",
+          "天数",
+          "总量",
+          "开立医生",
+          "数据来源",
+          "备注",
+        ];
+        const filterVal = [
+          "index",
+          "time",
+          "uname",
+          "Name",
+          "SingleDosage",
+          "Usage",
+          "Frequency",
+          "Days",
+          "Total",
+          "Doctor",
+          "DataSources",
+          "Remarks",
+        ];
+
+        const data = this.formatJson(filterVal, this.tableData);
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: "领药单",
+        });
+        this.downloadLoading = false;
+      });
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
+    },
 
     // 搜索患者
     searchAction() {
       this.tableData = null;
       this.getwaitmount();
+      if (this.shift != 0 || this.partition != 0) {
+      } else {
+        this.gettodaynumber();
+      }
     },
 
     // 药品发药
@@ -591,7 +725,13 @@ export default {
   overflow-y: auto;
   .titlelist {
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
+    white-space: nowrap;
+    color: #909399;
+    font-size: 14px;
+    /deep/ .el-input__inner {
+      font-size: 13px !important;
+    }
   }
   .el-table {
     margin-top: -13px;
@@ -604,6 +744,10 @@ export default {
     height: 2px;
     margin-top: 10px;
   }
+
+  /deep/ .el-table__body-wrapper {
+    overflow-x: scroll !important;
+  }
 }
 
 /deep/ .el-input__inner {
@@ -612,6 +756,7 @@ export default {
 
 /deep/ .el-table--scrollable-x .el-table__body-wrapper {
   overflow: auto;
+  overflow-x: hidden;
 }
 /deep/ .gutter {
   width: 15px !important;

src/xt_pages/data/components/dialysisAfter.vue

@@ -89,7 +89,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 2).then(response => {
+          updateFieldIsShow(row.id, 2,0).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,
@@ -113,7 +113,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 1).then(response => {
+          updateFieldIsShow(row.id, 1,1).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,

src/xt_pages/data/components/dialysisBefore.vue

@@ -77,7 +77,7 @@
           cancelButtonText: '取 消',
           type: 'warning'
         }).then(() => {
-          updateFieldIsShow(row.id, 2).then(response => {
+          updateFieldIsShow(row.id, 2,0).then(response => {
             if (response.data.state == 1) {
               const params = {
                 id: response.data.data.id,
@@ -103,7 +103,7 @@
           cancelButtonText: '取 消',
           type: 'warning'
         }).then(() => {
-          updateFieldIsShow(row.id, 1).then(response => {
+          updateFieldIsShow(row.id, 1,1).then(response => {
             if (response.data.state == 1) {
               const params = {
                 id: response.data.data.id,

src/xt_pages/data/components/dialysisComputer.vue

@@ -30,6 +30,8 @@
         </template>
       </el-table-column>
 
+   
+
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">
           <el-tooltip
@@ -89,7 +91,7 @@
           type: "warning"
         })
           .then(() => {
-            updateFieldIsShow(row.id, 2).then(response => {
+            updateFieldIsShow(row.id, 2,0).then(response => {
               if (response.data.state == 1) {
                 let params = {
                   id: response.data.data.id,
@@ -113,7 +115,7 @@
           type: "warning"
         })
           .then(() => {
-            updateFieldIsShow(row.id, 1).then(response => {
+            updateFieldIsShow(row.id, 1,1).then(response => {
               if (response.data.state == 1) {
                 let params = {
                   id: response.data.data.id,

src/xt_pages/data/components/dialysisMonitor.vue

@@ -89,7 +89,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 2).then(response => {
+          updateFieldIsShow(row.id, 2,0).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,
@@ -113,7 +113,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 1).then(response => {
+          updateFieldIsShow(row.id, 1,1).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,

src/xt_pages/data/components/dialysisOff.vue

@@ -30,9 +30,49 @@
         </template>
       </el-table-column>
 
+      <el-table-column align="center" label="是否必填">
+        <template slot-scope="scope">
+          <span v-if="scope.row.is_write!=undefined &&scope.row.is_write == 1">是</span>
+          <span v-if="scope.row.is_write!=undefined &&scope.row.is_write == 0">否</span>
+        </template>
+      </el-table-column>
+
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">
-          <el-tooltip
+            <el-button
+              v-if="scope.row.is_show == 1"
+              size="small"
+              type="danger"
+              icon="el-icon-remove-outline"
+              @click="handleHide(scope.$index, scope.row)"
+            >
+            </el-button>
+            <el-button
+              v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
+              size="small"
+              type="danger"
+              icon="el-icon-remove-outline"
+              @click="handleHideOne(scope.$index, scope.row)"
+            >
+            </el-button>
+
+             <el-button
+              v-if="scope.row.is_show == 2"
+              size="small"
+              type="primary"
+              icon="el-icon-view"
+              @click="handleShow(scope.$index, scope.row)"
+            >
+            </el-button>
+            <el-button
+              v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
+              size="small"
+              type="primary"
+              icon="el-icon-view"
+              @click="handleShowOne(scope.$index, scope.row)"
+            >
+            </el-button>
+          <!-- <el-tooltip
             class="item"
             effect="dark"
             content="不展示"
@@ -48,6 +88,22 @@
             </el-button>
           </el-tooltip>
 
+           <el-tooltip
+            class="item"
+            effect="dark"
+            content="不必填"
+            placement="top"
+            v-if="scope.row.is_write == 1"
+          >
+            <el-button
+              size="small"
+              type="danger"
+              icon="el-icon-remove-outline"
+              @click="handleHideOne(scope.$index, scope.row)"
+            >
+            </el-button>
+          </el-tooltip>
+
           <el-tooltip
             class="item"
             effect="dark"
@@ -62,7 +118,25 @@
               @click="handleShow(scope.$index, scope.row)"
             >
             </el-button>
+           
           </el-tooltip>
+
+           <el-tooltip
+            class="item"
+            effect="dark"
+            content="必填"
+            placement="top"
+            v-if="scope.row.is_write == 2"
+          >
+            <el-button
+              size="small"
+              type="primary"
+              icon="el-icon-view"
+              @click="handleShowOne(scope.$index, scope.row)"
+            >
+            </el-button>
+           
+          </el-tooltip> -->
         </template>
       </el-table-column>
     </el-table>
@@ -81,6 +155,12 @@ export default {
       type: Array
     }
   },
+  data(){
+    return {
+    is_show:2,
+    is_write:0,
+   }
+  },
   methods: {
     handleHide: function(index, row) {
       this.$confirm("是否将该字段设为不可见?", "提示", {
@@ -89,11 +169,40 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 2).then(response => {
+          updateFieldIsShow(row.id, 2,row.is_write).then(response => {
             if (response.data.state == 1) {
+              this.is_show = response.data.data.is_show
               let params = {
                 id: response.data.data.id,
-                is_show: response.data.data.is_show
+                is_show: response.data.data.is_show,
+                is_write:response.data.data.is_write,
+              };
+              store.dispatch("updateFiledConfigList", params).then(() => {});
+              this.$emit("change", params);
+            }
+          });
+          this.$message({
+            type: "success",
+            message: "设置成功!"
+          });
+        })
+        .catch(() => {});
+    },
+    handleHideOne: function(index, row) {
+      this.$confirm("是否将该字段设为不必填?", "提示", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning"
+      })
+        .then(() => {
+          updateFieldIsShow(row.id,row.is_show,0).then(response => {
+          
+            if (response.data.state == 1) {
+              this.is_write = response.data.data.is_write
+              let params = {
+                id: response.data.data.id,
+                is_show: response.data.data.is_show,
+                is_write:response.data.data.is_write,
               };
               store.dispatch("updateFiledConfigList", params).then(() => {});
               this.$emit("change", params);
@@ -112,11 +221,39 @@ export default {
         cancelButtonText: "取 消",
         type: "warning"
       }).then(() => {
-          updateFieldIsShow(row.id, 1).then(response => {
+          updateFieldIsShow(row.id, 1,row.is_write).then(response => {
+            if (response.data.state == 1) {
+              this.is_show = response.data.data.is_show
+              let params = {
+                id: response.data.data.id,
+                is_show: response.data.data.is_show,
+                is_write:response.data.data.is_write,
+              };
+              store.dispatch("updateFiledConfigList", params).then(() => {});
+              this.$emit("change", params);
+            }
+          });
+          this.$message({
+            type: "success",
+            message: "设置成功!"
+          });
+        })
+        .catch(() => {});
+    },
+    handleShowOne: function(index, row) {
+      this.$confirm("是否将该字段设为必填?", "提示", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning"
+      }).then(() => {
+         
+          updateFieldIsShow(row.id,row.is_show,1).then(response => {
             if (response.data.state == 1) {
+              this.is_write = response.data.data.is_write
               let params = {
                 id: response.data.data.id,
-                is_show: response.data.data.is_show
+                is_show: response.data.data.is_show,
+                is_write:response.data.data.is_write,
               };
               store.dispatch("updateFiledConfigList", params).then(() => {});
               this.$emit("change", params);
@@ -130,7 +267,9 @@ export default {
         .catch(() => {});
     }
   },
- 
+  created(){
+    console.log("dialysis_off_data",this.dialysis_off_data)
+  }
 };
 </script>
 

src/xt_pages/data/components/dialysisPrescription.vue

@@ -89,7 +89,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 2).then(response => {
+          updateFieldIsShow(row.id, 2,0).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,
@@ -113,7 +113,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 1).then(response => {
+          updateFieldIsShow(row.id, 1,1).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,

src/xt_pages/data/components/dialysisSummary.vue

@@ -89,7 +89,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 2).then(response => {
+          updateFieldIsShow(row.id, 2,0).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,
@@ -113,7 +113,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 1).then(response => {
+          updateFieldIsShow(row.id, 1,1).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,

src/xt_pages/data/components/doubleCheck.vue

@@ -89,7 +89,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 2).then(response => {
+          updateFieldIsShow(row.id, 2,0).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,
@@ -112,7 +112,7 @@ export default {
         cancelButtonText: "取 消",
         type: "warning"
       }).then(() => {
-          updateFieldIsShow(row.id, 1).then(response => {
+          updateFieldIsShow(row.id, 1,1).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,

src/xt_pages/data/components/receiveTreatmentAsses.vue

@@ -88,7 +88,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 2).then(response => {
+          updateFieldIsShow(row.id, 2,0).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,
@@ -112,7 +112,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 1).then(response => {
+          updateFieldIsShow(row.id, 1,1).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,

src/xt_pages/data/druguse.vue

@@ -93,7 +93,7 @@
                   <el-form-item label="医嘱名称 :" required prop="advice_name">
                     <el-input v-model="templateForm.advice_name" style="width:50%"></el-input>
                   </el-form-item>
-               </el-col> 
+               </el-col>
               <!-- <el-form-item label="医嘱内容 :" prop="advice_desc">
                 <el-input v-model="templateForm.advice_desc" style="width:50%"></el-input>
               </el-form-item> -->
@@ -167,7 +167,7 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row>  
+              <el-row>
                 <el-col :span="12">
                   <el-form-item label="执行频率 :" prop="execution_frequency">
                     <el-select
@@ -395,6 +395,7 @@
             <el-form ref="efForm" :rules="efRules" :model="efForm" label-width="90px">
               <el-form-item label="执行频率 :" required prop="name">
                 <el-input v-model="efForm.name" placeholder="执行频率"></el-input>
+                <el-input v-model="efForm.code" placeholder="编码"></el-input>
               </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -486,7 +487,8 @@ export default {
       },
       efForm: {
         name: "",
-        id: 0
+        id: 0,
+        code:"",
       },
       unitsOption: [
         { lable: 1, name: "盒" },

src/xt_pages/data/druguseTemplate.vue

@@ -1251,7 +1251,15 @@
               <el-form ref="efForm" :rules="efRules" :model="efForm" label-width="90px">
                 <el-form-item label="执行频率 :" required prop="name">
                   <el-input v-model="efForm.name" placeholder="执行频率"></el-input>
+
                 </el-form-item>
+
+
+                <el-form-item label="执行频率 :" >
+                  <el-input v-model="efForm.code" placeholder="编码"></el-input>
+                </el-form-item>
+
+
               </el-form>
               <div slot="footer" class="dialog-footer">
                 <el-button @click="efFormVisible = false">取消</el-button>
@@ -1438,7 +1446,8 @@
         },
         efForm: {
           name: '',
-          id: 0
+          id: 0,
+          code: "",
         },
 
         drugforms: [
@@ -1976,6 +1985,7 @@
         this.dialogTitle = '新增给药途径'
         this.isEdit = false
       },
+
       handleUpdateDrugWay(row, index) {
         this.currentIndex = index
         this.drugwayForm = {
@@ -2061,7 +2071,8 @@
         this.currentIndex = index
         this.efForm = {
           name: row.name,
-          id: row.id
+          id: row.id,
+          code: row.code
         }
 
         this.efFormVisible = true

src/xt_pages/data/showConfig.vue

@@ -175,10 +175,14 @@ export default {
       }
     },
     changeDialysisOffData:function(object){
-
+    
      for (let i = 0; i < this.dialysis_off_data.length; i++) {
         if (this.dialysis_off_data[i].id == object.id) {
           this.dialysis_off_data[i].is_show = object.is_show;
+          if(obj.is_write!=undefined){
+           this.dialysis_off_data[i].is_write = object.is_write
+          }
+          
         }
       }
     }
@@ -186,9 +190,12 @@ export default {
   },
   created() {
     var filedList = store.getters.xt_user.fileds;
-    
-  
+    console.log("地址32323232232332322我噢",filedList)
+     
     for (let i = 0; i < filedList.length; i++) {
+      if(filedList[i].module == 9){
+        console.log("filedList222222",filedList)
+      }
       switch (filedList[i].module) {
         case 1:
           this.dialysis_prescription_data.push(filedList[i]);

src/xt_pages/device/components/partition_dialog.vue

@@ -10,7 +10,7 @@
                         <el-table-column prop="name" label="分区名称" align="center"></el-table-column>
                         <el-table-column prop="type" label="分区类型" align="center"></el-table-column>
                         <!-- <el-table-column prop="amount" label="机号数量" align="center"></el-table-column> -->
-                        <el-table-column label="操作" align="center"> 
+                        <el-table-column label="操作" align="center">
                             <template slot-scope="scope">
                                 <el-button type="primary" icon="el-icon-edit" size="small" @click="modifyZoneAt(scope.row)"></el-button>
 
@@ -22,7 +22,7 @@
                                         <el-button size="mini" @click="scope.row.willDelete = false">取消</el-button>
                                     </div>
                                 </el-popover> -->
-                            </template>  
+                            </template>
                         </el-table-column>
                     </el-table>
                 </el-tab-pane>
@@ -34,7 +34,7 @@
                         <el-table-column prop="zone_name" label="所属分区" align="center"></el-table-column>
                         <el-table-column prop="group_name" label="所属分组" align="center"></el-table-column>
                         <!-- <el-table-column prop="amount" label="机号数量" align="center"></el-table-column> -->
-                        <el-table-column label="操作" align="center"> 
+                        <el-table-column label="操作" align="center">
                             <template slot-scope="scope">
                                 <el-button type="primary" icon="el-icon-edit" size="small" @click="modifyDeviceNumberAt(scope.row)"></el-button>
 
@@ -46,7 +46,7 @@
                                     </div>
                                     <el-button type="danger" slot="reference"  icon="el-icon-delete" size="mini">删除</el-button>
                                 </el-popover> -->
-                            </template>  
+                            </template>
                         </el-table-column>
                     </el-table>
                 </el-tab-pane>
@@ -68,14 +68,14 @@
                                     </div>
                                     <el-button type="danger" slot="reference" icon="el-icon-delete" size="mini">删除</el-button>
                                 </el-popover> -->
-                            </template>  
+                            </template>
                         </el-table-column>
                     </el-table>
                 </el-tab-pane>
             </el-tabs>
-            
+
             <!-- <span slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="visible = false">保 存</el-button>            
+                <el-button type="primary" @click="visible = false">保 存</el-button>
                 <el-button @click="visible = false">取 消</el-button>
             </span> -->
         </el-dialog>
@@ -273,7 +273,7 @@ export default {
                                 this.$message.error(resp.msg)
                             }
                         })
-                        
+
                     } else {
                         modifyZone(this.zone_form.id, this.zone_form.name, this.zone_form.type).then(rs => {
                             var resp = rs.data
@@ -293,7 +293,7 @@ export default {
                             }
                         })
                     }
-                    
+
                 } else {
                     return false
                 }
@@ -314,7 +314,7 @@ export default {
                                 this.$message.error(resp.msg)
                             }
                         })
-                        
+
                     } else {
                         modifyGroup(this.group_form.id, this.group_form.name).then(rs => {
                             var resp = rs.data
@@ -333,7 +333,7 @@ export default {
                             }
                         })
                     }
-                    
+
                 } else {
                     return false
                 }
@@ -354,7 +354,7 @@ export default {
                                 this.$message.error(resp.msg)
                             }
                         })
-                        
+
                     } else {
                         modifyDeviceNumber(this.number_form.id, this.number_form.number, this.number_form.zone, this.number_form.group).then(rs => {
                             var resp = rs.data
@@ -375,7 +375,7 @@ export default {
                             }
                         })
                     }
-                    
+
                 } else {
                     return false
                 }

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -462,7 +462,10 @@
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block" style="flex: 1">
-                        透析方式：
+                        <span v-if="org_id == 10138 || org_id == 9675"
+                          >治疗模式：</span
+                        >
+                        <span v-else>透析方式：</span>
                         <div
                           class="under_line"
                           style="
@@ -1177,7 +1180,7 @@
                         <!-- <thead> -->
                         <tr>
                           <td
-                            colspan="11"
+                            colspan="14"
                             style="
                               letter-spacing: 5px;
                               text-align: center;
@@ -1202,8 +1205,21 @@
                             透析液温度(°C)
                           </td>
                           <td width="60" v-if="org_id == 9836">体温(°C)</td>
-                        <td width="50" v-if="org_id != 10121 && org_id != 9675&& org_id != 0">电导度<br />(ms/cm)</td>
-                        <td width="50" v-if="org_id == 10121|| org_id == 9675|| org_id == 0">SpO₂<br />(%)</td>
+                          <td
+                            width="50"
+                            v-if=" org_id != 9538 && org_id != 10121 && org_id != 9675 && org_id != 0
+                            "
+                          >
+                            电导度<br />(ms/cm)
+                          </td>
+                          <td
+                            width="50"
+                            v-if="
+                              org_id == 10121 || org_id == 9675 || org_id == 0
+                            "
+                          >
+                            SpO₂<br />(%)
+                          </td>
                           <td width="50">超滤量<br />(ml)</td>
                           <td
                             v-if="
@@ -1215,105 +1231,84 @@
                           >
                             置换量<br />(ml)
                           </td>
+
+                          <td
+                            width="50"
+                            v-if="org_id == 9919 || org_id == 9538 || org_id == 9675 || org_id == 9671 "
+                          >
+                            KT/V
+                          </td>
+                          <td
+                            width="50"
+                            v-if="org_id == 9538 || org_id == 9675 || org_id == 9671"
+                          >
+                            血容量<br />(L)
+                          </td>
+
                           <td width="200">病情变化及处理</td>
                         </tr>
+
                         <tr
                           v-for="(monitor_record, j) in record.monitor_records"
                           :key="j"
                         >
                           <td>
-                            {{
-                              getTime(monitor_record.operate_time, "{h}:{i}")
-                            }}
+                            {{getTime(monitor_record.operate_time, "{h}:{i}")}}
                           </td>
                           <td>
-                            {{
-                              monitor_record.systolic_blood_pressure
-                                ? monitor_record.systolic_blood_pressure + "/"
-                                : ""
-                            }}{{
-                              monitor_record.diastolic_blood_pressure
-                                ? monitor_record.diastolic_blood_pressure
-                                : ""
-                            }}
+                            {{ monitor_record.systolic_blood_pressure? monitor_record.systolic_blood_pressure + "/": ""}}
+                            {{ monitor_record.diastolic_blood_pressure? monitor_record.diastolic_blood_pressure: ""}}
                           </td>
                           <td>
-                            {{
-                              monitor_record.pulse_frequency
-                                ? monitor_record.pulse_frequency
-                                : ""
-                            }}
+                            {{monitor_record.pulse_frequency? monitor_record.pulse_frequency: ""}}
                           </td>
                           <td>
-                            {{
-                              monitor_record.breathing_rate
-                                ? monitor_record.breathing_rate
-                                : ""
-                            }}
+                            {{ monitor_record.breathing_rate ? monitor_record.breathing_rate: ""}}
                           </td>
                           <td>
-                            {{
-                              monitor_record.blood_flow_volume
-                                ? monitor_record.blood_flow_volume
-                                : ""
-                            }}
+                            {{monitor_record.blood_flow_volume? monitor_record.blood_flow_volume: ""}}
                           </td>
                           <td>
-                            {{
-                              monitor_record.venous_pressure
-                                ? monitor_record.venous_pressure
-                                : ""
-                            }}
+                            {{monitor_record.venous_pressure? monitor_record.venous_pressure: ""}}
                           </td>
                           <td>
-                            {{
-                              monitor_record.transmembrane_pressure
-                                ? monitor_record.transmembrane_pressure
-                                : ""
-                            }}
+                             {{monitor_record.transmembrane_pressure ? monitor_record.transmembrane_pressure: ""}}
                           </td>
                           <td v-if="org_id != 9836">
-                            {{
-                              monitor_record.dialysate_temperature
-                                ? monitor_record.dialysate_temperature
-                                : ""
-                            }}
+                            {{ monitor_record.dialysate_temperature? monitor_record.dialysate_temperature: ""}}
                           </td>
                           <td v-if="org_id == 9836">
-                            {{
-                              monitor_record.temperature
-                                ? monitor_record.temperature
-                                : ""
-                            }}
+                            {{monitor_record.temperature? monitor_record.temperature: ""}}
                           </td>
-                          <td v-if="org_id != 10121 && org_id != 9675&& org_id != 0">
+
+                          <!-- <td v-if="org_id != 10121 && org_id != 9675 && org_id != 0">
+                            {{monitor_record.conductivity? monitor_record.conductivity : ""}}
+                          </td> -->
+                         <td v-if=" org_id != 9538 &&org_id != 10121 && org_id != 9675 &&org_id != 0">
                             {{
-                              monitor_record.conductivity
-                                ? monitor_record.conductivity
-                                : ""
+                              monitor_record.conductivity ? monitor_record.conductivity : ""
                             }}
                           </td>
-                          <td v-if="org_id == 10121|| org_id == 9675|| org_id == 0">
-                          {{
-                            monitor_record.blood_oxygen_saturation
-                              ? monitor_record.blood_oxygen_saturation
-                              : ""
-                          }}
-                        </td>
+
+                          <td v-if="org_id == 10121 || org_id == 9675 || org_id == 0">
+                            {{monitor_record.blood_oxygen_saturation? monitor_record.blood_oxygen_saturation: ""}}
+                          </td>
+
+                        
+
+                          <td v-if="org_id == 9538">
+                            {{ monitor_record.sodium_concentration? monitor_record.sodium_concentration: ""}}
+                          </td>
+
                           <td>
-                            <span v-if="monitor_record.operate_time">{{
-                              monitor_record.ultrafiltration_volume
-                                ? monitor_record.ultrafiltration_volume
-                                : ""
-                            }}</span>
+                            <span>{{monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: ""}}</span>
                           </td>
+
                           <td
                             v-if="
                               record.prescription.mode_id == 2 ||
                               record.prescription.mode_id == 5 ||
-                              (record.prescription.mode_id == 12 &&
-                                monitor_record.operate_time >
-                                  record.dialysis_order.end_time)
+                              record.prescription.mode_id == 12
                             "
                             style="width: 50px"
                           >
@@ -1323,6 +1318,19 @@
                                 : ""
                             }}
                           </td>
+                          <td
+                            width="50"
+                            v-if="org_id == 9919 || org_id == 9538 || org_id == 9675  || org_id == 9671"
+                          >
+                            {{ monitor_record.ktv }}
+                          </td>
+                          <td
+                            width="50"
+                            v-if="org_id == 9538 || org_id == 9675 || org_id == 9671"
+                          >
+                            {{ monitor_record.accumulated_blood_volume }}
+                          </td>
+
                           <td style="line-height: 16px; padding: 0px">
                             <div
                               style="
@@ -1382,7 +1390,12 @@
                           <td></td>
                           <td></td>
                           <td></td>
-
+                          <td
+                            v-if="
+                              org_id == 9919 || org_id == 9538 || org_id == 9675
+                            "
+                          ></td>
+                          <td v-if="org_id == 9538 || org_id == 9675"></td>
                           <td style="line-height: 16px; padding: 0px">
                             <div
                               style="
@@ -2596,7 +2609,6 @@ export default {
     };
   },
   created() {
-    
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",
       "vascular_access_desc"
@@ -2616,15 +2628,15 @@ export default {
     this.modeOptions = this.$store.getters.treatment_mode;
     //   this.replacementWays = this.$store.getters.replacement_ways;
     //   this.perfusionApparatus = this.$store.getters.perfusion_apparatus;
-    this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit
+    this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
     // for(let i = 0 ; i < this.records.length ; i++){
     //   console.log(i,'jhk')
     //   this.blood_access_part_opera_name = this.bloodAccessParOperaName(
     //   i.assessment_before_dislysis.blood_access_part_opera_id
     // );
     // }
-    console.log(this.bloodAccessParOpera,'this.bloodAccessParOpera')
-    
+    console.log(this.bloodAccessParOpera, "this.bloodAccessParOpera");
+
     for (var key in bloodAccessParOpera) {
       this.bloodAccessParOpera[bloodAccessParOpera[key].id] =
         bloodAccessParOpera[key];
@@ -2651,7 +2663,6 @@ export default {
     //     this.$message.error("参数不齐");
     //     return false;
     //   }
-    
   },
   mounted() {
     this.loading = true;
@@ -2664,7 +2675,6 @@ export default {
       .then((rs) => {
         var resp = rs.data;
         if (resp.state == 1) {
-
           this.records = this.records.concat(resp.data.schedules);
 
           for (const recordIndex in this.records) {
@@ -2786,7 +2796,7 @@ export default {
           //   this.blood_access_part_opera_name = this.bloodAccessParOperaName(
           //   o.assessment_before_dislysis.blood_access_part_opera_id)
           // })
-          
+
           this.operators = resp.data.medical_staffs;
           if (this.operators.length > 0) {
             var operatorsLen = this.operators.length;
@@ -2885,7 +2895,7 @@ export default {
       return "";
     },
     bloodAccessParOperaName(id) {
-      console.log(tihs.records,'hhh')
+      console.log(tihs.records, "hhh");
       if (id in this.bloodAccessParOpera) {
         return this.bloodAccessParOpera[id].name;
       }

src/xt_pages/dialysis/components/dialysisParametersDialog.vue

@@ -41,7 +41,7 @@
                    <span v-if="scope.row.anticoagulant==8">依诺肝素</span>
                    <span v-if="scope.row.anticoagulant==9">达肝素</span>
                    <span v-if="scope.row.anticoagulant==10">体外抗凝</span>
-                   <span v-if="scope.row.anticoagulant==11">那曲肝素</span>
+                   <span v-if="scope.row.anticoagulant==11">那屈肝素</span>
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="name"label="数量">

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -324,6 +324,10 @@
           <label>管路凝血: </label>
           <span class="content" >{{ this.record.pip_coagulation}}</span>
         </li>
+       <li v-if="isShow('累计血容量')">
+          <label>累计血容量: </label>
+          <span class="content" >{{ this.record.accumulated_blood_volume}}</span>
+        </li>
       </ul>
     </div>
     <!-- <div class="note">

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -6,13 +6,20 @@
     <div class="plate ">
       <ul>
         <li v-if="isShow('透前称重')">
-          <label>透前称重 : </label>
+          <label>透前体重 : </label>
           <span class="content" v-if="weight_before != '0'">{{
             weight_before
           }}</span>
           <span class="unit" v-if="weight_before != '0'">kg</span>
         </li>
 
+        <li v-if="isShow('透前体重备注')">
+          <label>透前体重备注 : </label>
+          <span class="content">
+            {{this.record.weight_befor_remake}}
+          </span>
+        </li>
+
         <li v-if="isShow('干体重')">
           <label>干体重 : </label>
           <span class="content" v-if="dry_weight != '0'">{{ dry_weight }}</span>
@@ -310,7 +317,7 @@
           <span class="content">{{ this.record.special_treatment}}</span>
           <span class="unit"></span>
         </li>
-        
+
         <li v-if="isShow('血栓')">
           <label>血栓: </label>
           <span class="content" v-if="this.record.thromubus_type == 1">有</span>
@@ -323,7 +330,7 @@
           <span class="content">{{this.record.thrombus_av}}</span>
           <span class="unit"></span>
         </li>
-       
+
         <li v-if="isShow('血栓')">
           <label>导管A端约(cm): </label>
           <span class="content">{{this.record.thromubus_a}}</span>
@@ -349,7 +356,7 @@
           <span class="content">{{this.record.pre_dialysis_drugs}}</span>
           <span class="unit"></span>
         </li>
-       
+
         <li v-if="isShow('围手术期')">
           <label>围手术期: </label>
           <span class="content">
@@ -383,7 +390,7 @@
           <span class="content">{{this.record.suction}}</span>
           <span class="unit"></span>
         </li>
-       
+
       </ul>
     </div>
     <div class="note">
@@ -414,7 +421,7 @@ export default {
     console.log("血栓22222",this.record)
   },
   computed: {
-   
+
     weight_before: function() {
       if (this.record.id == 0) {
         return '-'

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -614,11 +614,18 @@
               <el-input v-model="form.after_urea"></el-input>
             </el-form-item>
        </el-col>
+       <el-col :span="8" v-if="isShow('累计血容量')">
+            <el-form-item label="累计血容量(L)："  label-width="150px">
+              <el-input v-model="form.accumulated_blood_volume"></el-input>
+            </el-form-item>
+        </el-col>
         <el-col :span="24" v-if="isShow('KT/V')">
             <el-form-item label="KT/V：">
               <el-input type="textarea" :rows="4" v-model="form.ktv"></el-input>
             </el-form-item>
         </el-col>
+
+      
       </el-form>
 
 
@@ -793,6 +800,7 @@ export default {
         fallrisk:"",
         machine_run:"",
         after_urea:"",
+        accumulated_blood_volume:"",
       },
       lapseList:[],
       leaveOfficeMethod:[],
@@ -945,7 +953,7 @@ export default {
       data['weight_after'] = this.form.weight_after ? parseFloat(this.form.weight_after) : 0
       data['weight_loss'] = this.form.weight_loss ? parseFloat(this.form.weight_loss) : 0
       data['temperature'] = this.form.temperature ? parseFloat(this.form.temperature) : 0
-      data['breathing_rate'] = this.form.temperature ? parseFloat(this.form.breathing_rate) : 0
+      data['breathing_rate'] = this.form.breathing_rate 
       data['systolic_blood_pressure'] = this.form.systolic_blood_pressure ? parseFloat(this.form.systolic_blood_pressure) : 0
       data['diastolic_blood_pressure'] = this.form.diastolic_blood_pressure ? parseFloat(this.form.diastolic_blood_pressure) : 0
       data['pulse_frequency'] = this.form.pulse_frequency ? parseFloat(this.form.pulse_frequency) : 0
@@ -1013,6 +1021,7 @@ export default {
       data["machine_run"] = this.form.machine_run
       data["after_urea"] = this.form.after_urea
       data["pip_coagulation"] = this.form.pip_coagulation
+      data["accumulated_blood_volume"] = this.form.accumulated_blood_volume
       console.log("Paramsquery",data)
 
       postAssessmentAfterDislysis(ParamsQuery, data)

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -29,6 +29,12 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8">
+            <el-form-item label="透前体重备注:" v-if="isShow('透前体重备注')">
+              <el-input v-model="assessmentBeforeDislysis.weight_befor_remake"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8">
             <el-form-item label="干体重(kg)："
                           v-if="isShow('干体重')">
@@ -89,7 +95,7 @@
 
           <el-col :span="8">
             <el-form-item label="呼吸频率(次/分)：" v-if="isShow('呼吸频率')">
-              <el-input type="number" v-model="assessmentBeforeDislysis.breathing_rate"></el-input>
+              <el-input  v-model="assessmentBeforeDislysis.breathing_rate"></el-input>
             </el-form-item>
           </el-col>
 
@@ -553,6 +559,8 @@
               <el-input v-model="assessmentBeforeDislysis.suction" @focus="showInnerDialog('20')"></el-input>
             </el-form-item>
           </el-col>
+
+ 
          
           <el-col :span="24">
             <el-form-item label="备注： ">
@@ -725,6 +733,7 @@
           blood_pressure_during_dialysis:"",
           urea_befor:"",
           suction:"",
+          weight_befor_remake:"",
         },
 
         InnerDialogProps: {

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -196,7 +196,7 @@
 
                     <el-col :span="8" v-if="anticoagulant.shouji != -1 && isShows('首剂')">
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.template_id!=54">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387">
                             <el-form-item
                                     v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987'
                                     :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
@@ -207,7 +207,7 @@
                             </el-form-item>
 
                             <el-form-item
-                                    v-if='dialysisPrescription.anticoagulant == 2 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987 && dialysisPrescription.anticoagulant == 2'
+                                    v-if='dialysisPrescription.anticoagulant == 2 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387 && dialysisPrescription.anticoagulant == 2'
                                     :label="'首剂(mg) : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
@@ -255,8 +255,8 @@
 
 
                     <el-col :span="8" v-if="anticoagulant.weichi != -1 && isShows('维持')">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 ">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387">
                             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
                                           v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987  && this.$store.getters.xt_user.template_info.org_id != 54">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
@@ -265,7 +265,7 @@
                                           v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
                             </el-form-item>
                             <el-form-item :label="'维持(mg/h) : '"
-                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 54  ">
+                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 54 ||  this.$store.getters.xt_user.template_info.org_id == 10346 ||  this.$store.getters.xt_user.template_info.org_id == 10387">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -308,9 +308,9 @@
 
                     <el-col :span="8" v-if="anticoagulant.zongliang != -1 && isShows('总量')">
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387">
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387'
                                     :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -318,7 +318,7 @@
                                           v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
                             </el-form-item>
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387'
                                     :label="'总量(mg) : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -2204,7 +2204,12 @@
                 return
               }
             }
+            
           }
+          if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12){
+            this.dialysisPrescription.displace_liqui_part = 0
+            this.dialysisPrescription.displace_liqui_value = 0
+          } 
 
           this.is_pre = 1
 
@@ -2691,6 +2696,10 @@
                 return
               }
             }
+            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12){
+               this.dialysisPrescription.displace_liqui_part == 0 
+              this.dialysisPrescription.displace_liqui_value == 0
+            }
           }
 
           this.is_pre = 2
@@ -3289,7 +3298,7 @@
       },
       changePrescription(id) {
         console.log("id233223232323232323",id)
-        if(id == 1){
+        if(id != 2 && id!=5 && id!= 12){
           this.dialysisPrescription.displace_liqui_value = ""
           this.dialysisPrescription.displace_liqui_part = ""
         }

src/xt_pages/dialysis/details/dialog/finish_dialog.vue

@@ -4,7 +4,7 @@
       <!-- <div class="txsj">
       </div> -->
       <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
-      <el-form :model="form" label-width="100px">
+      <el-form :model="form" label-width="100px"  :rules="drugdicRules"  ref="form">
         <el-form-item label="下机护士">
           <el-select v-model="form.nurse_id" :disabled="!(dialysis_order.id != 0)">
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
@@ -28,12 +28,12 @@
               <el-radio :label="2">无</el-radio>
            </el-radio-group>
         </el-form-item>
-        
+
         <el-form-item label="内瘘: " v-if="isShowFiled('内瘘')">
             <el-input v-model="form.internal_fistula" readonly  @focus="showInnerDialog('7')" style="width:200px"></el-input>
         </el-form-item>
 
-    
+
         <el-form-item label="导管: " v-if="isShowFiled('导管')">
           <el-input v-model="form.catheter" @focus="showInnerDialog('4')" style="width:200px"></el-input>
         </el-form-item>
@@ -45,18 +45,18 @@
             readonly
             @focus="showInnerDialog('1')"
           ></el-input>
-       </el-form-item> 
+       </el-form-item>
 
         <el-form-item>
-          <el-button v-if="(dialysis_order.id != 0 && dialysis_order.stage == 1)" @click="submit" :loading="loading"
+          <el-button v-if="(dialysis_order.id != 0 && dialysis_order.stage == 1)" @click="submit('form')" :loading="loading"
                      type="primary">执行下机
           </el-button>
           <el-button
             v-if="dialysis_order.stage == 2 "
-            type="primary" @click="modifyFinish">修改下机
+            type="primary" @click="modifyFinish('form')">修改下机
           </el-button>
         </el-form-item>
-        
+
 
 
       </el-form>
@@ -114,6 +114,10 @@
         },
         catheter: [],
         cruorOptions: [],
+        drugdicRules: {
+         internal_fistula: [{ required: true, message: "请选择内瘘" }]
+        },
+        required:false,
       }
     },
     props: {
@@ -165,12 +169,25 @@
     methods: {
        isShowFiled(name) {
         var filedList = store.getters.xt_user.fileds
-       
         for (let i = 0; i < filedList.length; i++) {
           if (filedList[i].module == 9 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
             return true
           }
+          if (filedList[i].module == 9 && filedList[i].filed_name_cn == name && filedList[i].is_write!=undefined &&  filedList[i].is_write == 1) {
+             this.required = true
+          }
         }
+        this.required = false
+        return false
+      },
+      isWrite(name){
+        var filedList = store.getters.xt_user.fileds
+        for (let i = 0; i < filedList.length; i++) {
+          if (filedList[i].module == 9 && filedList[i].filed_name_cn == name && filedList[i].is_write == 1) {
+            return true
+          }
+        }
+        
         return false
       },
       show: function(record) {
@@ -193,7 +210,7 @@
         if(this.$route.query.patient_id){
           this.patient_id = this.$route.query.patient_id
         }
-        
+
         this.schedule_date = this.$route.query.date
 
         if (this.dialysis_order.id == 0) {
@@ -250,57 +267,97 @@
       hide: function() {
         this.visible = false
       },
-      modifyFinish:function(){
-        let ParamsQuery = {};
-        ParamsQuery["id"] = this.dialysis_order.id;
-        ParamsQuery["nurse"] = this.form.nurse_id;
-        ParamsQuery["end_time"] = this.end_time;
-        ParamsQuery["mode"] = "2"
-        ParamsQuery["puncture_point_haematoma"] = paseInt(this.form.puncture_point_haematoma)
-        ParamsQuery["internal_fistula"] = this.form.internal_fistula
-        ParamsQuery["catheter"] = this.form.catheter
-        ParamsQuery["cruor"] = this.form.cruor
-        if(this.dialysis_order.finish_creator  != this.$store.getters.xt_user.user.id){
-          ParamsQuery["mode"] = "3"
-        }
-        PostModifyFinishDialysis(ParamsQuery).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-
-            return false;
-          } else {
-            this.$message.success("修改成功")
-            var record = this.dialysis_order;
-            for (const key in response.data.data.dialysis_order) {
-              this.$set(record, key, response.data.data.dialysis_order[key]);
+      modifyFinish:function(formName){
+        this.$refs[formName].validate(valid=>{
+          if(valid){
+            if(this.isWrite("穿刺处血肿") == true && this.form.puncture_point_haematoma == ""){
+              this.$message.error("请选择穿刺处血肿")
+              return
+             }
+            if(this.isWrite("内瘘") == true && this.form.internal_fistula == ""){
+              this.$message.error("请选择内瘘")
+              return
+             }
+            if(this.isWrite("导管") == true && this.form.catheter == ""){
+              this.$message.error("请选择导管")
+              return
+             }
+            if(this.isWrite("透析器凝血") == true && this.form.cruor == ""){
+              this.$message.error("请选择透析器凝血")
+              return
+             }
+            let ParamsQuery = {};
+            ParamsQuery["id"] = this.dialysis_order.id;
+            ParamsQuery["nurse"] = this.form.nurse_id;
+            ParamsQuery["end_time"] = this.end_time;
+            ParamsQuery["mode"] = "2"
+            ParamsQuery["puncture_point_haematoma"] = parseInt(this.form.puncture_point_haematoma)
+            ParamsQuery["internal_fistula"] = this.form.internal_fistula
+            ParamsQuery["catheter"] = this.form.catheter
+            ParamsQuery["cruor"] = this.form.cruor
+            if(this.dialysis_order.finish_creator  != this.$store.getters.xt_user.user.id){
+              ParamsQuery["mode"] = "3"
             }
-            console.log(response.data.data.after)
-            this.$emit('assessmentAfterDislysis', response.data.data.after)
-          }
-        });
-
+            PostModifyFinishDialysis(ParamsQuery).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
 
+                return false;
+              } else {
+                this.$message.success("修改成功")
+                var record = this.dialysis_order;
+                for (const key in response.data.data.dialysis_order) {
+                  this.$set(record, key, response.data.data.dialysis_order[key]);
+                }
+                console.log(response.data.data.after)
+                this.$emit('assessmentAfterDislysis', response.data.data.after)
+              }
+            });
+          }
+        })
       },
-      submit: function() {
-        this.loading = true
-        let mode = "1"
-        finishDialysis(this.patient_id,this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.end_time, this.form.nurse_id,mode,parseInt(this.form.puncture_point_haematoma),this.form.internal_fistula,this.form.catheter,this.form.cruor).then(rs => {
-          this.loading = false
-          var resp = rs.data
-          if (resp.state == 1) {
-            var dialysis_order = resp.data.dialysis_order
-            var this_order = this.dialysis_order
-            for (const key in dialysis_order) {
-              this.$set(this_order, key, dialysis_order[key])
-            }
-            let orgId = parseInt(sessionStorage.getItem("org_id"));
-            this.hide()
-            this.$emit('assessmentAfterDislysis', resp.data.assessmentAfterDislysis)
+      submit: function(formName) {
+        
+        this.$refs[formName].validate(valid=>{
+          if(valid){
+             if(this.isWrite("穿刺处血肿") == true && this.form.puncture_point_haematoma == ""){
+              this.$message.error("请选择穿刺处血肿")
+              return
+             }
+             if(this.isWrite("内瘘") == true && this.form.internal_fistula == ""){
+              this.$message.error("请选择内瘘")
+              return
+             }
+            if(this.isWrite("导管") == true && this.form.catheter == ""){
+              this.$message.error("请选择导管")
+              return
+             }
+            if(this.isWrite("透析器凝血") == true && this.form.cruor == ""){
+              this.$message.error("请选择透析器凝血")
+              return
+             }
+             this.loading = true
+             let mode = "1"
+            finishDialysis(this.patient_id,this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.end_time, this.form.nurse_id,mode,parseInt(this.form.puncture_point_haematoma),this.form.internal_fistula,this.form.catheter,this.form.cruor).then(rs => {
+              this.loading = false
+              var resp = rs.data
+              if (resp.state == 1) {
+                var dialysis_order = resp.data.dialysis_order
+                var this_order = this.dialysis_order
+                for (const key in dialysis_order) {
+                  this.$set(this_order, key, dialysis_order[key])
+                }
+                let orgId = parseInt(sessionStorage.getItem("org_id"));
+                this.hide()
+                this.$emit('assessmentAfterDislysis', resp.data.assessmentAfterDislysis)
 
-          } else {
-            this.$message.error(resp.msg)
+              } else {
+                this.$message.error(resp.msg)
+              }
+            })
           }
         })
+    
       }, getTime(value, temp) {
         if (value != undefined) {
           return parseTime(value, temp)
@@ -364,7 +421,7 @@
             this.InnerDialogProps.selected = this.form.cruor
             this.InnerDialogProps.isShowTextArea = false
             break
-          
+
         }
       },
       innerDialogComfirm: function(val) {
@@ -383,7 +440,7 @@
       },
       innerDialogCancle: function() {
         this.InnerDialogProps.visibility = false
-      }, 
+      },
     }
   }
 </script>

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -440,8 +440,8 @@
                 template_id == 48 ||
                 template_id == 53 ||
                 template_id == 54 ||
-                template_id == 56 ||
-                template_id == 47)
+                template_id == 56 
+               )
             "
           >
             <template slot-scope="scope">
@@ -465,8 +465,7 @@
               template_id != 48 &&
               template_id != 53 &&
               template_id != 54 &&
-              template_id != 56 &&
-              template_id != 47
+              template_id != 56 
             "
           >
             <template slot-scope="scope">
@@ -667,7 +666,7 @@
               <span v-if="scope.row.monitor_anticoagulant == 8">依诺肝素</span>
               <span v-if="scope.row.monitor_anticoagulant == 9">达肝素</span>
               <span v-if="scope.row.monitor_anticoagulant == 12">无抗凝剂</span>
-              <span v-if="scope.row.monitor_anticoagulant == 13">那曲肝素钙</span>
+              <span v-if="scope.row.monitor_anticoagulant == 13">那屈肝素钙</span>
               <span v-if="scope.row.monitor_anticoagulant_value != ''"
                 >（{{
                   scope.row.monitor_anticoagulant_value
@@ -707,7 +706,7 @@
             align="center"
             label="累计血容量(ml)"
             width="100"
-            v-if="isShow('累计血容量') && template_id != 41"
+            v-if="isShow('累计血容量') && template_id != 41 && org_id != 9538 && org_id != 9671"
           >
              <template slot-scope="scope">
               {{ scope.row.accumulated_blood_volume }}
@@ -718,7 +717,7 @@
             align="center"
             label="累计血容量(L)"
             width="100"
-            v-if="isShow('累计血容量') && template_id == 41"
+            v-if="isShow('累计血容量') && (template_id == 41  || org_id == 9538 || org_id == 9671)"
           >
             <template slot-scope="scope">
               {{ scope.row.accumulated_blood_volume }}
@@ -1191,7 +1190,6 @@
               template_id != 26 &&
               template_id != 29 &&
               template_id != 46 &&
-              template_id != 47 &&
               template_id != 48 &&
               template_id != 54 &&
               template_id != 56 &&
@@ -1213,7 +1211,6 @@
                 template_id == 26 ||
                 template_id == 29 ||
                 template_id == 46 ||
-                template_id == 47 ||
                 template_id == 53 ||
                 template_id == 54 ||
                 template_id == 56 ||
@@ -1384,13 +1381,13 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('累计血容量') && template_id == 41">
+          <el-col :span="8" v-if="isShow('累计血容量') && (template_id == 41 || org_id == 9671 || org_id == 9538)">
             <el-form-item label="累计血容量(L)：">
               <el-input v-model="form.accumulated_blood_volume"></el-input>
             </el-form-item>
           </el-col>
-         
-          <el-col :span="8" v-if="isShow('累计血容量') && template_id  != 41">
+
+          <el-col :span="8" v-if="isShow('累计血容量') && (template_id  != 41 && template_id !=9671 && org_id!=9538)">
             <el-form-item label="累计血容量(ml)：">
               <el-input v-model="form.accumulated_blood_volume"></el-input>
             </el-form-item>
@@ -1553,7 +1550,7 @@
 
       <div slot="footer" class="dialog-footer" v-show="edit">
         <el-button @click="cancelEditAction">取 消</el-button>
-        <el-button type="primary" @click="submitAction">保 存</el-button>
+        <el-button :loading="loading" type="primary"  @click="submitAction">保 存</el-button>
       </div>
       <!--</div>-->
     </el-dialog>
@@ -1576,6 +1573,7 @@ export default {
   name: "MonitorDialog",
   data() {
     return {
+      loading: false,
       is_has_create: true,
       is_has_modify: true,
       is_has_modify_other: true,
@@ -1685,7 +1683,7 @@ export default {
     // this.form.monitoring_time = parseTime(new Date(), "{h}:{i}")
     this.form.operate_time = new Date().getTime();
     var symptoms = getDataConfig("hemodialysis", "symptoms");
-    
+
     this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
     //console.log("抗凝剂",this.anticoagulantsConfit)
     this.bloodPressureMmonitoringSite = getDataConfig(
@@ -1803,6 +1801,7 @@ export default {
     },
 
     newRecordAction: function () {
+      console.log("111111111")
       this.setEditMonitor(null);
       this.$refs.table.setCurrentRow(null);
       console.log(this.dispose_options,'oop')
@@ -1953,12 +1952,14 @@ export default {
         return;
       }
       this.creator = this.table_current_row.creator;
+      console.log("22222222222")
       this.setEditMonitor(this.table_current_row);
       this.$refs.table.setCurrentRow(null);
       this.edit = true;
       this.isAdd = false;
     },
     cancelEditAction: function () {
+      console.log("3333333333")
       this.setEditMonitor(null);
       this.$refs.table.setCurrentRow(null);
       this.edit = false;
@@ -2127,6 +2128,8 @@ export default {
 
     submitAction: function () {
       // TODO loading
+      this.loading = true
+      console.log("aaaa")
       var is_new = this.form.id;
       this.form.operate_time = parseInt(this.form.operate_time / 1000);
       this.form.systolic_bp =
@@ -2142,13 +2145,8 @@ export default {
           ? 0
           : parseFloat(this.form.temperature);
       this.form.pulse_frequency =
-        parseFloat(this.form.pulse_frequency) == NaN
-          ? 0
-          : parseFloat(this.form.pulse_frequency);
-      this.form.breathing_rated =
-        parseFloat(this.form.breathing_rated) == NaN
-          ? 0
-          : parseFloat(this.form.breathing_rated);
+      parseFloat(this.form.pulse_frequency) == NaN ? 0: parseFloat(this.form.pulse_frequency);
+      this.form.breathing_rated = this.form.breathing_rated
       this.form.blood_flow_volume =
         parseFloat(this.form.blood_flow_volume) == NaN
           ? 0
@@ -2306,14 +2304,8 @@ export default {
               parseFloat(this.form.temperature) == NaN
                 ? 0
                 : parseFloat(this.form.temperature);
-            this.form.pulse_frequency =
-              parseFloat(this.form.pulse_frequency) == NaN
-                ? 0
-                : parseFloat(this.form.pulse_frequency);
-            this.form.breathing_rated =
-              parseFloat(this.form.breathing_rated) == NaN
-                ? 0
-                : parseFloat(this.form.breathing_rated);
+            this.form.pulse_frequency =parseFloat(this.form.pulse_frequency) == NaN? 0 : parseFloat(this.form.pulse_frequency);
+            this.form.breathing_rated = this.form.breathing_rated
             this.form.blood_flow_volume =
               parseFloat(this.form.blood_flow_volume) == NaN
                 ? 0
@@ -2430,6 +2422,7 @@ export default {
           }
         }
       );
+      this.loading = false
     },
 
     symptomTextareaBlur: function () {

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -20,8 +20,8 @@
           <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 47 || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56) " width="92px" > 置换率(ml/min) </th>
-          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 47 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56" width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56) " width="92px" > 置换率(ml/min) </th>
+          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56" width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
           <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56)" width="92px"  > 置换量(ml)  </th>
           <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56)" width="92px" > 置换量(L) </th>
@@ -33,8 +33,8 @@
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>
           <th v-if="isShow('累计血容量')" width="92px">累计血容量 
-            <span v-if="template_id !=41">(ml)</span>
-            <span v-if="template_id == 41">(L)</span>
+            <span v-if="template_id !=41 && org_id!=9671 && org_id!=9538">(ml)</span>
+            <span v-if="template_id == 41 || org_id == 9671 || org_id == 9538">(L)</span>
           </th>
           <th v-if="isShow('血容量')" width="92px">血容量(L)</th>
           <th v-if="isShow('血温监测')" width="92px">血温监测</th>

src/xt_pages/dialysis/details/index.vue

@@ -333,7 +333,10 @@
                 
                 </div>
                 <div class="printCell" style="display:flex;justify-content: space-around;">
-                  <span style="display: block;width: 50%;">处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}L</span>
+                  <span style="display: block;width: 50%;">处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}
+                    <span v-if="$store.getters.xt_user.org.id == 10278">ml</span> 
+                    <span v-else>L</span>
+                  </span>
                   <span style="display: block;width: 50%;">
                     总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -562,7 +562,7 @@ export default {
               console.log("wode 2o2o3o3o23o32o32o23o32o32o", this.project)
              
               let projectArr = []
-              if(this.org_id!= 10318){
+              if(this.org_id!= 10318 && this.org_id!=10265){
                 this.project.map(item => {
                   resp.data.hisAdvices.map(it => {
                     if(item.patient_id == it.patient_id){

src/xt_pages/dialysis/dialysisDrugs_print.vue

@@ -41,7 +41,7 @@
                                       <span v-if="item.anticoagulant==8">依诺肝素</span>
                                       <span v-if="item.anticoagulant==9">达肝素</span>
                                       <span v-if="item.anticoagulant==10">体外抗凝</span>
-                                      <span v-if="item.anticoagulant==11">那曲肝素</span>
+                                      <span v-if="item.anticoagulant==11">那屈肝素</span>
                                     </td>
                                     <td>
                                       {{item.count}}

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -704,7 +704,7 @@
       </template>
       <template
         v-if="
-          org_template_info.template_id == 56
+          org_template_info.template_id == 56 ||org_template_info.template_id == 59
         "
       >
         <el-button
@@ -716,6 +716,35 @@
           >打印</el-button
         >
       </template>
+      <template
+        v-if="
+          org_template_info.template_id == 57
+        "
+      >
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
+      <template
+        v-if="
+          org_template_info.template_id == 58
+        "
+      >
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
+      
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1127,7 +1156,18 @@
             v-if="org_template_info.template_id == 56"
           >
           </DialysisPrintOrderFiftySix>
-          
+          <DialysisPrintOrderFiftySeven
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 57">
+          </DialysisPrintOrderFiftySeven>
+          <DialysisPrintOrderFiftyEight
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 58">
+          </DialysisPrintOrderFiftyEight>
+          <DialysisPrintOrderFiftyNine
+          v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 59">
+          </DialysisPrintOrderFiftyNine>
         </div>
       </el-container>
     </div>
@@ -1200,11 +1240,17 @@ import DialysisPrintOrderFiftyOne from "./template/DialysisPrintOrderFiftyOne";
 import DialysisPrintOrderFiftyTwo from "./template/DialysisPrintOrderFiftyTwo";
 import DialysisPrintOrderFiftyThree from "./template/DialysisPrintOrderFiftyThree";
 import DialysisPrintOrderFiftyFour from "./template/DialysisPrintOrderFiftyFour";
-import DialysisPrintOrderFiftyfive from "./template/DialysisPrintOrderFiftyfive"
-import DialysisPrintOrderFiftySix from "./template/DialysisPrintOrderFiftySix"
+import DialysisPrintOrderFiftyfive from "./template/DialysisPrintOrderFiftyfive";
+import DialysisPrintOrderFiftySix from "./template/DialysisPrintOrderFiftySix";
+import DialysisPrintOrderFiftySeven from "./template/DialysisPrintOrderFiftySeven";
+import DialysisPrintOrderFiftyEight from "./template/DialysisPrintOrderFiftyEight";
+import DialysisPrintOrderFiftyNine from "./template/DialysisPrintOrderFiftyNine";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderFiftyNine,
+    DialysisPrintOrderFiftyEight,
+    DialysisPrintOrderFiftySeven,
     DialysisPrintOrderFiftySix,
     DialysisPrintOrderFiftyfive,
     DialysisPrintOrderFiftyFour,
@@ -1421,12 +1467,16 @@ export default {
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       const style2 =
         // 防止分页错位问题：table设置border: none；.tr设置page-break-inside:avoid; // 防止table数据太多，tr分页错乱 td设置border: 1px solid #000;// 防止部分分页的tr边框线没有
-        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;} .inside_table{border: none} .inside_table tr{page-break-inside:avoid;} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 20px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;} .print_page_main_content .proj_table tbody tr inside_table tbody tr{page-break-inside:avoid;} .print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px} ';
+        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;} .inside_table{border: none} .inside_table tr{page-break-inside:avoid;} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 20px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;} .print_page_main_content .proj_table tbody tr{page-break-inside:avoid;} .print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px} ';
       const style3 =
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:16px;border-color: #000;}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #000;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}.row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line {display: inline-block;border-bottom: 1px solid #000;text-align: center;white-space: nowrap; width: 50%;}';
       // const style3 =
       //   '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 16px;padding: 5px 5px;line-height: 18px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:950px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top:1050px;left: 50%;}.print-yema5{position: absolute;top:1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
       //
+      const style4 =
+        '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:18px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:18px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:18px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
+      
+ 
 
       const style5 =
         '@media print {.dialysis-print-order {width: 960px; margin: 0 auto;}.dialysis-print-order .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.dialysis-print-order .order-title {  margin: auto;  font-weight: 600;  text-align: center;  font-size: 22px;  padding: 10px 20px 0px 20px;}.dialysis-print-order .table-box {  width: 100%;  line-height: 18px;  font-size: 14px;}.dialysis-print-order .print-table {  width: 100%;  text-align: center;  border-collapse: collapse;  line-height: 28px;  font-size: 14px;}.dialysis-print-order .print-table-no {  width: 100%;  text-align: center;  border-collapse: collapse;  font-size: 14px;}.dialysis-print-order .under-line {  border-bottom: 1px solid #999;  width: 95%;  text-align: center;  margin-left: 2px;}.dialysis-print-order .title-box {  text-align: center;  font-size: 16px;}.dialysis-print-order .radio-lebel-box {  font-weight: 400;  cursor: pointer;}.dialysis-print-order .radio-no {  opacity: 0;  outline: none;  position: absolute;  margin: 0;  width: 0;  height: 0;  z-index: -1;}.dialysis-print-order .radio-inner {  white-space: nowrap;  cursor: pointer;  outline: none;  display: inline-block;  line-height: 1;  position: relative;  vertical-align: middle;}.dialysis-print-order .radio-fang {  display: inline-block;  position: relative;  border: 1px solid #000;  box-sizing: border-box;  width: 14px;  height: 14px;  background-color: #fff;  z-index: 1;  transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),    background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);}.dialysis-print-order .is-checked-radio::after {  content: "√";  font-size: 15px;}.dialysis-print-order .print-table-no tr td {  padding: 8px 5px;  line-height: 25px;}.dialysis-print-order .print-table tr td {  padding: 1px 1px;  /*line-height: 25px;*/}.es-img {  height: 25px;}.advice-name {  text-align: left;}.advice-children {  display: flex;}.title-box-pro {  border: 0 #fff;  line-height: 25px;  height: 25px;  text-align: left;  padding-left: 10px !important;}.title-box-pro-tr {  border: 0 #fff;}.text-align-left {  text-align: left !important;  padding-left: 10px !important;  font-size: 14px !important;  line-height: 25px;}.print-table-tr-new td {line-height: 20px !important;}.border-top-solid {border: solid 1px #000;}.print-template-two tr {line-height: 30px;}}';
@@ -1447,7 +1497,7 @@ export default {
       // 雷州惠爱样式
       const style12 ='@page {margin-top:10px;}@media print {.dialysis-print-order{width:960px;margin:0 auto;margin-top:30px;} .dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:40px;font-size:14px} .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .print-table tbody tr td{border-collapse:collapse;} .dialysis-print-order .print-table .short_tr th p{height:20px !important; line-height:20px !important;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;} .dialysis-print-order .td_div1{display:flex;white-space: normal;} .dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;line-height:35px} .print-table tr th p{height: 20px; line-height: 20px}  .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}@page {margin-left:30px;margin-right:40px;}  .dialysis-print-order tbody .print-table tr{page-break-inside:avoid;} .dialysis-print-order tbody .print-table tr td{border: 1px solid #000;} ';
       // 金乡宏大样式
-      const style13 ='@page {margin-top:5px;}@media print {.dialysis-print-order{width:960px;margin:0 auto} .dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:40px;font-size:14px} .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .print-table tbody tr td{border-collapse:collapse;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;} .dialysis-print-order .print-table-2{ width: 100%;text-align: left;border-collapse: collapse;line-height: 38px;font-size: 14px;} .dialysis-print-order .print-table-2 tbody tr{height:43px; padding-bottom:-12px;} .print-table-2 tbody tr td{padding-bottom:-12px;} .td_div1{display:flex;white-space: normal;} .print-table-3{text-align: center;width: 390px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-3 .tr_3{border-bottom: 1px solid;} .print-table-3 .td_3 {border-right: 1px solid;} .print-table-3 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-3 .td_3_2 {width:72px;border-right: 1px solid;} .print-table-4{text-align: center;width: 300px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-4 .tr_3{border-bottom: 1px solid;}  .print-table-4 .td_3 {border-right: 1px solid;} .print-table-4 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-4 .td_3_2 {width:72px;border-right: 1px solid;} .print-table-5{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .dialysis-print-order .print-table-5 tr td_5{width:75px;} .dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;line-height:35px} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}@page {margin-left:30px;margin-right:40px;}';
+      const style13 ='@page {margin-top:5px;}@media print {.dialysis-print-order{width:960px;margin:0 auto} .dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:40px;font-size:14px} .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .print-table tbody tr{page-break-inside:avoid} .print-table tbody tr td{border-collapse:collapse;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;} .dialysis-print-order .print-table-2{ width: 100%;text-align: left;border-collapse: collapse;line-height: 38px;font-size: 14px;} .dialysis-print-order .print-table-2 tbody tr{height:43px; padding-bottom:-12px;} .print-table-2 tbody tr td{padding-bottom:-12px;} .td_div1{display:flex;white-space: normal;} .print-table-3{text-align: center;width: 390px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-3 .tr_3{border-bottom: 1px solid;} .print-table-3 .td_3 {border-right: 1px solid;} .print-table-3 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-3 .td_3_2 {width:72px;border-right: 1px solid;} .print-table-4{text-align: center;width: 300px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-4 .tr_3{border-bottom: 1px solid;}  .print-table-4 .td_3 {border-right: 1px solid;} .print-table-4 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-4 .td_3_2 {width:72px;border-right: 1px solid;} .print-table-5{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .dialysis-print-order .print-table-5 tr td_5{width:75px;} .dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;line-height:35px} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}@page {margin-left:30px;margin-right:40px;}';
 
       if (this.org_template_info.template_id == 1) {
         printJS({
@@ -1493,7 +1543,8 @@ export default {
         this.org_template_info.template_id == 11 ||
         this.org_template_info.template_id == 49 ||
         this.org_template_info.template_id == 50 ||
-        this.org_template_info.template_id == 51
+        this.org_template_info.template_id == 51 ||
+        this.org_template_info.template_id == 58
       ) {
         printJS({
           printable: "dialysis-print-box-1",
@@ -1505,7 +1556,7 @@ export default {
         printJS({
           printable: "dialysis-print-box",
           type: "html",
-          style: style,
+          style: style4,
           scanStyles: false,
         });
       } else if (this.org_template_info.template_id == 8) {
@@ -1797,8 +1848,9 @@ export default {
           style: style12,
           scanStyles: false,
         });
+        
       }else if (
-        this.org_template_info.template_id == 54
+        this.org_template_info.template_id == 54 || this.org_template_info.template_id == 57
       ) {
         printJS({
           printable: "dialysis-print-box",
@@ -1816,7 +1868,7 @@ export default {
           scanStyles: false,
         });
       }else if (
-        this.org_template_info.template_id == 56
+        this.org_template_info.template_id == 56 ||this.org_template_info.template_id == 59
       ) {
         printJS({
           printable: "dialysis-print-box-1",

src/xt_pages/dialysis/schedualPatient.vue

@@ -87,7 +87,7 @@
           <div v-if="zone_schedule.schedules.length > 0 && patientStateVal != 1" style="font-size:16px;font-weight: bold;color: #34495e;margin-right:10px;line-height:30px;">{{zone_schedule.zone_name}}</div>
           <patient-box :schedules="zone_schedule.schedules" :patientStateVal='patientStateVal' :selected_date="selected_date" style="flex:1"></patient-box>
         </div>
-        
+
         <div class="NoData" v-show="filtedSchedules.length == 0">
           <img src="@/assets/img/data.jpg" alt="">
         </div>
@@ -392,7 +392,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
         this.websocket.onmessage = e => {
           let res = JSON.parse(e.data);
           // let res = re.data;
-          console.log('res3333333333',res)
+          console.log('res333adasda3333333',res)
           if(res.channel == 'queue/join'){
             let timeType = null
             if(this.schedule_type_selected == 1){
@@ -423,7 +423,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
                 }
             }
             this.fisrtQueueInfo = fisrtQueueInfo
-            
+
             // this.fisrtQueueInfo = res.data.fisrtQueueInfo
             let arr = res.data.patientQueueList.data
             let waitingCalledArr = []
@@ -609,10 +609,17 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           var resp = rs.data
           if (resp.state == 1) {
             var zones = resp.data.zones
+            var arr = []
+            for(let i=0;i<zones.length;i++){
+              if(zones[i].status == 1){
+                 arr.push(zones[i])
+              }
+            }
+            console.log("zone2w233323232wid",zones)
             var schedules = resp.data.schedules
             var zone_options = [{ id: 0, text: '全部分区' }]
-            for (let z_i = 0; z_i < zones.length; z_i++) {
-              const zone = zones[z_i]
+            for (let z_i = 0; z_i < arr.length; z_i++) {
+              const zone = arr[z_i]
               zone_options.push({ id: zone.id, text: zone.name })
             }
             this.zone_options = zone_options

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue

@@ -180,19 +180,19 @@
                 showValue="低分子肝素钠:"
               ></label-box>
 
-              &nbsp;&nbsp;{{
+              &nbsp;&nbsp;<span v-if="org_id!=10090">{{
                 prescription.anticoagulant_zongliang &&
                 (prescription.anticoagulant == 3 ||
                   prescription.anticoagulant == 6 ||
                   prescription.anticoagulant == 7)
                   ? prescription.anticoagulant_zongliang
                   : ""
-              }}U；&nbsp;&nbsp;
+              }}U；</span>&nbsp;&nbsp;
               <label-box
                 :isChecked="prescription.anticoagulant == 2 ? true : false"
                 showValue="普通肝素:"
               ></label-box
-              >首剂 &nbsp;&nbsp;<span
+              ><span v-if="org_id!=10090">首剂 &nbsp;&nbsp;<span
                 ><span style="width: 35px; display: inline-block">
                   {{
                     prescription.anticoagulant_shouji &&
@@ -203,19 +203,24 @@
                   }}
                 </span></span
               >
-              mg&nbsp;&nbsp;&nbsp; 追加&nbsp;&nbsp;<span>{{
+              mg&nbsp;&nbsp;&nbsp; </span> 
+              <span v-if="org_id!=10090"> 追加&nbsp;&nbsp;<span>{{
                 prescription.anticoagulant_weichi &&
                 prescription.anticoagulant == 2
                   ? prescription.anticoagulant_weichi
                   : ""
               }}</span
-              >&nbsp;&nbsp;mg/h&nbsp; 总量&nbsp;&nbsp;<span>{{
+              >&nbsp;&nbsp;mg/h&nbsp; </span>
+              <span v-if="org_id!=10090">
+                总量&nbsp;&nbsp;<span>{{
                 prescription.anticoagulant_zongliang &&
                 prescription.anticoagulant == 2
                   ? prescription.anticoagulant_zongliang
                   : ""
               }}</span
               >&nbsp;&nbsp;mg；
+              </span>
+             
               <label-box
                 :isChecked="prescription.anticoagulant == 1 ? true : false"
                 showValue="无肝素"
@@ -226,7 +231,7 @@
               ></label-box>
             </td>
           </tr>
-          <tr class="list_table_1" style="line-height:40px;">
+          <tr class="list_table_1" style="line-height: 40px">
             <td
               width="250"
               style="border-right: none; padding-left: 10px"
@@ -821,9 +826,11 @@
             <td v-if="advice_index === 1">体重增加量:</td>
             <td v-if="advice_index === 1">
               {{
-                (
-                  predialysis.weight_before - assessmentafter.weight_after
-                ).toFixed(2)
+                (assessmentafter.weight_after == 0 || predialysis.weight_before == 0
+                  ? 0
+                  : (
+                      predialysis.weight_before - assessmentafter.weight_after
+                    ).toFixed(2))
               }}kg
             </td>
             <td v-if="advice_index === 2">干体重(DW):</td>
@@ -831,9 +838,11 @@
             <td v-if="advice_index === 3">较干体重增加量:</td>
             <td v-if="advice_index === 3">
               {{
-                (afterdialysis.weight_after - predialysis.dry_weight).toFixed(
-                  2
-                )
+                afterdialysis.weight_after == 0
+                  ? 0
+                  : (
+                      afterdialysis.weight_after - predialysis.dry_weight
+                    ).toFixed(2)
               }}kg
             </td>
             <td v-if="advice_index === 4">净脱水量:</td>
@@ -847,9 +856,11 @@
             <td v-if="advice_index === 6">本次透析体重下降量:</td>
             <td v-if="advice_index === 6">
               {{
-                (
-                  predialysis.weight_before - afterdialysis.weight_after
-                ).toFixed(2)
+                afterdialysis.weight_after == 0 || predialysis.weight_before == 0
+                  ? 0
+                  : (
+                      predialysis.weight_before - afterdialysis.weight_after
+                    ).toFixed(2)
               }}kg
             </td>
             <td v-if="advice_index > 6"></td>
@@ -886,9 +897,11 @@
               >
                 {{
                   getAdminUser(
-                    prescription == null? 0: prescription.creater ? prescription.prescription_doctor: ""
-                     
-                     
+                    prescription == null
+                      ? 0
+                      : prescription.creater
+                      ? prescription.prescription_doctor
+                      : ""
                   )
                 }}
               </span>
@@ -901,8 +914,8 @@
                       : prescription.creater
                       ? prescription.creater
                       : ''
-                  ) "
-               
+                  )
+                "
                 alt=""
                 srcset=""
                 v-else

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -573,7 +573,7 @@
                           {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}
                           {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
                         </td>
-                        <td>{{ monitor.monitor_temperature ? monitor.monitor_temperature : "" }}</td>
+                        <td>{{ monitor.temperature ? monitor.temperature : "" }}</td>
                         <td>{{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}</td>
                         <td>{{ monitor.breathing_rate ? monitor.breathing_rate : "" }}</td>
                         <td>{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -41,12 +41,12 @@
                   <tr class="list_table_1">
                     <td colspan="11" style="padding-left: 10px">
                       <div style="display: flex">
-                        <div style="width: 400px">
+                        <div style="width: 250px">
                           病情评估:&nbsp;<span>{{
                             sick_condition ? sick_condition : ""
                           }}</span>
                         </div>
-                        <div style="width: 400px">
+                        <div style="width: 250px">
                           入科方式:&nbsp;<span
                             v-for="(item, index) in way_arr"
                             :key="index"
@@ -56,6 +56,14 @@
                             >{{ item.name }}
                           </span>
                         </div>
+                        <div style="width: 250px">
+                          透析次数:&nbsp;<span>
+                            {{
+                              patientInfo.total_dialysis +
+                              patientInfo.user_sys_before_count
+                            }}次
+                          </span>
+                        </div>
                       </div>
                     </td>
                   </tr>
@@ -256,7 +264,7 @@
                           }}
                         </span></span
                       >
-                      mg&nbsp;&nbsp;&nbsp; 追加&nbsp;&nbsp;<span>{{
+                      &nbsp;mg&nbsp;&nbsp;&nbsp; 追加&nbsp;&nbsp;<span>{{
                         prescription.anticoagulant_weichi &&
                         prescription.anticoagulant == 2
                           ? prescription.anticoagulant_weichi
@@ -377,14 +385,17 @@
                             border-right: 1px solid;
                           "
                         >
-                          透析机：{{
-                            dialysisOrder &&
-                            dialysisOrder.DeviceNumber &&
-                            dialysisOrder.DeviceNumber.number.length > 0
-                              ? dialysisOrder.DeviceNumber.number
-                              : patientInfo.DialysisSchedule.device_number
-                                  .number
-                          }}
+                          透析机：
+                          <span v-if="dialysisOrder != null"
+                            >{{
+                              dialysisOrder &&
+                              dialysisOrder.DeviceNumber &&
+                              dialysisOrder.DeviceNumber.number.length > 0
+                                ? dialysisOrder.DeviceNumber.number
+                                : patientInfo.DialysisSchedule.device_number
+                                    .number
+                            }}
+                          </span>
                         </div>
                         <div
                           style="
@@ -759,22 +770,36 @@
             <td>
               <table class="print-table" border="1" style="text-align: center">
                 <tr>
-                  <td style="height: 20px" width="50">
+                  <td style="height: 20px" width="60">
                     <p style="height: 20px; line-height: 20px">时间</p>
                   </td>
-                  <td style="height: 20px" width="490">
+                  <td
+                    style="height: 20px"
+                    width="90"
+                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
+                  >
+                    <p style="height: 20px; line-height: 20px">开嘱医生</p>
+                  </td>
+                  <td style="height: 20px" width="344">
                     <p style="height: 20px; line-height: 20px">医嘱执行记录</p>
                   </td>
-                  <td style="height: 20px" width="85">
+                  <td
+                    style="height: 20px"
+                    width="70"
+                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
+                  >
+                    <p style="height: 20px; line-height: 20px">执行时间</p>
+                  </td>
+                  <td style="height: 20px" width="90">
                     <p style="height: 20px; line-height: 20px">执行</p>
                   </td>
-                  <td style="height: 20px" width="85">
+                  <td style="height: 20px" width="90">
                     <p style="height: 20px; line-height: 20px">核对</p>
                   </td>
-                  <td style="height: 20px" width="145">
+                  <td style="height: 20px" width="144">
                     <p style="height: 20px; line-height: 20px">上次透后体重</p>
                   </td>
-                  <td style="height: 20px">
+                  <td style="height: 20px" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
@@ -795,10 +820,25 @@
             <td>
               <table class="print-table" border="1">
                 <tr>
-                  <td width="50">
+                  <td width="60">
                     {{ getTime(advice.start_time, "{h}:{i}") }}
                   </td>
-                  <td style="text-align: left; padding-left: 5px" width="485">
+                  <td
+                    style="line-height: 30px"
+                    width="90"
+                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
+                  >
+                    <span v-if="setAdminUserES(advice.advice_doctor) == ''">
+                      {{ getAdminUser(advice.advice_doctor) }}
+                    </span>
+                    <img
+                      style="height: 30px"
+                      :src="setAdminUserES(advice.advice_doctor)"
+                      alt=""
+                      srcset=""
+                    />
+                  </td>
+                  <td style="text-align: left; padding-left: 5px" width="340">
                     <span v-if="advice.parent_id > 0">---></span>
                     <span>{{ advice.advice_name }}</span>
                     <span v-if="advice && advice.advice_desc"
@@ -822,7 +862,16 @@
                     }}</span>
                     <span>{{ advice.remark }}</span>
                   </td>
-                  <td style="line-height: 30px" width="85">
+                  <td
+                    style="line-height: 10px"
+                    width="70"
+                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
+                  >
+                    <span v-if="advice.execution_time">{{
+                      getTime(advice.execution_time, "{h}:{i}")
+                    }}</span>
+                  </td>
+                  <td style="line-height: 10px" width="90">
                     <span v-if="setAdminUserES(advice.execution_staff) == ''">{{
                       getAdminUser(advice.execution_staff)
                     }}</span>
@@ -831,10 +880,9 @@
                       :src="setAdminUserES(advice.execution_staff)"
                       alt=""
                       srcset=""
-                      v-else
                     />
                   </td>
-                  <td style="line-height: 30px" width="85">
+                  <td style="line-height: 30px" width="90">
                     <span v-if="setAdminUserES(advice.checker) == ''">{{
                       getAdminUser(advice.checker)
                     }}</span>
@@ -848,7 +896,7 @@
                   </td>
 
                   <td v-if="advice_index === 0" width="145">透前体重:</td>
-                  <td v-if="advice_index === 0">
+                  <td v-if="advice_index === 0" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
@@ -858,20 +906,19 @@
                     }}kg
                   </td>
                   <td v-if="advice_index === 1" width="145">体重增加量:</td>
-                  <td v-if="advice_index === 1">
+                  <td v-if="advice_index === 1" width="60">
                     {{
-                      patientInfo.total_dialysis +
-                        patientInfo.user_sys_before_count >
-                      0
-                        ? (
+                      assessmentafter.weight_after == 0 ||
+                      predialysis.weight_before == 0
+                        ? 0
+                        : (
                             predialysis.weight_before -
                             assessmentafter.weight_after
                           ).toFixed(2)
-                        : "/"
                     }}kg
                   </td>
                   <td v-if="advice_index === 2" width="145">干体重(DW):</td>
-                  <td v-if="advice_index === 2">
+                  <td v-if="advice_index === 2" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
@@ -881,19 +928,19 @@
                     }}kg
                   </td>
                   <td v-if="advice_index === 3" width="145">较干体重增加量:</td>
-                  <td v-if="advice_index === 3">
+                  <td v-if="advice_index === 3" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
-                      0
+                        0 && afterdialysis.weight_after != 0
                         ? (
                             afterdialysis.weight_after - predialysis.dry_weight
                           ).toFixed(2)
-                        : "/"
+                        : 0
                     }}kg
                   </td>
                   <td v-if="advice_index === 4" width="145">净脱水量:</td>
-                  <td v-if="advice_index === 4">
+                  <td v-if="advice_index === 4" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
@@ -903,7 +950,7 @@
                     }}ml
                   </td>
                   <td v-if="advice_index === 5" width="145">透后体重:</td>
-                  <td v-if="advice_index === 5">
+                  <td v-if="advice_index === 5" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
@@ -915,20 +962,19 @@
                   <td v-if="advice_index === 6" width="145">
                     本次透析体重下降量:
                   </td>
-                  <td v-if="advice_index === 6">
+                  <td v-if="advice_index === 6" width="60">
                     {{
-                      patientInfo.total_dialysis +
-                        patientInfo.user_sys_before_count >
-                      0
-                        ? (
+                      afterdialysis.weight_after == 0 ||
+                      predialysis.weight_before == 0
+                        ? 0
+                        : (
                             predialysis.weight_before -
                             afterdialysis.weight_after
                           ).toFixed(2)
-                        : "/"
                     }}kg
                   </td>
                   <td v-if="advice_index > 6" width="145"></td>
-                  <td v-if="advice_index > 6"></td>
+                  <td v-if="advice_index > 6" width="60"></td>
                 </tr>
               </table>
             </td>

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -425,13 +425,13 @@
                     <div class="inline_block" style="flex:1;">
                       置换方式：
                       <div class="under_line" style="width: 60px;text-align: center">
-                        {{ getDisplaceLiquiPart(prescription.displace_liqui_part) }}
+                        <span v-if="prescription.mode_id == 2 || prescription.mode_id ==5 || prescription.mode_id==12 || prescription.mode_id == 28"> {{ getDisplaceLiquiPart(prescription.displace_liqui_part) }} </span>
                       </div>
                     </div>
                     <div class="inline_block" style="flex:1;">
                       置换总量：
                       <div class="under_line" style="width: 50px;text-align: center">
-                        {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}
+                         <span v-if="prescription.mode_id == 2 || prescription.mode_id ==5 || prescription.mode_id ==12 || prescription.mode_id == 28"> {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}</span>
                       </div>
                       L
                     </div>
@@ -628,7 +628,7 @@
                   <table class="inside_table">
                     <tbody>
                       <tr>
-                        <td colspan="11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 0px 8px;line-height: 30px;">
+                        <td colspan="12" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 0px 8px;line-height: 30px;">
                           监测记录
                         </td>
                       </tr>
@@ -642,6 +642,7 @@
                         <td width="50">脉搏<br />(次/分)</td>
                         <td width="60">血压<br />(mmHg)</td>
                         <td width="50">血容量<br />L</td>
+                        <td width="50">Kt/V<br /></td>
                         <td width="50">签名</td>
                         <td width="200">病情变化及处理</td>
                       </tr>
@@ -659,6 +660,7 @@
                           {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
                         </td>
                         <td style="padding:1px 5px;">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : '' }}</td>
+                        <td>{{ monitor.ktv ? monitor.ktv : "" }}</td>
                         <td style="padding:1px 5px;" height="30px">
                           <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">
                             {{ getAdminUser(monitor.monitoring_nurse) }}
@@ -678,7 +680,7 @@
                         </td>
                       </tr>
                       <tr>
-                        <td colspan="11" style="line-height:25px;text-align:left;">
+                        <td colspan="12" style="line-height:25px;text-align:left;">
                           医师记录：{{ summary.special_record ? summary.special_record : '' }}
                         </td>
                       </tr>
@@ -1100,7 +1102,7 @@ export default {
             }
         })
         }
-        
+
         if(num == 0){
           this.$message.success('核对完成')
         }
@@ -1456,7 +1458,7 @@ export default {
             }
           }
         }
-        
+
         console.log('this.monitors',this.monitors)
 
         this.jilurow = this.monitors.length + 1

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -160,7 +160,7 @@
 
         <div
           class="row"
-          :style="this.totollength > 13 ? 'margin-bottom:400px;' : ''"
+          :style="this.totollength > 13 ? 'margin-bottom:250px;' : ''"
         >
           <table class="proj_table">
             <tbody>
@@ -674,9 +674,8 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        {{
-                          getDisplaceLiquiPart(prescription.displace_liqui_part)
-                        }}
+                       <span v-if="prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12">{{getDisplaceLiquiPart(prescription.displace_liqui_part)}}</span> 
+                        <span v-else>/</span>
                       </div>
                     </div>
                     <div
@@ -688,11 +687,8 @@
                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
-                        {{
-                          prescription.displace_liqui_value
-                            ? prescription.displace_liqui_value
-                            : "/"
-                        }}
+                       <span v-if="prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12">{{ prescription.displace_liqui_value ? prescription.displace_liqui_value: "/"}} </span> 
+                       <span v-else>/</span>
                       </div>
                       L
                     </div>
@@ -1413,6 +1409,7 @@
                             font-size: 16px;
                             padding: 6px 8px;
                             line-height: 30px;
+                            
                           "
                         >
                           医嘱内容
@@ -1686,7 +1683,6 @@
         </template>
         <div class="row" style="margin-top: -11px; position: relative">
           <table class="proj_table">
-            <tbody>
               <template v-if="doctor_advices_2.length > 0">
                 <tr style="line-height: 35px; padding: 8px 5px">
                   <td
@@ -1698,6 +1694,7 @@
                       font-size: 16px;
                       padding: 6px 8px;
                       line-height: 30px;
+                      border: 1px solid;
                     "
                   >
                     医嘱内容
@@ -1707,7 +1704,7 @@
                 <td colspan="4" style="font-size: 16px">开医嘱</td>
                 <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
               </tr> -->
-                <tr style="line-height: 35px; padding: 8px 5px">
+                <tr style="line-height: 35px; padding: 8px 5px"  class="split_table_tr" >
                   <td style="font-size: 16px" width="10%">时间</td>
                   <td style="font-size: 16px" colspan="2" width="45%">
                     医嘱内容
@@ -1718,7 +1715,7 @@
                   <td style="font-size: 16px" width="10%">时间</td>
                 </tr>
                 <!-- <template v-for="group in doctor_advices" > -->
-                <tr
+                <tr class="split_table_tr" 
                   v-for="(advice, advice_index) in doctor_advices_2"
                   :key="advice_index"
                 >
@@ -1736,21 +1733,15 @@
                   >
                     <span v-if="advice.parent_id > 0">---></span>
                     <span>{{ advice.advice_name }}</span>
+                    <span v-if="advice.project && advice.project.project_name">{{ advice.project.project_name }}</span>
                     <span v-if="advice && advice.advice_desc"
                       >({{ advice.advice_desc
                       }}{{ advice.drug_spec_unit }})</span
                     >
-                    <span v-if="advice.prescribing_number"
-                      >&nbsp;&nbsp; {{ advice.prescribing_number
-                      }}{{ advice.prescribing_number_unit }}</span
-                    >
-                    <span v-if="advice.single_dose != 0"
-                      >{{ advice.single_dose
-                      }}{{ advice.single_dose_unit }}</span
-                    >
-                    <span v-if="advice.parent_id == 0">{{
-                      advice.delivery_way
-                    }}</span>
+                    <span v-if="advice.prescribing_number" >&nbsp;&nbsp; {{ advice.prescribing_number}}{{ advice.prescribing_number_unit }}</span>
+                    <span v-if="advice.single_dose != 0" >{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
+                     <span v-if="advice.project && advice.project.unit">{{ advice.project.unit }}</span>
+                    <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
                     <span v-if="advice.parent_id == 0">{{
                       advice.execution_frequency
                     }}</span>
@@ -1776,6 +1767,16 @@
                       srcset=""
                       v-else
                     />
+                    <span v-if="setAdminUserES(advice.doctor) == ''">{{
+                      getAdminUser(advice.doctor)
+                    }}</span>
+                    <img
+                      style="height: 30px"
+                      :src="setAdminUserES(advice.doctor)"
+                      alt=""
+                      srcset=""
+                      v-else
+                    />
                   </td>
                   <!-- <td height="35px">
                   <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
@@ -2504,7 +2505,7 @@
                   </div>
                 </td>
               </tr>
-            </tbody>
+            
           </table>
           <!-- <div  class="print-yema">1</div> -->
         </div>
@@ -3104,6 +3105,7 @@ export default {
         this.prescription = response.data.data.dialysisPrescription;
         console.log("透析处方", this.prescription);
         let project_arr = response.data.data.projects
+        console.log("project_Arr2332323232",project_arr)
         project_arr.forEach(o => {
           if(o.project.project_name && o.project.project_name!=""){
             this.project.push(o)
@@ -3158,7 +3160,7 @@ export default {
 
         this.advices = response.data.data.advices;
         this.tableAdvice = response.data.data.advices;
-        console.log("医嘱数据", this.advices);
+        // console.log("医嘱数据", this.advices);
         this.monitors = response.data.data.monitors;
         this.summary = response.data.data.summary;
         this.org_template_info = response.data.data.org_template_info;
@@ -3256,10 +3258,9 @@ export default {
           this.advices.push(item);
         }
         this.loading = false;
-        this.doctor_advices =
-          response.data.data.advices == null ? [] : response.data.data.advices.concat(this.project);
+        this.doctor_advices = response.data.data.advices == null ? [] : response.data.data.advices.concat(this.project);
           // .concat(this.project)
-          console.log( this.doctor_advices,' this.doctor_advices this.doctor_advices')
+          // console.log( this.doctor_advices,' this.doctor_advices this.doctor_advices')
         for (let index = 0; index < this.doctor_advices.length; index++) {
           this.doctor_advices[index]["isShow"] = 2;
         }
@@ -3342,6 +3343,7 @@ export default {
         //    this.advice_groups.push(group)
         //   }
         // }
+        console.log("dotoreadvcie233232323223",this.doctor_advices)
         if (this.doctor_advices.length <= 6) {
           var nl = 6;
           this.print_length = 6;
@@ -3358,23 +3360,25 @@ export default {
           }
         }
 
-        // this.totollength = this.doctor_advices.length + this.monitors.length;
-        // if (this.totollength > 18) {
-        //   var temp_advice_length = 17 - this.monitors.length;
-        //   var doctor_advices_1 = [];
-        //   var doctor_advices_2 = [];
-        //   for (let index = 0; index < this.doctor_advices.length; index++) {
-        //     const element = this.doctor_advices[index];
-        //     if (temp_advice_length > index) {
-        //       doctor_advices_1.push(element);
-        //     } else {
-        //       doctor_advices_2.push(element);
-        //     }
-        //   }
-        //   this.doctor_advices = doctor_advices_1;
-        //   this.doctor_advices_2 = doctor_advices_2;
-        // }
-        // console.log(this.doctor_advices,'doctor_advices');
+        this.totollength = this.doctor_advices.length + this.monitors.length;
+        console.log(" this.totollength", this.totollength)
+        if (this.totollength > 18) {
+          var temp_advice_length = 17 - this.monitors.length;
+          var doctor_advices_1 = [];
+          var doctor_advices_2 = [];
+          for (let index = 0; index < this.doctor_advices.length; index++) {
+            const element = this.doctor_advices[index];
+            if (temp_advice_length > index) {
+              doctor_advices_1.push(element);
+            } else {
+              doctor_advices_2.push(element);
+            }
+          }
+          this.doctor_advices = doctor_advices_1;
+          this.doctor_advices_2 = doctor_advices_2;
+        }
+        console.log(this.doctor_advices,'doctor_advices');
+        console.log(" this.doctor_advices_2",this.doctor_advices_2)
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");
@@ -3551,6 +3555,7 @@ export default {
   text-align: center;
   font-size: 20px;
   letter-spacing: 5px;
+
 }
 
 .dialysis-print-order .order-title {
@@ -3657,6 +3662,12 @@ export default {
   line-height: 16px;
 }
 
+.print_page_main_content .row .proj_table .split_table_tr td{
+    border: 1px solid;
+}
+
+
+
 .print-table-no {
   width: 100%;
   text-align: center;

src/xt_pages/dialysis/template/DialysisPrintOrderSeven.vue

@@ -9,27 +9,27 @@
           <tbody>
             <tr>
               <td width="50">姓 名:</td>
-              <td width="120">
+              <td width="150">
                 <div class="under-line">
                   &nbsp;{{ patientInfo.name ? patientInfo.name : "/" }}
                 </div>
               </td>
-              <td width="100"></td>
+              <td width="30"></td>
 
               <td width="50">性 别:</td>
-              <td width="180">
+              <td width="150">
                 <div class="under-line">
                   {{ patientInfo.gender ? patientInfo.gender : "/" }}
                 </div>
               </td>
-              <td width="10"></td>
+              <td width="30"></td>
               <td width="50">年 龄:</td>
-              <td width="180">
+              <td width="150">
                 <div class="under-line">
                   &nbsp;{{ checkIdCardNo(patientInfo.id_card_no) }}
                 </div>
               </td>
-              <td width="80">岁</td>
+              <td width="60">岁</td>
 
               <td width="80">透析机号:</td>
               <td width="130">
@@ -44,14 +44,14 @@
         <table class="table-box" style="margin-top:10px">
           <tbody>
             <tr>
-              <td width="50">治疗日期:</td>
-              <td width="130">
+              <td width="80">治疗日期:</td>
+              <td width="150">
                 <div class="under-line">
                   {{ queryParams.xtdate ? queryParams.xtdate : "/" }}
                 </div>
               </td>
               <td width="10"></td>
-              <td width="50">
+              <td width="60">
                 住院号:
               </td>
               <td width="150">
@@ -60,7 +60,7 @@
                 </div>
               </td>
               <td width="10"></td>
-              <td width="50">
+              <td width="80">
                 身份证号:
               </td>
               <td width="150">
@@ -76,7 +76,7 @@
         <table class="table-box" style="margin-top: 10px;">
           <tbody>
             <tr>
-              <td width="40">诊 断:</td>
+              <td width="60">诊 断:</td>
               <td style="text-align:left">
                 <div class="under-line">
                   &nbsp;{{ patientInfo.diagnose ? patientInfo.diagnose : "/" }}
@@ -91,7 +91,7 @@
               <td>
                 <table class="table-box">
                   <tr>
-                    <td style="text-align:left;margin-left:15px">
+                    <td style="text-align:left;margin-left:15px;padding-top:10px;">
                       病情评估:
                       <span class="under-line">&nbsp;{{ receiverTreatmentAccess.sick_condition ? receiverTreatmentAccess.sick_condition : "/" }}</span>
                     </td>
@@ -110,7 +110,7 @@
                     </td>
                   </tr>
                   <tr>
-                    <td style="text-align:left;margin-left:15px">
+                    <td style="text-align:left;margin-left:15px;padding-top:10px;">
                       净化治疗方式:
                       <span class="under-line">&nbsp;{{ prescription.mode ? prescription.mode : "/" }}</span>
                     </td>
@@ -138,7 +138,7 @@
                     </td>
                   </tr>
                   <tr>
-                    <td style="text-align:left;margin-left:15px">
+                    <td style="text-align:left;margin-left:15px;padding-top:10px;">
                       干体重:
                       <span class="under-line">
                         &nbsp;{{ predialysis.dry_weight ? predialysis.dry_weight : "0" }}</span>kg
@@ -161,7 +161,7 @@
                     </td>
                   </tr>
                   <tr>
-                    <td style="text-align:left;margin-left:15px">
+                    <td style="text-align:left;margin-left:15px;padding-top:10px;">
                       血流量:
                       <span class="under-line">
                         &nbsp;{{ prescription.blood_flow_volume ? prescription.blood_flow_volume : "0" }}</span>ml/min
@@ -178,11 +178,11 @@
                       置换液总量:
                       <span class="under-line">
                         &nbsp;{{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "0" }}
-                      </span>
+                      </span>L
                     </td>
                   </tr>
                   <tr>
-                    <td style="text-align:left;margin-left:15px">
+                    <td style="text-align:left;margin-left:15px;padding-top:10px;">
                       抗凝剂:
                       <span class="under-line">
                         &nbsp;{{ prescription.anticoagulant ? prescription.anticoagulant : "/" }}
@@ -195,7 +195,7 @@
                       <span v-if="prescription.anticoagulant == '枸橼酸钠'">mg</span>
                       <span v-if="prescription.anticoagulant == '阿加曲班'">mg</span>
                       <span v-if="prescription.anticoagulant == '低分子肝素'">iu</span>
-                      <span v-if="prescription.anticoagulant == '普通肝素'">iu</span>
+                      <span v-if="prescription.anticoagulant == '普通肝素'">mg</span>
                       <span v-if="prescription.anticoagulant == '无肝素'">mg</span>
                       <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu</span>
                       <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span>&nbsp;
@@ -208,7 +208,7 @@
                       <span v-if="prescription.anticoagulant == '枸橼酸钠'">ml/h</span>
                       <span v-if="prescription.anticoagulant == '阿加曲班'">mg/h</span>
                       <span v-if="prescription.anticoagulant == '低分子肝素'">iu/h</span>
-                      <span v-if="prescription.anticoagulant == '普通肝素'">iu/h</span>
+                      <span v-if="prescription.anticoagulant == '普通肝素'">mg/h</span>
                       <span v-if="prescription.anticoagulant == '无肝素'">mg/h</span>
                       <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu/h</span>
                       <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu/h</span>
@@ -220,14 +220,14 @@
                       <span v-if="prescription.anticoagulant == '枸橼酸钠'">mg</span>
                       <span v-if="prescription.anticoagulant == '阿加曲班'">mg</span>
                       <span v-if="prescription.anticoagulant == '低分子肝素'">iu</span>
-                      <span v-if="prescription.anticoagulant == '普通肝素'">iu</span>
+                      <span v-if="prescription.anticoagulant == '普通肝素'">mg</span>
                       <span v-if="prescription.anticoagulant == '无肝素'">mg</span>
                       <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu</span>
                       <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span>
                     </td>
                   </tr>
                   <tr>
-                    <td style="text-align:left;margin-left:15px">
+                    <td style="text-align:left;margin-left:15px;padding-top:10px;">
                       透析液(mmol/L):
                       <span class="under-line" v-if="prescription.dialysate_formulation == 0">
                         &nbsp; 常规(钾：0&nbsp;,钙：0 &nbsp;,钠：0)
@@ -284,15 +284,19 @@
               <p style="height:20px;line-height:20px">呼吸</p>
               <p style="height:20px;line-height:20px">次/分</p>
             </th>
+            <th style="min-width:60px">
+              <p style="height:20px;line-height:20px">体温</p>
+              <p style="height:20px;line-height:20px">℃</p>
+            </th>
             <th style="min-width:60px">
               <p style="height:20px;line-height:20px">血流量</p>
               <p style="height:20px;line-height:20px">ml/min</p>
             </th>
-            <th style="min-width:60px">
+            <th style="min-width:60px" v-if="org_id!=9990||org_id!=9675">
               <p style="height:20px;line-height:20px">超滤量</p>
               <p style="height:20px;line-height:20px">L</p>
             </th>
-            <th style="min-width:60px">
+            <th style="min-width:60px" v-if="org_id!=9990||org_id!=9675">
               <p style="height:20px;line-height:20px">置换量</p>
               <p style="height:20px;line-height:20px">L</p>
             </th>
@@ -310,7 +314,7 @@
           </tr>
 
           <tr v-for="(monitor, monindex) in monitors" :key="monindex">
-            <td style="min-width:60px;height:30px">
+            <td style="min-width:60px;height:40px">
               {{ getTime(monitor.operate_time, "{h}:{i}") }}
             </td>
             <td>
@@ -331,15 +335,20 @@
             </td>
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
-                {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "0" }}
+                {{ monitor.temperature ? monitor.temperature : "0" }}
               </span>
             </td>
             <td>
+              <span v-if="getTime(monitor.operate_time) != ''">
+                {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "0" }}
+              </span>
+            </td>
+            <td v-if="org_id!=9990||org_id!=9675">
               <span v-if="getTime(monitor.operate_time) != ''">
                 {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "0" }}
               </span>
             </td>
-            <td>
+            <td v-if="org_id!=9990||org_id!=9675">
               <span v-if="getTime(monitor.operate_time) != ''">
                 {{ monitor.displacement_quantity ? monitor.displacement_quantity : "0" }}
               </span>
@@ -372,7 +381,7 @@
               <td style="width:60px;height:40px">
                 <p style="height:20px;line-height:20px">医生签名</p>
               </td>
-              <td style="width:60px;height:40px">
+              <td style="width:70px;height:40px">
                 <p style="height:20px;line-height:20px">医嘱执行时间</p>
               </td>
               <td style="width:60px;height:40px">
@@ -381,7 +390,7 @@
               <td style="width:60px;height:60px">
                 <p style="height:20px;line-height:20px">核对</p>
               </td>
-              <td style="width:60px;height:40px">
+              <td style="width:70px;height:40px">
                 <p style="height:20px;line-height:20px">上次透后体重</p>
               </td>
               <td style="width:60px;height:40px">
@@ -389,8 +398,8 @@
               </td>
             </tr>
 
-            <tr v-for="(advice, advice_index) in tableAdvice">
-              <td>{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
+            <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index">
+              <td style="min-width:60px;height:40px">{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
               <td>
                 <span v-if="advice.parent_id > 0">---></span>
                 <span>{{ advice.advice_name }}</span>
@@ -431,8 +440,8 @@
         <table class="print-table" border="1">
           <td>
             <table class="table-box" style="table-layout:fixed">
-              <tr>
-                <td style="text-align:left;margin-left:15px;width:25%">
+              <tr class="ta_top">
+                <td style="text-align:left;margin-left:15px;width:25%;padding-top:10px;">
                   上机时间:
                   <span class="under-line">{{ getTime(Order.start_time, "{y}-{m}-{d} {h}:{i}") ? getTime(Order.start_time, "{y}-{m}-{d} {h}:{i}") : "0" }}</span>
                 </td>
@@ -456,7 +465,7 @@
                 </td>
               </tr>
 
-              <tr>
+              <tr class="ta_top">
                 <td style="text-align:left;margin-left:15px;width:25%">
                   下机护士:
                   <span class="under-line" v-if="finshForm.url === ''">&nbsp;{{ finshForm.finish_nurse ? finshForm.finish_nurse : "/" }}</span>
@@ -481,7 +490,7 @@
                     {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "0" }}&nbsp;L</span>
                 </td>
               </tr>
-              <tr>
+              <tr class="ta_top">
                 <td style="text-align:left;margin-left:15px">
                   拔针后穿刺点渗血:
                   <span class="under-line" v-if="afterdialysis.puncture_point_oozing_blood === 0">&nbsp;/</span>
@@ -504,7 +513,7 @@
                 </td>
                 <td width="10"></td>
               </tr>
-              <tr>
+              <tr class="ta_top">
                 <td style="text-align:left;margin-left:15px;" colspan="2">
                   并发症:
                   <span class="under-line">&nbsp;{{ afterdialysis.complication }}</span>
@@ -675,7 +684,8 @@ export default {
         finish_nurse: "",
         url: ""
       },
-      displaceLiquiPartOptions: []
+      displaceLiquiPartOptions: [],
+      org_id: 0,
     };
   },
   methods: {
@@ -1492,7 +1502,7 @@ export default {
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
     this.displaceLiquiPartOptions = this.$store.getters.displace_liqui;
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
-
+    this.org_id = this.$store.getters.xt_user.org.id;
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",
       "vascular_access_desc"
@@ -1555,8 +1565,10 @@ export default {
   width: 100%;
   line-height: 23px;
   font-size: 14px;
+
 }
 
+
 .dialysis-print-order .print-table {
   width: 100%;
   text-align: center;
@@ -1636,6 +1648,9 @@ export default {
   padding: 1px 1px;
   /*line-height: 25px;*/
 }
+.table-box .ta_top td{
+  padding-top: 10px !important;
+}
 
 .es-img {
   height: 25px;

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -59,7 +59,7 @@
           <div class="inline_block">
             病区：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121">{{
+              <span v-if="org_id == 10121||org_id == 10138">{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : ""
@@ -429,7 +429,8 @@
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
                     <div class="inline_block" style="flex: 1">
-                      透析方式：
+                      <span v-if="org_id==10138||org_id==9675">治疗模式：</span>
+                      <span v-else>透析方式：</span>
                       <div
                         class="under_line"
                         style="
@@ -1171,8 +1172,8 @@
                           :colspan="
                             prescription.mode_id == 2 ||
                             prescription.mode_id == 5
-                              ? 12
-                              : 11
+                              ? 14
+                              : 13
                           "
                           style="
                             letter-spacing: 5px;
@@ -1187,8 +1188,8 @@
                         </td>
                       </tr>
                       <tr>
-                        <td width="60">时间</td>
-                        <td width="60">血压<br />(mmHg)</td>
+                        <td width="50">时间</td>
+                        <td width="65">血压<br />(mmHg)</td>
                         <td width="50">脉搏<br />(次/分)</td>
                         <td width="50">呼吸<br />(次/分)</td>
                         <td width="50">血流量<br />(ml/min)</td>
@@ -1238,7 +1239,8 @@
                         >
                           置换量<br />(ml)
                         </td>
-                        <td width="200" v-if="org_id == 9919">ktv</td>
+                        <td width="50" v-if="org_id == 9919 || org_id == 9538|| org_id == 9675">KT/V</td>
+                        <td width="50" v-if="org_id == 9538|| org_id == 9675">血容量<br />(L)</td>
                         <td width="200">病情变化及处理</td>
 
                         <!-- <td width="100">时间</td>
@@ -1254,42 +1256,13 @@
                     <td  width="100">护士签名</td> -->
                       </tr>
 
-                      <tr
-                        v-for="(monitor, monindex) in monitors"
-                        :key="monindex"
-                      >
+                      <tr v-for="(monitor, monindex) in monitors" :key="monindex">
                         <td>{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
-                        <td>
-                          {{
-                            monitor.systolic_blood_pressure
-                              ? monitor.systolic_blood_pressure + "/"
-                              : ""
-                          }}
-                          {{
-                            monitor.diastolic_blood_pressure
-                              ? monitor.diastolic_blood_pressure
-                              : ""
-                          }}
-                        </td>
-                        <td>
-                          {{
-                            monitor.pulse_frequency
-                              ? monitor.pulse_frequency
-                              : ""
-                          }}
-                        </td>
-                        <td>
-                          {{
-                            monitor.breathing_rate ? monitor.breathing_rate : ""
-                          }}
-                        </td>
-                        <td>
-                          {{
-                            monitor.blood_flow_volume
-                              ? monitor.blood_flow_volume
-                              : ""
-                          }}
-                        </td>
+                        <td>{{monitor.systolic_blood_pressure? monitor.systolic_blood_pressure + "/": ""}}
+                          {{monitor.diastolic_blood_pressure? monitor.diastolic_blood_pressure: ""}}</td>
+                        <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
+                        <td>{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
+                        <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
                         <td>
                           {{
                             monitor.venous_pressure
@@ -1370,7 +1343,7 @@
                               : ""
                           }}
                         </td>
-                        
+
                         <td
                         >
                           {{
@@ -1403,9 +1376,12 @@
                             }}
                           </span>
                         </td>
-                        <td width="200" v-if="org_id == 9919">
+                        <td width="50" v-if="org_id == 9919 || org_id == 9538|| org_id == 9675">
                           {{ monitor.ktv }}
                         </td>
+                        <td width="50" v-if="org_id == 9538|| org_id == 9675">
+                          {{ monitor.accumulated_blood_volume }}
+                        </td>
                         <td style="line-height: 16px; padding: 0px">
                           <div
                             style="
@@ -1464,7 +1440,8 @@
                           "
                           width="50"
                         ></td>
-                        <td v-if="org_id == 9919"></td>
+                        <td v-if="org_id == 9919||org_id == 9538|| org_id == 9675"></td>
+                        <td v-if="org_id == 9538|| org_id == 9675"></td>
                         <td style="line-height: 16px; padding: 0px">
                           <div
                             style="
@@ -1695,14 +1672,26 @@
             <div class="inline_block">
               病区：
               <div class="under_line" style="width: 50px; text-align: center">
-                {{ "/" }}
-              </div>
+              <span v-if="org_id == 10121||org_id == 10138">{{
+                patientInfo.DialysisSchedule.device_zone.name
+                  ? patientInfo.DialysisSchedule.device_zone.name
+                  : ""
+              }}</span>
+              <span v-else>{{ "/" }}</span>
+            </div>
             </div>
             <div class="inline_block">
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
-                {{ "/" }}
-              </div>
+              <span v-if="org_id == 10121">{{
+                dialysisOrder &&
+                dialysisOrder.DeviceNumber &&
+                dialysisOrder.DeviceNumber.number.length > 0
+                  ? dialysisOrder.DeviceNumber.number
+                  : patientInfo.DialysisSchedule.device_number.number
+              }}</span>
+              <span v-else>{{ "/" }}</span>
+            </div>
             </div>
             <div class="inline_block">
               透析号：
@@ -1711,23 +1700,23 @@
               </div>
             </div>
             <div class="inline_block" style="margin-left: 5px">
-              住院号/门诊号：
-              <div
-                class="under_line"
-                style="width: 70px; text-align: left"
-                v-if="receiverTreatmentAccess.admission_number"
-              >
-                {{ receiverTreatmentAccess.admission_number }}
-              </div>
-              <div
-                class="under_line"
-                style="width: 70px; text-align: left"
-                v-else
-              >
-                {{ "/" }}
-              </div>
+            住院号/门诊号：
+            <div
+              class="under_line"
+              style="width: 70px; text-align: left"
+              v-if="receiverTreatmentAccess.admission_number"
+            >
+              {{ receiverTreatmentAccess.admission_number }}
+            </div>
+            <div
+              class="under_line"
+              style="width: 70px; text-align: left"
+              v-else
+            >
+              {{ "/" }}
             </div>
           </div>
+          </div>
           <div class="row" style="margin-bottom: 10px">
             <div class="inline_block">
               入科方式：
@@ -2055,6 +2044,38 @@
                       min
                     </div>
                   </div>
+                  <!-- <div
+                    class="row"
+                    style="padding: 2px 0; line-height: 23px; display: flex"
+                    v-if="org_id==9538 || org_id==9675"
+                  >
+                  <div class="inline_block" style="flex: 2.5">
+                      KT/V：
+                      <div
+                        class="under_line"
+                        style="
+                          width: 170px;
+                          text-align: center;
+                          white-space: normal;
+                        "
+                      >
+                        {{ afterdialysis.ktv ? afterdialysis.ktv : "/" }}
+                      </div>
+                    </div>
+                     <div class="inline_block" style="flex: 2.5">
+                      累积血容量：
+                      <div
+                        class="under_line"
+                        style="
+                          width: 170px;
+                          text-align: center;
+                          white-space: normal;
+                        "
+                      >
+                        {{ afterdialysis.accumulated_blood_volume ? afterdialysis.accumulated_blood_volume : "/" }}
+                      </div>
+                    </div>
+                  </div> -->
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
@@ -2418,7 +2439,8 @@
                       </div>
                     </div>
                     <div class="inline_block" style="flex: 1">
-                      核对人员：
+                      <span v-if="org_id==10387||org_id==9675" >核对护士：</span> 
+                      <span v-else >核对人员：</span> 
                       <div
                         class="under_line"
                         style="width: 80px; text-align: center"

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -204,6 +204,8 @@
                       ? true
                       : prescription.anticoagulant == '低分子肝素钠'
                       ? true
+                      :prescription.anticoagulant == '低分子肝素'
+                      ? true
                       : false
                   "
                   showValue="低分子肝素："
@@ -212,7 +214,8 @@
                   {{
                     prescription.anticoagulant_zongliang &&
                     (prescription.anticoagulant == "低分子肝素钙" ||
-                      prescription.anticoagulant == "低分子肝素钠")
+                      prescription.anticoagulant == "低分子肝素钠"||
+                      prescription.anticoagulant == "低分子肝素")
                       ? prescription.anticoagulant_zongliang
                       : ""
                   }} </span
@@ -2737,4 +2740,4 @@ export default {
 .table-box1 tr {
   border-bottom: 1px solid #000;
 }
-</style>
+</style>

src/xt_pages/hospitalStation/chargeDetailManagement.vue

@@ -1776,6 +1776,7 @@ export default {
   height: 36px;
   display: flex;
   align-items: center;
+  padding-top: 10px;
 }
 
 .fixedCell {

src/xt_pages/hospitalStation/components/chargeDialog.vue

@@ -80,7 +80,7 @@
     <el-form-item label="支付方式：" style="width:100%;">
          <el-radio-group v-model="form.pay_way">
           <el-radio :label="item.value" :value="item.value" v-for="(item,index) in payWays" :key="index">{{ item.label }}</el-radio>
-           <el-button type="primary" v-if="form.pay_way == 5" @click="reading()">读卡</el-button>
+           <el-button type="primary" v-if="form.pay_way == 4" @click="reading()">读卡</el-button>
 
          </el-radio-group>
       </el-form-item>
@@ -216,7 +216,7 @@
           // {value: 2, label: '银行卡'},
           // {value: 3, label: '微信'},
           // {value: 4, label: '支付宝'},
-          { value: 5, label: '医保卡' },
+          { value: 4, label: '医保卡' },
 
         ],
         total: "",

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -365,7 +365,7 @@
                   <el-input style="width:50%;" @input="searchProjectAction"
                             @keyup.enter.native='searchProjectAction'
                             v-model.trim="search_project_keyword"
-                            placeholder="请输入项目名称"></el-input>
+                            placeholder="请输入项目名称"></el-input><!--住院工作站-->
 
                   <el-select style="float: right;width: 49%;" v-model="value" placeholder=""
                              @change="changeClass">
@@ -667,16 +667,20 @@ export default {
   methods: {
 
     changeClass(id) {
+      console.log("asdaff,id",id)
+      console.log("asdaff,this.value",this.value)
+      console.log("asdaff,this.allProject",this.allProject)
       this.tabProject = []
       if (id == 0) {
         this.tabProject = this.allProject
       } else {
         for (let i = 0; i < this.allProject.length; i++) {
-          if (this.allProject[i].cost_classify == id) {
+          if (this.allProject[i].project.cost_classify == id) {
             this.tabProject.push(this.allProject[i])
           }
         }
       }
+
     },
     setMonthPrescription(month_prescriptions) {
       console.log('~~~~~~~~')
@@ -3401,7 +3405,7 @@ export default {
       // }
       // console.log(res)
       // var idstr = res.join(',')
-
+      this.teamList = []
       let teamList = []
       for (let i = 0; i < row.length; i++) {
         let team_id = row[i].id
@@ -3473,7 +3477,7 @@ export default {
               }
             }
 
-            this.teamList = this.teamList.concat(teamList)
+            this.teamList = teamList
             console.log(this.teamList)
           }
         })

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -471,14 +471,14 @@
               this.$message.error(scope.row.drug_name + '库存不足')
             }
           }
-         
+
         } else {
           if(scope.row.drug.is_user!=1){
             if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
               this.$message.error(scope.row.drug_name + '库存不足')
             }
           }
-        
+
           // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
         }
 
@@ -521,14 +521,14 @@
               this.$message.error(scope.row.drug_name + '库存不足')
            }
           }
-        
+
         } else {
           if(scope.row.drug.is_user!=1){
             if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
               this.$message.error(scope.row.drug_name + '库存不足')
             }
           }
-         
+
         }
       },
       getProjectSingleDose(scope) {

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -72,7 +72,9 @@
                         <el-tab-pane label="电子处方" name="电子处方"></el-tab-pane>
                         <el-tab-pane label="透析记录" name="透析记录"></el-tab-pane>
                         <el-tab-pane label="电子病历" name="电子病历"></el-tab-pane>
+                       
                     </el-tabs>
+                   
                     <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
                         <el-button size="small" ref="button_one" @click="open(1)" type="primary"
                                    v-loading="saveLoading">保存

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -180,9 +180,9 @@
           <!-- 医疗救助 -->
         </div>
         <!-- 大病 -->
-        <!-- <div style="position: absolute;top:340px;left:500px">
-          {{list.order.hifmi_pay?list.order.hifmi_pay:''}}
-        </div> -->
+        <div style="position: absolute;top:340px;left:400px">
+          大病补助：{{list.order.hifmi_pay?list.order.hifmi_pay:'0.00'}}
+        </div>
         <!-- 其他基金支付 -->
         <div style="position: absolute;top:340px;left:560px">
           预交押金:{{(parseFloat(pre_pay_money) + parseFloat(list.order.decimal)).toFixed(2)}}

src/xt_pages/management/components/RepairForm.vue

@@ -35,7 +35,7 @@
         ></el-date-picker>
       </el-col>
       <el-col :span="2">
-        <el-button @click="queryRepair()">查询</el-button>
+        <el-button style="background-color:#409eff;color: #DCDFE6" @click="queryRepair()">查询</el-button>
       </el-col>
     </el-row>
     <el-row style="display: flex;align-items: center;">
@@ -406,6 +406,7 @@
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
+<!--        <button @click="lili">调试</button>-->
         <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="UpdateRepair('guaForm')"
           >保存</el-button
@@ -482,10 +483,12 @@ export default {
       limit: 10,
       page: 1,
       total: 0,
-      filename: ""
     };
   },
   methods: {
+    lili(){
+      console.log("this.guaForm",this.guaForm)
+    },
     changeCheck() {
       this.$refs.multipleTable.clearSelection();
       if (this.checkAllStatus) {
@@ -655,19 +658,21 @@ export default {
       window.location.href = this.guaForm.images;
     },
     UpdateRepair(formName) {
+      console.log("formName",formName)
+      console.log("this.guaForm",this.guaForm)
       this.$refs[formName].validate(valid => {
-        this.guaForm.start_time = uParseTime(
-          this.guaForm.start_time,
-          "{y}-{m}-{d} {h}:{i}"
-        );
-        this.guaForm.arrive_time = uParseTime(
-          this.guaForm.arrive_time,
-          "{y}-{m}-{d} {h}:{i}"
-        );
-        this.guaForm.finish_time = uParseTime(
-          this.guaForm.finish_time,
-          "{y}-{m}-{d} {h}:{i}"
-        );
+        // this.guaForm.start_time = uParseTime(
+        //   this.guaForm.start_time,
+        //   "{y}-{m}-{d} {h}:{i}"
+        // );
+        // this.guaForm.arrive_time = uParseTime(
+        //   this.guaForm.arrive_time,
+        //   "{y}-{m}-{d} {h}:{i}"
+        // );
+        // this.guaForm.finish_time = uParseTime(
+        //   this.guaForm.finish_time,
+        //   "{y}-{m}-{d} {h}:{i}"
+        // );
 
         if (this.guaForm.failure_stage === "") {
           this.guaForm.failure_stage = 0;

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -48,7 +48,7 @@
       <el-form-item label="" style="width:100%;">
 
         <el-radio-group v-model="form.pay_way">
-          <el-radio :label="index" v-for="(item,index) in payWays" :key="index">{{ item.label }}</el-radio>
+          <el-radio :label="item.value" v-for="(item,index) in payWays" :key="index">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
 
@@ -316,6 +316,7 @@
           if (valid) {
             let value = {}
             value = this.getValue()
+            console.log(value)
             this.$emit('confirm', value)
             this.loadingtwo = true
           }

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -638,6 +638,7 @@
           'admin_user_id': this.$store.getters.xt_user.user.id,
           'certificates':this.form.certificates,
         }
+        axios.defaults.retry = 0
         axios.get('http://127.0.0.1:9532/api/readcard', {
           params: params
         })

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -587,7 +587,7 @@
 
 
               } else if (that.form.id_card_type == 2) {
-                this.form.id = patient.id
+                that.form.id = patient.id
                 that.form.name = patient.name
                 that.form.gender = patient.gender
                 that.form.age = patient.age
@@ -610,7 +610,7 @@
                   birth.substr(6, 2)
                 that.form.age = jsGetAge(births, '-')
               }else  {
-                this.form.id = patient.id
+                that.form.id = patient.id
                 that.form.name = patient.name
                 that.form.gender = patient.gender
                 that.form.age = patient.age

src/xt_pages/outpatientCharges/listPrint.vue

@@ -17,8 +17,8 @@
       <printOne v-if="org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id != 0 && org_id!=9675" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
-      <list-print-two v-if="org_id == 10215 || org_id == 0 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>
-      <print-two10265  v-if="org_id == 10265 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
+      <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>
+      <print-two10265  v-if="org_id == 10265 || org_id == 0 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
     </div>
   </div>
 </template>
@@ -189,7 +189,7 @@
                 if (infos.advice && infos.advice.id > 0 && infos.project && infos.project.id == 0) {
                   obj['p_time'] = this.getTimes(infos.advice.prescription.ctime)
                   obj['name'] = infos.advice.drug.drug_name
-                  obj['unit'] = infos.advice.drug.min_unit
+                  obj['unit'] = infos.advice.prescribing_number_unit
                   obj['feedetl_sn'] =  infos.feedetl_sn
                   obj['spec'] =  infos.advice.drug.dose +  infos.advice.drug.dose_unit+"*" + infos.advice.drug.min_number +  infos.advice.drug.min_unit+"/"+infos.advice.drug.max_unit
                   obj['is_total']= 0
@@ -314,7 +314,7 @@
                 obj['name'] = details[a].advice.advice_name
                 // obj['spec'] = details[a].advice.drug.drug_spec
                 obj['spec'] =   details[a].advice.drug.dose +   details[a].advice.drug.dose_unit+"*" +  details[a].advice.drug.min_number +   details[a].advice.drug.min_unit+"/"+ details[a].advice.drug.max_unit
-                obj['unit'] = details[a].advice.drug.max_unit
+                obj['unit'] = details[a].advice.prescribing_number_unit
                 obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
@@ -409,7 +409,7 @@
                 obj['name'] = details[a].advice.advice_name
                 // obj['spec'] = details[a].advice.drug.drug_spec
                 obj['spec'] =   details[a].advice.drug.dose +   details[a].advice.drug.dose_unit+"*" +  details[a].advice.drug.min_number +   details[a].advice.drug.min_unit+"/"+ details[a].advice.drug.max_unit
-                obj['unit'] = details[a].advice.drug.max_unit
+                obj['unit'] = details[a].advice.prescribing_number_unit
                 obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
@@ -570,7 +570,7 @@
         if(this.org_id != 10106){
           if(this.org_id == 10215 || this.org_id == 0|| this.org_id == 9675){
             const style =
-                '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}  .listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;} .allListTable{border: none;width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable tr{page-break-inside:avoid;} .allListTable tr td {padding: 0 5px;border: 1px solid #000;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+              '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}  .listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;} .allListTable{border: none;width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable tr{page-break-inside:avoid;} .allListTable tr td {padding: 0 5px;border: 1px solid #000;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
             printJS({
               printable: 'allList-print',
               type: 'html',
@@ -581,7 +581,7 @@
 
           }else {
             const style =
-                '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;}}'
+              '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;}}'
             printJS({
               printable: 'list-print',
               type: 'html',
@@ -591,7 +591,7 @@
           }
         }else{
           const style =
-          '@media print {#statement-print{font-size:12px;width:800px;margin:0 auto;}.statementTitle{font-size: 22px;text-align: center;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
+            '@media print {#statement-print{font-size:12px;width:800px;margin:0 auto;}.statementTitle{font-size: 22px;text-align: center;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
           printJS({
             printable: "statement-print",
             type: "html",

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -83,26 +83,26 @@
 
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
 
-          <div v-if="org_id == 10340">
-                        <el-button size="small"
-                                   @click="openZb(1)"
-                                   type="primary">登记
-                        </el-button>
+          <div v-if="org_id == 10340 || org_id == 0">
+<!--                        <el-button size="small"-->
+<!--                                   @click="openZb(1)"-->
+<!--                                   type="primary">登记-->
+<!--                        </el-button>-->
 
                         <el-button  size="small"
-                                   @click="openZb(2)"
+                                   @click="openZb(4)"
                                    type="primary">记账
                         </el-button>
 
-                        <el-button   size="small"
-                                   @click="openZb(3)"
-                                   type="primary">撤销记账
-                        </el-button>
+<!--                        <el-button   size="small"-->
+<!--                                   @click="openZb(3)"-->
+<!--                                   type="primary">撤销记账-->
+<!--                        </el-button>-->
 
           </div>
 
 
-          <div  v-if="org_id != 10340">
+          <div  v-if="org_id != 10340 || org_id != 0">
 <!--            <el-button size="small"-->
 <!--                       @click="openZb(1)"-->
 <!--                       type="primary">登记-->
@@ -120,7 +120,7 @@
 
             <el-button v-loading="loadingone" size="small"
                        @click="open(40)"
-                       v-if="org_id == 10191"
+                       v-if="org_id == 10191 || org_id == 10318"
                        type="primary">登陆
             </el-button>
 
@@ -2722,7 +2722,148 @@ export default {
       }
     }, openZb(index) {
       switch (index) {
-        case 1:
+        // case 1:
+        //   if(this.patientInfo.id == 0){
+        //     this.$message.error("请需要选择挂号的患者")
+        //     return
+        //   }
+        //   if(this.big_prescriptions.length == 0){
+        //     this.$message.error("处方不能为空")
+        //     return
+        //   }
+        //   if(this.form.diagnosis.length == 0){
+        //     this.$message.error("诊断不能为空")
+        //     return
+        //   }
+        //   var that = this
+        //   let obj = {
+        //     patient_id: this.patientInfo.id,
+        //     diagnosis_time: this.form.diagnosis_time,
+        //     record_date: this.record_date,
+        //     admin_user_id: this.$store.getters.xt_user.user.id,
+        //     org_id: this.$store.getters.xt_user.org_id
+        //
+        //   }
+        //   axios.get(process.env.BASE_API +'/coordinate/register', {
+        //     params: obj
+        //   })
+        //       .then(function(response) {
+        //         if (response.data.state == 0) {
+        //           that.$message.error(response.data.msg)
+        //           that.loadingtwo = false
+        //           return false
+        //         } else {
+        //           if (response.data.data.failed_code == -10) {
+        //             that.$confirm(response.data.data.msg, '医保错误信息', {
+        //               confirmButtonText: '确 定',
+        //               type: 'warning'
+        //             }).then(() => {
+        //
+        //             }).catch(() => {
+        //             })
+        //
+        //           } else {
+        //             that.radio = 1
+        //             that.changeRadioAndPatient(1)
+        //             that.$message({ message: '登记成功', type: 'success', duration: 5000 })
+        //           }
+        //
+        //         }
+        //       })
+        //       .catch(function(error) {
+        //
+        //       })
+        //
+        //   break
+        // case 2:
+        //   var that = this
+        //   var obj2 = {
+        //     id: this.patientInfo.id,
+        //     record_time: this.record_date,
+        //     his_patient_id: this.hisPatientInfo.id,
+        //     org_id: this.$store.getters.xt_user.org_id,
+        //     p_type:14,
+        //
+        //   }
+        //   obj2['diagnosis'] = this.form.diagnosis.join(',')
+        //   obj2['sick_type'] = this.form.sick_type
+        //   if (this.activeName == 'first') {
+        //     obj2['settle_accounts_type'] = 1
+        //   } else if (this.activeName == 'second') {
+        //     obj2['start_time'] = this.other_start_time
+        //     obj2['end_time'] = this.other_end_time
+        //     obj2['settle_accounts_type'] = 2
+        //   }
+        //   axios.get(process.env.BASE_API  + '/coordinate/opKeepAccounts', {
+        //     params: obj2
+        //   })
+        //       .then(function(response) {
+        //         if (response.data.state == 0) {
+        //           that.$message.error(response.data.msg)
+        //           that.loadingtwo = false
+        //           return false
+        //         } else {
+        //           if (response.data.data.failed_code == -10) {
+        //             that.$confirm(response.data.data.msg, '医保错误信息', {
+        //               confirmButtonText: '确 定',
+        //               type: 'warning'
+        //             }).then(() => {
+        //
+        //             }).catch(() => {
+        //             })
+        //
+        //           } else {
+        //             that.radio = 1
+        //             that.changeRadioAndPatient(1)
+        //             that.$message({ message: '记账成功', type: 'success', duration: 5000 })
+        //           }
+        //
+        //         }
+        //       })
+        //       .catch(function(error) {
+        //
+        //       })
+        //
+        //   break
+        // case 3:
+        //   var that = this
+        //   let obj3 = {
+        //     order_id:this.order.id,
+        //     admin_user_id: this.$store.getters.xt_user.user.id,
+        //     org_id: this.$store.getters.xt_user.org_id
+        //   }
+        //   axios.get(process.env.BASE_API + '/coordinate/opCancelKeepAccounts', {
+        //     params: obj3
+        //   })
+        //       .then(function(response) {
+        //         if (response.data.state == 0) {
+        //           that.$message.error(response.data.msg)
+        //           that.loadingtwo = false
+        //           return false
+        //         } else {
+        //           if (response.data.data.failed_code == -10) {
+        //             that.$confirm(response.data.data.msg, '医保错误信息', {
+        //               confirmButtonText: '确 定',
+        //               type: 'warning'
+        //             }).then(() => {
+        //
+        //             }).catch(() => {
+        //             })
+        //
+        //           } else {
+        //             that.radio = 1
+        //             that.changeRadioAndPatient(1)
+        //             that.$message({ message: '撤销记账成功', type: 'success', duration: 5000 })
+        //           }
+        //
+        //         }
+        //       })
+        //       .catch(function(error) {
+        //
+        //       })
+        //
+        //   break
+        case 4:
           if(this.patientInfo.id == 0){
             this.$message.error("请需要选择挂号的患者")
             return
@@ -2735,105 +2876,26 @@ export default {
             this.$message.error("诊断不能为空")
             return
           }
-          var that = this
           let obj = {
             patient_id: this.patientInfo.id,
             diagnosis_time: this.form.diagnosis_time,
             record_date: this.record_date,
             admin_user_id: this.$store.getters.xt_user.user.id,
-            org_id: this.$store.getters.xt_user.org_id
-
-          }
-          axios.get(process.env.BASE_API +'/coordinate/register', {
-            params: obj
-          })
-              .then(function(response) {
-                if (response.data.state == 0) {
-                  that.$message.error(response.data.msg)
-                  that.loadingtwo = false
-                  return false
-                } else {
-                  if (response.data.data.failed_code == -10) {
-                    that.$confirm(response.data.data.msg, '医保错误信息', {
-                      confirmButtonText: '确 定',
-                      type: 'warning'
-                    }).then(() => {
-
-                    }).catch(() => {
-                    })
-
-                  } else {
-                    that.radio = 1
-                    that.changeRadioAndPatient(1)
-                    that.$message({ message: '登记成功', type: 'success', duration: 5000 })
-                  }
-
-                }
-              })
-              .catch(function(error) {
-
-              })
-
-          break
-        case 2:
-          var that = this
-          var obj2 = {
-            id: this.patientInfo.id,
-            record_time: this.record_date,
             his_patient_id: this.hisPatientInfo.id,
-            org_id: this.$store.getters.xt_user.org_id,
-            p_type:14,
-
+            p_type:14
           }
-          obj2['diagnosis'] = this.form.diagnosis.join(',')
-          obj2['sick_type'] = this.form.sick_type
+          obj['diagnosis'] = this.form.diagnosis.join(',')
+          obj['sick_type'] = this.form.sick_type
           if (this.activeName == 'first') {
-            obj2['settle_accounts_type'] = 1
+            obj['settle_accounts_type'] = 1
           } else if (this.activeName == 'second') {
-            obj2['start_time'] = this.other_start_time
-            obj2['end_time'] = this.other_end_time
-            obj2['settle_accounts_type'] = 2
+            obj['start_time'] = this.other_start_time
+            obj['end_time'] = this.other_end_time
+            obj['settle_accounts_type'] = 2
           }
-          axios.get(process.env.BASE_API  + '/coordinate/opKeepAccounts', {
-            params: obj2
-          })
-              .then(function(response) {
-                if (response.data.state == 0) {
-                  that.$message.error(response.data.msg)
-                  that.loadingtwo = false
-                  return false
-                } else {
-                  if (response.data.data.failed_code == -10) {
-                    that.$confirm(response.data.data.msg, '医保错误信息', {
-                      confirmButtonText: '确 定',
-                      type: 'warning'
-                    }).then(() => {
-
-                    }).catch(() => {
-                    })
-
-                  } else {
-                    that.radio = 1
-                    that.changeRadioAndPatient(1)
-                    that.$message({ message: '记账成功', type: 'success', duration: 5000 })
-                  }
-
-                }
-              })
-              .catch(function(error) {
-
-              })
-
-          break
-        case 3:
           var that = this
-          let obj3 = {
-            order_id:this.order.id,
-            admin_user_id: this.$store.getters.xt_user.user.id,
-            org_id: this.$store.getters.xt_user.org_id
-          }
-          axios.get(process.env.BASE_API + '/coordinate/opCancelKeepAccounts', {
-            params: obj3
+          axios.get(process.env.BASE_API  + '/coordinate/settleAccount', {
+            params: obj
           })
               .then(function(response) {
                 if (response.data.state == 0) {
@@ -2853,7 +2915,7 @@ export default {
                   } else {
                     that.radio = 1
                     that.changeRadioAndPatient(1)
-                    that.$message({ message: '撤销记账成功', type: 'success', duration: 5000 })
+                    that.$message({ message: '记账成功', type: 'success', duration: 5000 })
                   }
 
                 }
@@ -2912,9 +2974,9 @@ export default {
             this.pwd = ''
           } else {
             if (this.activeName == 'first') {
-              this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder)
+              this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)
             } else {
-              this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder)
+              this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)
             }
 
           }
@@ -2922,7 +2984,7 @@ export default {
           if (this.activeName == 'first') {/////////////////////////押金shows
             this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)
           } else {
-            this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder)
+            this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)
           }
         }
 
@@ -4527,7 +4589,6 @@ export default {
                       price: prescription.project[b].price,
                       remark: prescription.project[b].remark,
                       // medical_code: prescription.project[b].project.medical_code,
-                      unit: prescription.project[b].unit,
                       type: prescription.project[b].type,
                       execution_state: prescription.project[b].execution_state,
 
@@ -4545,14 +4606,14 @@ export default {
                       obj['project_name'] = prescription.project[b].project.project_name
                       obj['spec'] = ''
                       obj['name_id'] = 0
-
+                      obj['unit']=  prescription.project[b].project.unit
                     } else if (prescription.project[b].type == 3) {
                       obj['statistical_classification'] = ''
                       obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                       obj['project_name'] = prescription.project[b].good_info.good_name
                       obj['spec'] = prescription.project[b].good_info.specification_name
                       obj['name_id'] = prescription.project[b].good_info.manufacturer
-
+                      obj['unit']=  prescription.project[b].good_info.packing_unit
                     }
 
                     tempProject.push(obj)

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -2,19 +2,20 @@
   <div>
     <template>
       <el-button
-        style="position: fixed; right: 25px; z-index: 999"
-        :loading="loading"
-        size="small"
-        icon="el-icon-printer"
-        @click="printThisPage"
-        type="primary"
-        >打印</el-button
+          style="position: fixed; right: 25px; z-index: 999"
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+      >打印
+      </el-button
       >
     </template>
 
     <div class="dialysisPage" style="padding-top: 40px">
       <div
-        v-if="
+          v-if="
           org_id == 9990 ||
           org_id == 10138 ||
           org_id == 9504 ||
@@ -25,26 +26,26 @@
       >
         <printTwo :info="info" v-if="org_id == 9990"></printTwo>
         <printThree
-          :info="info"
-          :paramsObj="paramsObj"
-          :balanceAccounts="balanceAccounts"
-          v-if="org_id == 10138 || org_id == 4 || org_id == 10278"
+            :info="info"
+            :paramsObj="paramsObj"
+            :balanceAccounts="balanceAccounts"
+            v-if="org_id == 10138 || org_id == 4 || org_id == 10278"
         ></printThree>
         <printFour
-          v-if="org_id == 9504 || org_id == 10028 || org_id == 10088"
-          :info="info"
-          :paramsObj="paramsObj"
-          :balanceAccounts="balanceAccounts"
+            v-if="org_id == 9504 || org_id == 10028 || org_id == 10088"
+            :info="info"
+            :paramsObj="paramsObj"
+            :balanceAccounts="balanceAccounts"
         ></printFour>
         <!--        <privateChargePrint  :info="info" v-if="org_id == 10215 && this.paramsObj.balance_accounts_type == 2"></privateChargePrint>-->
       </div>
       <!--      <print-other :info="info" v-if="org_id == 9919"></print-other>-->
       <!--      <printOne :info=" info" v-if="org_id == 10215 && this.paramsObj.balance_accounts_type == 2"></printOne>-->
       <printFive
-        v-if="org_id == 0"
-        :info="info"
-        :paramsObj="paramsObj"
-        :balanceAccounts="balanceAccounts"
+          v-if="org_id == 0  || org_id == 10191"
+          :info="info"
+          :paramsObj="paramsObj"
+          :balanceAccounts="balanceAccounts"
       ></printFive>
       <printOne :info="info" v-else></printOne>
       <!-- 测试医保环境下表格样式放开以下这条 -->
@@ -54,14 +55,10 @@
 </template>
 
 <script>
-import { parseTime } from "@/utils";
-import { getDialysisRecord } from "@/api/dialysis";
-import { getDataConfig } from "@/utils/data";
-import { jsGetAge, uParseTime } from "@/utils/tools";
+import {uParseTime} from "@/utils/tools";
 import axios from "axios";
 
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import print from "print-js";
 import printOne from "./statementTemplate/printOne";
 import privateChargePrint from "./statementTemplate/privateChargePrint";
 
@@ -70,12 +67,8 @@ import printThree from "./statementTemplate/printThree";
 import printFour from "./statementTemplate/printFour";
 import printFive from "./statementTemplate/printFive";
 import testVue from "./statementTemplate/test";
-import {
-  getAllDoctorList,
-  getAllHisPatientList,
-  getPrescriptionPrint,
-} from "@/api/project/project";
-import { getPrivateExpenses, getPrivateExpensesOrder } from "@/api/his/his";
+import {getAllDoctorList, getAllHisPatientList,} from "@/api/project/project";
+import {getPrivateExpenses, getPrivateExpensesOrder} from "@/api/his/his";
 // import PrintOther from '../hospitalStation/statementTemplate/printOther'
 export default {
   name: "dialysisPrintOrder",
@@ -95,8 +88,8 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "门诊医生站" },
-        { path: false, name: "打印" },
+        {path: false, name: "门诊医生站"},
+        {path: false, name: "打印"},
       ],
       record_date: "",
       patientTableData: [],
@@ -119,35 +112,35 @@ export default {
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       if (
-        this.$store.getters.xt_user.org_id == 10138 ||
-        this.$store.getters.xt_user.org_id == 4 ||
-        this.$store.getters.xt_user.org_id == 10278
+          this.$store.getters.xt_user.org_id == 10138 ||
+          this.$store.getters.xt_user.org_id == 4 ||
+          this.$store.getters.xt_user.org_id == 10278
       ) {
         setTimeout(() => {
           const style =
-            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 47%;}}}";
+              "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 47%;}}}";
           const style2 =
-            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 50%;}}}";
+              "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 50%;}}}";
           const style3 =
-            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 55%;}}}";
+              "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 55%;}}}";
           const style4 =
-            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 58%;}}}";
+              "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 58%;}}}";
           const style5 =
-            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 61%;}}}";
+              "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 61%;}}}";
           const style6 =
-            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 66%;}}}";
+              "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 66%;}}}";
           const style7 =
-            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 71%;}}}";
+              "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 71%;}}}";
           const style8 =
-            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 75%;}}}";
+              "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 75%;}}}";
           const style9 =
-            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 80%;}}}";
+              "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 80%;}}}";
           const style10 =
-            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 85%;}}}";
+              "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 85%;}}}";
           const style11 =
-            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 87%;}}}";
+              "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 87%;}}}";
           const style12 =
-            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 89%;}}}";
+              "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 89%;}}}";
           if (this.num >= 13) {
             printJS({
               printable: "prescription-print",
@@ -235,11 +228,11 @@ export default {
           }
         }, 500);
       } else if (
-        this.$store.getters.xt_user.org_id == 9504 ||
-        this.$store.getters.xt_user.org_id == 10028
+          this.$store.getters.xt_user.org_id == 9504 ||
+          this.$store.getters.xt_user.org_id == 10028
       ) {
         const style =
-          "@media print {.printTitle{font-size: 20px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;font-size:12px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;font-size:12px;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none;font-size:12px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;font-size:12px;}.actionBar div{width:150px;}}";
+            "@media print {.printTitle{font-size: 20px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;font-size:12px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;font-size:12px;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none;font-size:12px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;font-size:12px;}.actionBar div{width:150px;}}";
         printJS({
           printable: "prescription-print",
           type: "html",
@@ -249,11 +242,11 @@ export default {
       } else {
         // 医保环境打印格式
         if (
-          this.$store.getters.xt_user.org_id == 9919 ||
-          this.$store.getters.xt_user.org_id == 10106
+            this.$store.getters.xt_user.org_id == 9919 ||
+            this.$store.getters.xt_user.org_id == 10106
         ) {
           const style =
-            "@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}";
+              "@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}";
           printJS({
             printable: "statement-print",
             type: "html",
@@ -261,11 +254,11 @@ export default {
             scanStyles: false,
           });
         } else if (
-          this.$store.getters.xt_user.org_id == 0 ||
-          this.$store.getters.xt_user.org_id == 10191
+            this.$store.getters.xt_user.org_id == 0 ||
+            this.$store.getters.xt_user.org_id == 10191
         ) {
           const style =
-            "@media print {.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;} .statementTable thead{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;} .statementTable tbody{text-align:left;} .statementTable tbody .view_tr{text-align:center;border: 1px solid;} tbody .dashed_tr{border: 1px dashed;text-align:center} .list_table{width: 100%;margin-bottom: 100px;} tbody tr td div{height:25px;}}";
+              "@media print {.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;} .statementTable thead{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;} .statementTable tbody{text-align:left;} .statementTable tbody .view_tr{text-align:center;border: 1px solid;} tbody .dashed_tr{border: 1px dashed;text-align:center} .list_table{width: 100%;margin-bottom: 100px;} tbody tr td div{height:25px;}}";
           printJS({
             printable: "statement-print",
             type: "html",
@@ -274,7 +267,7 @@ export default {
           });
         } else {
           const style =
-            "@media print {#statement-print{font-size:14px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;}table{border-collapse: collapse;text-align: center;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 57%;}}}";
+              "@media print {#statement-print{font-size:14px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;}table{border-collapse: collapse;text-align: center;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 57%;}}}";
           printJS({
             printable: "statement-print",
             type: "html",
@@ -316,14 +309,14 @@ export default {
           let cal_two = 0;
           for (let i = 0; i < response.data.data.list.length; i++) {
             if (
-              response.data.data.list[i].prescription == null ||
-              response.data.data.list[i].prescription.length == 0
+                response.data.data.list[i].prescription == null ||
+                response.data.data.list[i].prescription.length == 0
             ) {
               cal_one = cal_one + 1;
             }
             if (
-              response.data.data.list[i].prescription != null &&
-              response.data.data.list[i].prescription.length > 0
+                response.data.data.list[i].prescription != null &&
+                response.data.data.list[i].prescription.length > 0
             ) {
               cal_two = cal_two + 1;
             }
@@ -366,7 +359,8 @@ export default {
     getTimes(time) {
       return uParseTime(time, "{y}-{m}-{d}");
     },
-    searchAction() {},
+    searchAction() {
+    },
     getInfo(order_id, obj) {
       // 模拟数据
       // let datainfo =
@@ -375,7 +369,7 @@ export default {
       // console.log(json, "json");
       // this.info = json.data.info
       //
-      if (obj.balance_accounts_type == 2) {
+      if (obj.balance_accounts_type == 2 ) {
         let params = {
           his_patient_id: obj.his_patient_id,
           id: obj.order_id,
@@ -383,9 +377,9 @@ export default {
           admin_user_id: this.$store.getters.xt_user.user.id,
         };
         if (
-          this.org_id == 10138 ||
-          this.$store.getters.xt_user.org_id == 4 ||
-          this.org_id == 10278
+            this.org_id == 10138 ||
+            this.$store.getters.xt_user.org_id == 4 ||
+            this.org_id == 10278
         ) {
           getPrivateExpenses(params).then((response) => {
             if (response.data.state == 0) {
@@ -507,7 +501,7 @@ export default {
               console.log(111, this.balanceAccounts);
             }
           });
-        } else if (this.org_id == 10215 || this.org_id == 0) {
+        } else if (this.org_id == 10215 ) {
           getPrivateExpensesOrder(params).then((response) => {
             if (response.data.state == 0) {
               // this.$message.error(response.data.msg)
@@ -535,62 +529,62 @@ export default {
 
               that.info["bed_cost_total"] = response.data.data.bedCostTotal;
               that.info["bed_cost_self_total"] =
-                response.data.data.bedCostSelfTotal;
+                  response.data.data.bedCostSelfTotal;
               that.info["bed_cost_part_self_total"] =
-                response.data.data.bedCostPartSelfTotal;
+                  response.data.data.bedCostPartSelfTotal;
 
               that.info["operation_cost_total"] =
-                response.data.data.operationCostTotal;
+                  response.data.data.operationCostTotal;
               that.info["operation_cost_self_total"] =
-                response.data.data.operationCostSelfTotal;
+                  response.data.data.operationCostSelfTotal;
               that.info["operation_cost_part_self_total"] =
-                response.data.data.operationCostPartSelfTotal;
+                  response.data.data.operationCostPartSelfTotal;
 
               that.info["other_cost_total"] = response.data.data.otherCostTotal;
               that.info["other_cost_self_total"] =
-                response.data.data.otherCostSelfTotal;
+                  response.data.data.otherCostSelfTotal;
               that.info["other_cost_part_self_total"] =
-                response.data.data.otherCostPartSelfTotal;
+                  response.data.data.otherCostPartSelfTotal;
 
               that.info["material_cost_total"] =
-                response.data.data.materialCostTotal;
+                  response.data.data.materialCostTotal;
               that.info["material_cost_self_total"] =
-                response.data.data.materialCostSelfTotal;
+                  response.data.data.materialCostSelfTotal;
               that.info["material_cost_part_self_total"] =
-                response.data.data.materialCostPartSelfTotal;
+                  response.data.data.materialCostPartSelfTotal;
 
               that.info["western_medicine_cost_total"] =
-                response.data.data.westernMedicineCostTotal;
+                  response.data.data.westernMedicineCostTotal;
               that.info["western_medicine_cost_self_total"] =
-                response.data.data.westernMedicineCostSelfTotal;
+                  response.data.data.westernMedicineCostSelfTotal;
               that.info["western_medicine_cost_part_self_total"] =
-                response.data.data.westernMedicineCostPartSelfTotal;
+                  response.data.data.westernMedicineCostPartSelfTotal;
 
               that.info["chinese_traditional_medicine_cost_total"] =
-                response.data.data.chineseTraditionalMedicineCostTotal;
+                  response.data.data.chineseTraditionalMedicineCostTotal;
               that.info["chinese_traditional_medicine_cost_self_total"] =
-                response.data.data.chineseTraditionalMedicineCostSelfTotal;
+                  response.data.data.chineseTraditionalMedicineCostSelfTotal;
               that.info["chinese_traditional_medicine_cost_part_self_total"] =
-                response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
+                  response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
 
               that.info["check_cost_total"] = response.data.data.checkCostTotal;
               that.info["check_cost_self_total"] =
-                response.data.data.checkCostSelfTotal;
+                  response.data.data.checkCostSelfTotal;
               that.info["check_cost_part_self_total"] =
-                response.data.data.checkCostPartSelfTotal;
+                  response.data.data.checkCostPartSelfTotal;
 
               that.info["laboratory_cost_total"] =
-                response.data.data.laboratoryCostTotal;
+                  response.data.data.laboratoryCostTotal;
               that.info["laboratory_cost_self_total"] =
-                response.data.data.laboratoryCostSelfTotal;
+                  response.data.data.laboratoryCostSelfTotal;
               that.info["laboratory_cost_part_self_total"] =
-                response.data.data.laboratoryCostPartSelfTotal;
+                  response.data.data.laboratoryCostPartSelfTotal;
 
               that.info["treat_cost_total"] = response.data.data.treatCostTotal;
               that.info["treat_cost_self_total"] =
-                response.data.data.treatCostSelfTotal;
+                  response.data.data.treatCostSelfTotal;
               that.info["treat_cost_part_self_total"] =
-                response.data.data.treatCostPartSelfTotal;
+                  response.data.data.treatCostPartSelfTotal;
               that.info["date"] = response.data.data.date;
               // that.info["number"] = response.data.data.number;
               that.info["order_infos"] = response.data.data.order_infos;
@@ -655,168 +649,372 @@ export default {
                 that.info.begndate = that.getTimes(that.paramsObj.start_time);
                 that.info.enddate = that.getTimes(that.paramsObj.end_time);
               }
+
+              that.info.order_infos.map((item) => {
+
+              });
+
             }
           });
-        }
-      } else {
-        var that = this;
-        axios
-          .get("http://127.0.0.1:9532/api/settle/query", {
-            params: {
-              order_id: order_id,
-              admin_user_id: this.$store.getters.xt_user.user.id,
-            },
-          })
-          .then(function (response) {
+        } else if (this.org_id == 10191 || this.org_id == 0) {
+
+          getPrivateExpensesOrder(params).then((response) => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
+              // this.$message.error(response.data.msg)
+
               return false;
             } else {
-              console.log(response.data.data.info);
+              var that = this;
               that.info = response.data.data.info;
               that.p_admin = response.data.data.printor_admin;
               that.charge_admin = response.data.data.charge_admin;
 
               that.info["p_admin"] = that.p_admin;
               that.info["charge_admin"] = that.charge_admin;
-
               that.info["order_number"] = response.data.data.order_number;
               that.info["patient"] = response.data.data.patient;
               that.info["date"] = response.data.data.date;
               that.info["number"] = response.data.data.number;
               that.info["order_infos"] = response.data.data.order_infos;
               that.info["diagnosis"] = response.data.data.diagnosis;
-              that.info["org_code"] = response.data.data.org_code;
-              that.info["org_name"] = response.data.data.org_name;
-              that.info["doctor_code"] = response.data.data.doctor_code;
-              that.info["department"] = response.data.data.department;
-              that.info["health_card_no"] = response.data.data.health_card_no;
+              that.info["fixmedins_name"] = response.data.data.org_name;
+              that.info["fixmedins_code"] = response.data.data.org_code;
+              // that.info["doctor_code"] = response.data.data.doctor_code;
+              // that.info["department"] = response.data.data.department;
+              // that.info["health_card_no"] = response.data.data.health_card_no;
 
               that.info["bed_cost_total"] = response.data.data.bedCostTotal;
               that.info["bed_cost_self_total"] =
-                response.data.data.bedCostSelfTotal;
+                  response.data.data.bedCostSelfTotal;
               that.info["bed_cost_part_self_total"] =
-                response.data.data.bedCostPartSelfTotal;
+                  response.data.data.bedCostPartSelfTotal;
 
               that.info["operation_cost_total"] =
-                response.data.data.operationCostTotal;
+                  response.data.data.operationCostTotal;
               that.info["operation_cost_self_total"] =
-                response.data.data.operationCostSelfTotal;
+                  response.data.data.operationCostSelfTotal;
               that.info["operation_cost_part_self_total"] =
-                response.data.data.operationCostPartSelfTotal;
+                  response.data.data.operationCostPartSelfTotal;
 
               that.info["other_cost_total"] = response.data.data.otherCostTotal;
               that.info["other_cost_self_total"] =
-                response.data.data.otherCostSelfTotal;
+                  response.data.data.otherCostSelfTotal;
               that.info["other_cost_part_self_total"] =
-                response.data.data.otherCostPartSelfTotal;
+                  response.data.data.otherCostPartSelfTotal;
 
               that.info["material_cost_total"] =
-                response.data.data.materialCostTotal;
+                  response.data.data.materialCostTotal;
               that.info["material_cost_self_total"] =
-                response.data.data.materialCostSelfTotal;
+                  response.data.data.materialCostSelfTotal;
               that.info["material_cost_part_self_total"] =
-                response.data.data.materialCostPartSelfTotal;
+                  response.data.data.materialCostPartSelfTotal;
 
               that.info["western_medicine_cost_total"] =
-                response.data.data.westernMedicineCostTotal;
+                  response.data.data.westernMedicineCostTotal;
               that.info["western_medicine_cost_self_total"] =
-                response.data.data.westernMedicineCostSelfTotal;
+                  response.data.data.westernMedicineCostSelfTotal;
               that.info["western_medicine_cost_part_self_total"] =
-                response.data.data.westernMedicineCostPartSelfTotal;
+                  response.data.data.westernMedicineCostPartSelfTotal;
 
               that.info["chinese_traditional_medicine_cost_total"] =
-                response.data.data.chineseTraditionalMedicineCostTotal;
+                  response.data.data.chineseTraditionalMedicineCostTotal;
               that.info["chinese_traditional_medicine_cost_self_total"] =
-                response.data.data.chineseTraditionalMedicineCostSelfTotal;
+                  response.data.data.chineseTraditionalMedicineCostSelfTotal;
               that.info["chinese_traditional_medicine_cost_part_self_total"] =
-                response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
+                  response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
 
               that.info["check_cost_total"] = response.data.data.checkCostTotal;
               that.info["check_cost_self_total"] =
-                response.data.data.checkCostSelfTotal;
+                  response.data.data.checkCostSelfTotal;
               that.info["check_cost_part_self_total"] =
-                response.data.data.checkCostPartSelfTotal;
+                  response.data.data.checkCostPartSelfTotal;
 
               that.info["laboratory_cost_total"] =
-                response.data.data.laboratoryCostTotal;
+                  response.data.data.laboratoryCostTotal;
               that.info["laboratory_cost_self_total"] =
-                response.data.data.laboratoryCostSelfTotal;
+                  response.data.data.laboratoryCostSelfTotal;
               that.info["laboratory_cost_part_self_total"] =
-                response.data.data.laboratoryCostPartSelfTotal;
+                  response.data.data.laboratoryCostPartSelfTotal;
 
               that.info["treat_cost_total"] = response.data.data.treatCostTotal;
               that.info["treat_cost_self_total"] =
-                response.data.data.treatCostSelfTotal;
+                  response.data.data.treatCostSelfTotal;
               that.info["treat_cost_part_self_total"] =
-                response.data.data.treatCostPartSelfTotal;
+                  response.data.data.treatCostPartSelfTotal;
               that.info["date"] = response.data.data.date;
-              that.info["number"] = response.data.data.number;
+              // that.info["number"] = response.data.data.number;
               that.info["order_infos"] = response.data.data.order_infos;
               that.info["diagnosis"] = response.data.data.diagnosis;
 
-              let obj = {
-                type: 1,
-                details: [],
-                total: 0,
-              };
-              let obj2 = {
-                type: 2,
-                details: [],
-                total: 0,
-              };
-              let obj3 = {
-                type: 3,
-                details: [],
-                total: 0,
-              };
 
-              let obj4 = {
-                type: 4,
-                details: [],
-                total: 0,
-              };
-              let num = 0;
-              that.info.order_infos.map((item) => {
-                if (item.advice_id > 0) {
-                  obj.details.push(item);
-                  obj.total += item.pric * item.advice.prescribing_number;
-                  num++;
-                } else {
-                  if (item.project.type == 2) {
-                    obj2.details.push(item);
-                    obj2.total += item.pric * item.project.count;
+              let list = []
+              for (let i = 0; i < response.data.data.order_infos.length; i++) {
+                let order = response.data.data.order_infos[i]
+                let obj = {
+                  name: "",
+                  spec: "",
+                  cnt: "",
+                  det_item_fee_sumamt: "",
+                }
+
+                if (order.advice_id > 0 && order.project_id == 0) {
+                  obj.name = order.advice.advice_name
+                  let spec = order.advice.drug.dose + order.advice.drug.dose_unit + '*' + order.advice.drug.min_number + order.advice.drug.min_unit + '/' + order.advice.drug.max_unit
+                  obj.spec = spec
+                  obj.cnt = order.cnt
+                  obj.det_item_fee_sumamt =order.det_item_fee_sumamt
+                  list.push(obj)
+
+                }else if (order.advice_id == 0 && order.project_id > 0) {
+                  if(order.project.type == 2){
+                    obj.name = order.project.project.project_name
+                    obj.spec = ""
+                    obj.cnt = order.cnt
+                    obj.det_item_fee_sumamt =order.det_item_fee_sumamt
+
+                  }else{
+                    obj.name = order.project.good_info.good_name
+                    obj.spec = order.project.good_info.specification_name
+                    obj.cnt = order.cnt
+                    obj.det_item_fee_sumamt =order.det_item_fee_sumamt
+                  }
+                  list.push(obj)
+                }
+
+              }
+              let len = list.length / 2
+              let L_list = []
+              let R_list = []
+
+              for(let i = 0; i < len; i++){
+                L_list.push(list[i])
+              }
+              for(let i = len; i < list.length; i++){
+                R_list.push(list[i])
+              }
+              that.info["L_list"] = L_list
+              that.info["R_list"] = R_list
+
+
+
+
+
+
+            }
+          });
+        }
+
+      } else {
+        var that = this;
+        axios
+            .get("http://127.0.0.1:9532/api/settle/query", {
+              params: {
+                order_id: order_id,
+                admin_user_id: this.$store.getters.xt_user.user.id,
+              },
+            })
+            .then(function (response) {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg);
+                return false;
+              } else {
+                console.log(response.data.data.info);
+                that.info = response.data.data.info;
+                that.p_admin = response.data.data.printor_admin;
+                that.charge_admin = response.data.data.charge_admin;
+
+                that.info["p_admin"] = that.p_admin;
+                that.info["charge_admin"] = that.charge_admin;
+
+                that.info["order_number"] = response.data.data.order_number;
+                that.info["patient"] = response.data.data.patient;
+                that.info["date"] = response.data.data.date;
+                that.info["number"] = response.data.data.number;
+                that.info["order_infos"] = response.data.data.order_infos;
+                that.info["diagnosis"] = response.data.data.diagnosis;
+                that.info["org_code"] = response.data.data.org_code;
+                that.info["org_name"] = response.data.data.org_name;
+                that.info["doctor_code"] = response.data.data.doctor_code;
+                that.info["department"] = response.data.data.department;
+                that.info["health_card_no"] = response.data.data.health_card_no;
+
+                that.info["bed_cost_total"] = response.data.data.bedCostTotal;
+                that.info["bed_cost_self_total"] =
+                    response.data.data.bedCostSelfTotal;
+                that.info["bed_cost_part_self_total"] =
+                    response.data.data.bedCostPartSelfTotal;
+
+                that.info["operation_cost_total"] =
+                    response.data.data.operationCostTotal;
+                that.info["operation_cost_self_total"] =
+                    response.data.data.operationCostSelfTotal;
+                that.info["operation_cost_part_self_total"] =
+                    response.data.data.operationCostPartSelfTotal;
+
+                that.info["other_cost_total"] = response.data.data.otherCostTotal;
+                that.info["other_cost_self_total"] =
+                    response.data.data.otherCostSelfTotal;
+                that.info["other_cost_part_self_total"] =
+                    response.data.data.otherCostPartSelfTotal;
+
+                that.info["material_cost_total"] =
+                    response.data.data.materialCostTotal;
+                that.info["material_cost_self_total"] =
+                    response.data.data.materialCostSelfTotal;
+                that.info["material_cost_part_self_total"] =
+                    response.data.data.materialCostPartSelfTotal;
+
+                that.info["western_medicine_cost_total"] =
+                    response.data.data.westernMedicineCostTotal;
+                that.info["western_medicine_cost_self_total"] =
+                    response.data.data.westernMedicineCostSelfTotal;
+                that.info["western_medicine_cost_part_self_total"] =
+                    response.data.data.westernMedicineCostPartSelfTotal;
+
+                that.info["chinese_traditional_medicine_cost_total"] =
+                    response.data.data.chineseTraditionalMedicineCostTotal;
+                that.info["chinese_traditional_medicine_cost_self_total"] =
+                    response.data.data.chineseTraditionalMedicineCostSelfTotal;
+                that.info["chinese_traditional_medicine_cost_part_self_total"] =
+                    response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
+
+                that.info["check_cost_total"] = response.data.data.checkCostTotal;
+                that.info["check_cost_self_total"] =
+                    response.data.data.checkCostSelfTotal;
+                that.info["check_cost_part_self_total"] =
+                    response.data.data.checkCostPartSelfTotal;
+
+                that.info["laboratory_cost_total"] =
+                    response.data.data.laboratoryCostTotal;
+                that.info["laboratory_cost_self_total"] =
+                    response.data.data.laboratoryCostSelfTotal;
+                that.info["laboratory_cost_part_self_total"] =
+                    response.data.data.laboratoryCostPartSelfTotal;
+
+                that.info["treat_cost_total"] = response.data.data.treatCostTotal;
+                that.info["treat_cost_self_total"] =
+                    response.data.data.treatCostSelfTotal;
+                that.info["treat_cost_part_self_total"] =
+                    response.data.data.treatCostPartSelfTotal;
+                that.info["date"] = response.data.data.date;
+                that.info["number"] = response.data.data.number;
+                that.info["order_infos"] = response.data.data.order_infos;
+                that.info["diagnosis"] = response.data.data.diagnosis;
+
+                let obj = {
+                  type: 1,
+                  details: [],
+                  total: 0,
+                };
+                let obj2 = {
+                  type: 2,
+                  details: [],
+                  total: 0,
+                };
+                let obj3 = {
+                  type: 3,
+                  details: [],
+                  total: 0,
+                };
+
+                let obj4 = {
+                  type: 4,
+                  details: [],
+                  total: 0,
+                };
+                let num = 0;
+                that.info.order_infos.map((item) => {
+                  if (item.advice_id > 0) {
+                    obj.details.push(item);
+                    obj.total += item.pric * item.advice.prescribing_number;
                     num++;
                   } else {
-                    obj3.details.push(item);
-                    obj3.total += item.pric * item.project.count;
-                    num++;
+                    if (item.project.type == 2) {
+                      obj2.details.push(item);
+                      obj2.total += item.pric * item.project.count;
+                      num++;
+                    } else {
+                      obj3.details.push(item);
+                      obj3.total += item.pric * item.project.count;
+                      num++;
+                    }
                   }
+                });
+
+                // this.info.order_infos.map(item => {
+                //   obj4.total = item.Total
+                //   obj4.details.push(item)
+                //   num++
+                //
+                // })
+
+                that.info.new_detail_list = [];
+                that.info.new_detail_list.push(obj);
+                that.info.new_detail_list.push(obj2);
+                that.info.new_detail_list.push(obj3);
+                // that.info.new_detail_list.push(obj4)
+
+                that.num = num;
+
+                if (that.paramsObj.settle_type != 1) {
+                  that.info.begndate = that.getTimes(that.paramsObj.start_time);
+                  that.info.enddate = that.getTimes(that.paramsObj.end_time);
                 }
-              });
 
-              // this.info.order_infos.map(item => {
-              //   obj4.total = item.Total
-              //   obj4.details.push(item)
-              //   num++
-              //
-              // })
 
-              that.info.new_detail_list = [];
-              that.info.new_detail_list.push(obj);
-              that.info.new_detail_list.push(obj2);
-              that.info.new_detail_list.push(obj3);
-              // that.info.new_detail_list.push(obj4)
 
-              that.num = num;
+                let list = []
+                for (let i = 0; i < response.data.data.order_infos.length; i++) {
+                  let order = response.data.data.order_infos[i]
+                  let obj = {
+                    name: "",
+                    spec: "",
+                    cnt: "",
+                    det_item_fee_sumamt: "",
+                  }
+
+                  if (order.advice_id > 0 && order.project_id == 0) {
+                    obj.name = order.advice.advice_name
+                    let spec = order.advice.drug.dose + order.advice.drug.dose_unit + '*' + order.advice.drug.min_number + order.advice.drug.min_unit + '/' + order.advice.drug.max_unit
+                    obj.spec = spec
+                    obj.cnt = order.cnt
+                    obj.det_item_fee_sumamt =order.det_item_fee_sumamt
+                    list.push(obj)
+
+                  }else if (order.advice_id == 0 && order.project_id > 0) {
+                    if(order.project.type == 2){
+                      obj.name = order.project.project.project_name
+                      obj.spec = ""
+                      obj.cnt = order.cnt
+                      obj.det_item_fee_sumamt =order.det_item_fee_sumamt
+
+                    }else{
+                      obj.name = order.project.good_info.good_name
+                      obj.spec = order.project.good_info.specification_name
+                      obj.cnt = order.cnt
+                      obj.det_item_fee_sumamt =order.det_item_fee_sumamt
+                    }
+                    list.push(obj)
+                  }
+
+                }
+                let len = list.length / 2
+                let L_list = []
+                let R_list = []
+
+                for(let i = 0; i < len; i++){
+                  L_list.push(list[i])
+                }
+                for(let i = len; i < list.length; i++){
+                  R_list.push(list[i])
+                }
+                that.info["L_list"] = L_list
+                that.info["R_list"] = R_list
 
-              if (that.paramsObj.settle_type != 1) {
-                that.info.begndate = that.getTimes(that.paramsObj.start_time);
-                that.info.enddate = that.getTimes(that.paramsObj.end_time);
               }
-            }
-          })
-          .catch(function (error) {});
+            })
+            .catch(function (error) {
+            });
       }
     },
   },
@@ -933,7 +1131,7 @@ export default {
   background-color: #fff;
   z-index: 1;
   transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),
-    background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
+  background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
 }
 
 .dialysis-print-order .is-checked-radio::after {
@@ -970,21 +1168,26 @@ export default {
   text-align: left;
   padding-left: 10px !important;
 }
+
 .title-box-pro-tr {
   border: 0 #fff;
 }
+
 .text-align-left {
   text-align: left !important;
   padding-left: 10px !important;
   font-size: 14px !important;
   line-height: 25px;
 }
+
 .print-table-tr-new td {
   line-height: 20px !important;
 }
+
 .border-top-solid {
   border: solid 1px #000;
 }
+
 .print-template-two tr {
   line-height: 30px;
 }
@@ -996,6 +1199,7 @@ export default {
   font-size: 14px;
   border-collapse: collapse;
 }
+
 .table-box1 tr {
   border-bottom: 1px solid #000;
 }
@@ -1003,19 +1207,23 @@ export default {
 
 <style lang="scss">
 .newContainer {
-  .dialysisPage::-webkit-scrollbar {
-    height: 15px;
-  }
-
-  .el-date-editor {
-    .el-input__inner {
-      padding-right: 0px;
-    }
-  }
-  .el-table td,
-  .el-table th {
-    text-align: center;
-  }
+
+.dialysisPage::-webkit-scrollbar {
+  height: 15px;
+}
+
+.el-date-editor {
+
+.el-input__inner {
+  padding-right: 0px;
+}
+
+}
+.el-table td,
+.el-table th {
+  text-align: center;
+}
+
 }
 .newContainer::-webkit-scrollbar {
   height: 15px !important;

src/xt_pages/outpatientCharges/statementTemplate/printFive.vue

@@ -2,58 +2,80 @@
   <div id="statement-print" class="statement-print">
     <table class="statementTable" border="0">
       <thead>
-        <tr>
-          <td colspan="10">石狮圣誉血液透析中心结算单</td>
-        </tr>
+      <tr>
+        <td colspan="10">石狮圣誉血液透析中心结算单</td>
+      </tr>
       </thead>
 
       <tbody>
-        <tr>
-          <td colspan="10">日期：{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</td>
-        </tr>
-        <tr class="view_tr">
-          <td colspan="2">姓名：{{info.patient.name}}</td>
-          <td colspan="2">性别：{{info.patient.gender == 1 ? '男': '女'}}</td>
-          <td colspan="2">医保类型：{{info.insutype == '390'?'城乡居民基本医疗保险':'职工基本医疗保险'}}</td>
-          <td colspan="2">社会保障号码：{{info.certno}}</td>
-          <td colspan="2">账号余额：{{info.blac}}</td>
-        </tr>
-        <tr class="view_tr">
-          <td colspan="10">明细信息</td>
-        </tr>
+      <tr>
+        <td colspan="10">日期：{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</td>
+      </tr>
+      <tr class="view_tr">
+        <td colspan="2">姓名：{{info.patient.name}}</td>
+        <td colspan="2">性别：{{info.patient.gender == 1 ? '男': '女'}}</td>
+        <td colspan="2">医保类型：{{info.insutype == '390'?'城乡居民基本医疗保险':'职工基本医疗保险'}}</td>
+        <td colspan="2">社会保障号码：{{info.certno}}</td>
+        <td colspan="2">账号余额：{{info.blac}}</td>
+      </tr>
+      <tr class="view_tr">
+        <td colspan="10">明细信息</td>
+      </tr>
 
         <!-- 帐单列表分为左右两列，需要对数据进行x/2分别放进list_L，list_R两个数组进行循环 -->
         <tr>
+<!--          <td colspan="24">-->
+<!--            <template v-for="(v, i) in info.list" >-->
+<!--              <el-row gutter="24" >-->
+<!--                <el-col span="12" :key="i" v-if='i%2 == 0'>-->
+<!--                  <table class="list_table">-->
+<!--                    <template>-->
+<!--                      <tr colspan="12">-->
+<!--                        <td colspan="2">{{v.name}}</td>-->
+<!--                        <td>{{v.spec}}</td>-->
+<!--                        <td>{{v.cnt}}</td>-->
+<!--                        <td>{{v.det_item_fee_sumamt}}</td>-->
+<!--                      </tr>-->
+<!--                    </template>-->
+<!--                  </table>-->
+<!--                </el-col>-->
+<!--                <el-col span="12" v-if="i+1 < info.list.length">-->
+<!--                  <table class="list_table">-->
+<!--                    <template >-->
+<!--                      <tr colspan="12">-->
+<!--                        <td colspan="2">{{v.name}}</td>-->
+<!--                        <td>{{v.spec}}</td>-->
+<!--                        <td>{{v.cnt}}</td>-->
+<!--                        <td>{{v.det_item_fee_sumamt}}</td>-->
+<!--                      </tr>-->
+<!--                    </template>-->
+<!--                  </table>-->
+<!--                </el-col>-->
+<!--              </el-row>-->
+<!--            </template>-->
+<!--          </td>-->
+        <tr>
           <td colspan="6">
             <table class="list_table">
-              <template v-for="(item, index) in list" v-if='index%2==0'>
-              <tr colspan="6"  :key="index">
-                <td colspan="2">药名</td>
-                <td>规格</td>
-                <td>数量</td>
-                <td>价格</td>
+              <tr colspan="6" v-for="(v, index) in info.L_list" :key="index">
+                <td colspan="2">{{v.name}}</td>
+                <td>{{v.spec}}</td>
+                <td>{{v.cnt}}</td>
+                <td>{{v.det_item_fee_sumamt}}</td>
               </tr>
-                <tr  v-if='index+1<list.length' >
-                  <td colspan="2">药名</td>
-                  <td>规格</td>
-                  <td>数量</td>
-                  <td>价格</td>
-                </tr>
-              </template>
             </table>
-
           </td>
 
-<!--          <td colspan="4">-->
-<!--            <table class="list_table">-->
-<!--              <tr colspan="4" v-for="(item, index) in list_R" :key="index">-->
-<!--                <td colspan="2">药名</td>-->
-<!--                <td>规格</td>-->
-<!--                <td>数量</td>-->
-<!--                <td>价格</td>-->
-<!--              </tr>-->
-<!--            </table>-->
-<!--          </td>-->
+          <td colspan="6">
+            <table class="list_table">
+              <tr colspan="6" v-for="(v, index) in info.R_list" :key="index">
+                <td colspan="2">{{v.name}}</td>
+                <td>{{v.spec}}</td>
+                <td>{{v.cnt}}</td>
+                <td>{{v.det_item_fee_sumamt}}</td>
+              </tr>
+            </table>
+          </td>
         </tr>
         <tr>
           <td colspan="10">共一页，第一页{{info.medfee_sumamt}}</td>
@@ -66,7 +88,7 @@
             <div>费用总计：{{info.medfee_sumamt}}</div>
             <div>统筹支付：{{info.fund_pay_sumamt}}</div>
             <div>账户支付：{{info.acct_pay}}</div>
-            <div>个人现金支付：{{info.psn_cash_pay}}</div>
+            <div>个人现金支付：{{info.cash_payamt}}</div>
             <div>其他支付：{{info.oth_pay}}</div>
             <div>减免金额：</div>
           </td>
@@ -99,7 +121,7 @@ export default {
   },
   data() {
     return {
-      list:[1,2],
+      list:[1,2,3],
       list_L: [1,2],
       list_R: [1,2],
     };
@@ -140,53 +162,53 @@ export default {
 
 
 <style lang="scss" scoped>
-.statement-print {
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
+  .statement-print {
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
     0 0 60px rgba(0, 0, 0, 0.06) inset;
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
     0 0 40px rgba(0, 0, 0, 0.06) inset;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
-  margin-bottom: 20px;
-  padding: 20px 10px;
-}
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    margin-bottom: 20px;
+    padding: 20px 10px;
+  }
 
-.statementTitle {
-  font-size: 28px;
-  text-align: center;
-  font-weight: bold;
-  margin-bottom: 10px;
-}
+  .statementTitle {
+    font-size: 28px;
+    text-align: center;
+    font-weight: bold;
+    margin-bottom: 10px;
+  }
 
-.statementTable {
-  width: 100%;
-  text-align: center;
-  border-collapse: collapse;
-  line-height: 40px;
-  font-size: 14px;
-}
-.statementTable thead{
-  font-size: 28px;
-  text-align: center;
-  font-weight: bold;
-  margin-bottom: 10px;
-}
+  .statementTable {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+  }
+  .statementTable thead{
+    font-size: 28px;
+    text-align: center;
+    font-weight: bold;
+    margin-bottom: 10px;
+  }
 
-.statementTable tbody{
+  .statementTable tbody{
     text-align: left;
-}
-tbody .view_tr{
+  }
+  tbody .view_tr{
     border: 1px solid;
     text-align: center;
-}
-.list_table{
+  }
+  .list_table{
     width: 100%;
     margin-bottom: 100px;
-}
-tbody .dashed_tr{
+  }
+  tbody .dashed_tr{
     border: 1px dashed;
     text-align: center;
-}
-tbody tr td div{
+  }
+  tbody tr td div{
     height: 25px;
-}
+  }
 </style>

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -1,8 +1,9 @@
 <template>
   <div id="statement-print" class="statement-print">
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10191">福建省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>
@@ -12,16 +13,16 @@
         <td colspan="4">{{info.fixmedins_code}}</td>
         <td width="100">医保结算级别</td>
         <td width="100" v-if="info.hosp_lv == '1'">三级特等</td>
-        <td width="100" v-if="info.hosp_lv == '2'">三级甲等</td>
-        <td width="100" v-if="info.hosp_lv == '3'">三级乙等</td>
-        <td width="100" v-if="info.hosp_lv == '4'">三级丙等</td>
-        <td width="100" v-if="info.hosp_lv == '5'">二级甲等</td>
-        <td width="100" v-if="info.hosp_lv == '6'">二级乙等</td>
-        <td width="100" v-if="info.hosp_lv == '7'">二级丙等</td>
-        <td width="100" v-if="info.hosp_lv == '8'">一级甲等</td>
-        <td width="100" v-if="info.hosp_lv == '9'">一级乙等</td>
-        <td width="100" v-if="info.hosp_lv == '10'">一级丙等</td>
-        <td width="100" v-if="info.hosp_lv == '11'">无等级</td>
+        <td width="100" v-else-if="info.hosp_lv == '2'">三级甲等</td>
+        <td width="100" v-else-if="info.hosp_lv == '3'">三级乙等</td>
+        <td width="100" v-else-if="info.hosp_lv == '4'">三级丙等</td>
+        <td width="100" v-else-if="info.hosp_lv == '5'">二级甲等</td>
+        <td width="100" v-else-if="info.hosp_lv == '6'">二级乙等</td>
+        <td width="100" v-else-if="info.hosp_lv == '7'">二级丙等</td>
+        <td width="100" v-else-if="info.hosp_lv == '8'">一级甲等</td>
+        <td width="100" v-else-if="info.hosp_lv == '9'">一级乙等</td>
+        <td width="100" v-else-if="info.hosp_lv == '10'">一级丙等</td>
+        <td width="100" v-else-if="info.hosp_lv == '11'">无等级</td>
         <td width="100" v-else></td>
 
       </tr>
@@ -42,37 +43,37 @@
         <td width="110"></td>
         <td width="80">人员类别</td>
         <td colspan="3" v-if="info.psn_type == '11'">在职</td>
-        <td colspan="3" v-if="info.psn_type == '1101'">职工在职</td>
-        <td colspan="3" v-if="info.psn_type == '1102'">公务员在职</td>
-        <td colspan="3" v-if="info.psn_type == '1103'">灵活就业人员在职</td>
-        <td colspan="3" v-if="info.psn_type == '1160'">地方其他扩展人员</td>
+        <td colspan="3" v-else-if="info.psn_type == '1101'">职工在职</td>
+        <td colspan="3" v-else-if="info.psn_type == '1102'">公务员在职</td>
+        <td colspan="3" v-else-if="info.psn_type == '1103'">灵活就业人员在职</td>
+        <td colspan="3" v-else-if="info.psn_type == '1160'">地方其他扩展人员</td>
 
 
-        <td colspan="3" v-if="info.psn_type == '12'">退休人员</td>
-        <td colspan="3" v-if="info.psn_type == '1201'">职工退休</td>
-        <td colspan="3" v-if="info.psn_type == '1202'">公务员退休</td>
-        <td colspan="3" v-if="info.psn_type == '1203'">灵活就业人员退休</td>
-        <td colspan="3" v-if="info.psn_type == '1260'">地方其他扩展人员</td>
+        <td colspan="3" v-else-if="info.psn_type == '12'">退休人员</td>
+        <td colspan="3" v-else-if="info.psn_type == '1201'">职工退休</td>
+        <td colspan="3" v-else-if="info.psn_type == '1202'">公务员退休</td>
+        <td colspan="3" v-else-if="info.psn_type == '1203'">灵活就业人员退休</td>
+        <td colspan="3" v-else-if="info.psn_type == '1260'">地方其他扩展人员</td>
 
 
-        <td colspan="3" v-if="info.psn_type == '13'">离休</td>
-        <td colspan="3" v-if="info.psn_type == '1300'">离休人员</td>
-        <td colspan="3" v-if="info.psn_type == '1360'">地方其他扩展人员</td>
+        <td colspan="3" v-else-if="info.psn_type == '13'">离休</td>
+        <td colspan="3" v-else-if="info.psn_type == '1300'">离休人员</td>
+        <td colspan="3" v-else-if="info.psn_type == '1360'">地方其他扩展人员</td>
 
-        <td colspan="3" v-if="info.psn_type == '14'">居民(未成年)</td>
-        <td colspan="3" v-if="info.psn_type == '1401'">新生儿</td>
-        <td colspan="3" v-if="info.psn_type == '1402'">学龄前儿童</td>
-        <td colspan="3" v-if="info.psn_type == '1403'">中小学生</td>
-        <td colspan="3" v-if="info.psn_type == '1404'">大学生</td>
-        <td colspan="3" v-if="info.psn_type == '1405'">未成年(未入学)</td>
+        <td colspan="3" v-else-if="info.psn_type == '14'">居民(未成年)</td>
+        <td colspan="3" v-else-if="info.psn_type == '1401'">新生儿</td>
+        <td colspan="3" v-else-if="info.psn_type == '1402'">学龄前儿童</td>
+        <td colspan="3" v-else-if="info.psn_type == '1403'">中小学生</td>
+        <td colspan="3" v-else-if="info.psn_type == '1404'">大学生</td>
+        <td colspan="3" v-else-if="info.psn_type == '1405'">未成年(未入学)</td>
 
 
-        <td colspan="3" v-if="info.psn_type == '15'">居民(成年)</td>
-        <td colspan="3" v-if="info.psn_type == '1501'">普通居民(成年)</td>
-        <td colspan="3" v-if="info.psn_type == '1560'">地方其他扩展身份</td>
-
-        <td colspan="3" v-if="info.psn_type == '16'">居民(老年)</td>
+        <td colspan="3" v-else-if="info.psn_type == '15'">居民(成年)</td>
+        <td colspan="3" v-else-if="info.psn_type == '1501'">普通居民(成年)</td>
+        <td colspan="3" v-else-if="info.psn_type == '1560'">地方其他扩展身份</td>
 
+        <td colspan="3" v-else-if="info.psn_type == '16'">居民(老年)</td>
+        <td colspan="4" v-else></td>
 
 
       </tr>
@@ -113,7 +114,7 @@
         <td>入院第一诊断</td>
         <td colspan="3">{{info.dise_name}}</td>
         <td>出院第一诊断</td>
-        <td colspan="4">{{info.dise_name}}</td>
+        <td colspan="6">{{info.dise_name}}</td>
       </tr>
       <tr>
         <td>业务类别</td>

src/xt_pages/outpatientCharges/summary.vue

@@ -108,12 +108,20 @@
           >报表下载
           </el-button
           >
-<!--          <el-button size="small" type="primary" @click="export_detail_two"-->
-<!--          >报表下载2-->
-<!--          </el-button-->
-<!--          >-->
+          <el-button v-if="$store.getters.xt_user.org_id == 10106" size="small" type="primary" @click="export_detail_ten">报表下载2</el-button>
+
+          <!--          <el-button size="small" type="primary" @click="export_detail_two"-->
+          <!--          >报表下载2-->
+          <!--          </el-button-->
+          <!--          >-->
+
+          <!--                    <el-button size="small" type="primary" @click="export_detail_three">报表下载2</el-button>-->
+          <!--          <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
+          <!--          <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
+          <!--          <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
+          <!--          <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
+
 
-          <el-button size="small" type="primary" @click="export_detail_three">报表下载2</el-button>
         </div>
       </div>
       <el-table
@@ -334,7 +342,6 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import {getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund,} from "@/api/his/his";
-import {uParseTime} from "@/utils/tools";
 // import NewStatementPrint from './newStatementPrint'
 import NewStatementPrint from "./statementPrint.vue";
 import listPrint from "./listPrint";
@@ -344,9 +351,11 @@ import {fetchAllAdminUsers} from "@/api/doctor";
 import axios from "axios";
 import invoicePrint from "./invoicePrint";
 import settlementPrint from "./settlementPrint";
-import {getHisDataTwo} from "../../api/his/his";
-import {getHisDataThree} from "../../api/his/his";
+import {jsGetAge, uParseTime} from "@/utils/tools";
 
+import {getHisDataFive, getHisDataSix, getHisDataThree, getHisDataTwo} from "../../api/his/his";
+
+import {handleData10106} from "../../api/his/his_export";
 
 export default {
   name: "OutpatientChargesSummary",
@@ -699,7 +708,7 @@ export default {
                 total: order.info[b].det_item_fee_sumamt,
                 fund_total: order.info[b].inscp_scp_amt,
                 patient_id: order.info[b].patient_id,
-                dialysis_time:this.getTimes(order.info[b].upload_date)
+                dialysis_time: this.getTimes(order.info[b].upload_date)
 
               }
               // if (order.info[b].advice_id > 0 && order.info[b].project_id == 0) {
@@ -823,19 +832,19 @@ export default {
           let list = [];
           for (let i = 0; i < response.data.data.order.length; i++) {
             let order = response.data.data.order[i];
-            let data =  this.setMonthPrescription(order.info)
+            let data = this.setMonthPrescription(order.info)
             // console.log(data)
-            for(let b= 0; b < data.length; b++){
+            for (let b = 0; b < data.length; b++) {
               let obj = {
                 name: order.patient.name,
                 id_card_no: order.patient.id_card_no,
                 year: "2022",
-                month:"8",
+                month: "8",
                 code: data[b].code,
                 pric: data[b].count * data[b].price,
-                item_name:data[b].name,
-                unit:data[b].unit,
-                count:data[b].count,
+                item_name: data[b].name,
+                unit: data[b].unit,
+                count: data[b].count,
 
               }
               if (order.insutype == "310") {
@@ -848,9 +857,9 @@ export default {
 
           }
 
-          var  tarList = []
+          var tarList = []
           for (let i = 0; i < list.length; i++) {
-            if(list[i].pric > 0) {
+            if (list[i].pric > 0) {
               let obj = {
                 "姓名": list[i].name,
                 "身份证号": list[i].id_card_no,
@@ -904,6 +913,701 @@ export default {
         }
       });
     },
+    export_detail_four() {
+      let params = {};
+      getHisDataFive(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          let list = [];
+          for (let i = 0; i < response.data.data.order.length; i++) {
+            let order = response.data.data.order[i];
+            // console.log(data)
+            for (let b = 0; b < order.info.length; b++) {
+              let obj = {
+                org_name: "生命之源血液透析中心",
+                name: order.patient.name,
+                id_card_no: order.patient.id_card_no,
+                jiuyi_date: this.getTimes(order.settle_accounts_date),
+                dianhua: order.patient.phone,
+                pric: order.info[b].pric,
+                cnt: order.info[b].cnt,
+                det_item_fee_sumamt: order.info[b].det_item_fee_sumamt,
+                zhenduan: "慢性肾衰竭",
+                shifouyibao: "是",
+                doctor: "高华",
+                jiesuanfangshi: "医保",
+                jizhangshijian: order.setl_time,
+                feiyongheji: order.medfee_sumamt,
+                jizhangjine: order.fund_pay_sumamt,
+                xianjinheji: order.psn_cash_pay,
+
+              }
+              if (order.is_medicine_insurance == 1) {
+                obj.jiesuanfangshi = "是"
+
+              } else {
+
+                obj.jiesuanfangshi = "否"
+
+              }
+
+              if (order.info[b].advice_id > 0 && order.info[b].project_id == 0) {
+                obj["yibaomulucode"] = order.info[b].advices.drug.medical_insurance_number
+                obj["yibaomuluname"] = order.info[b].advices.drug.drug_name
+                obj["neibumulucode"] = order.info[b].advices.drug.id
+                obj["neibumuluname"] = order.info[b].advices.drug.drug_name
+              }
+              if (order.info[b].advice_id == 0 && order.info[b].project_id > 0) {
+                if (order.info[b].project.type == 2) {
+                  obj["yibaomulucode"] = order.info[b].project.project.medical_code
+                  obj["yibaomuluname"] = order.info[b].project.project.project_name
+                  obj["neibumulucode"] = order.info[b].project.project.id
+                  obj["neibumuluname"] = order.info[b].project.project.project_name
+
+                } else {
+                  obj["yibaomulucode"] = order.info[b].project.good_info.medical_insurance_number
+                  obj["yibaomuluname"] = order.info[b].project.good_info.good_name
+                  obj["neibumulucode"] = order.info[b].project.good_info.id
+                  obj["neibumuluname"] = order.info[b].project.good_info.good_name
+                }
+              }
+              var thisLen = order.patient.id_card_no.length
+              var birth = ''
+              if (thisLen == 15) {
+                birth = '19' + order.patient.id_card_no.substr(6, 6)
+              } else {
+                birth = order.patient.id_card_no.substr(6, 8)
+              }
+              var births =
+                  birth.substr(0, 4) +
+                  '-' +
+                  birth.substr(4, 2) +
+                  '-' +
+                  birth.substr(6, 2)
+              obj["age"] = jsGetAge(births, '-')
+
+              if (order.patient.gender == 1) {
+                obj['gender'] = "男"
+              } else {
+                obj['gender'] = "女"
+              }
+
+              list.push(obj)
+            }
+
+          }
+
+          var tarList = []
+          for (let i = 0; i < list.length; i++) {
+            if (list[i].pric > 0) {
+              let obj = {
+                "机构编码": list[i].org_name,
+                "就诊人姓名": list[i].name,
+                "性别": list[i].gender,
+                "年龄": list[i].age,
+                "身份证号码": list[i].id_card_no,
+                "就医日期": list[i].jiuyi_date,
+                "电话": list[i].dianhua,
+                "医保目录编码": list[i].yibaomulucode,
+                "医保目录名称": list[i].yibaomuluname,
+                "机构内部编码": list[i].neibumulucode,
+                "机构内部名称": list[i].neibumuluname,
+                "就诊项目明细": list[i].yibaomuluname,
+                "单价": list[i].pric,
+                "数量": list[i].cnt,
+                "金额": list[i].det_item_fee_sumamt,
+                "费用合计": list[i].feiyongheji,
+                "记账金额": list[i].jizhangjine,
+                "现金合计": list[i].xianjinheji,
+                "结算方式": list[i].jiesuanfangshi,
+                "接诊医生": list[i].doctor,
+                "诊断": list[i].zhenduan,
+                "记账时间": list[i].jizhangshijian,
+                "是否医保": list[i].shifouyibao,
+
+              }
+              tarList.push(obj)
+            }
+          }
+
+          import("@/vendor/Export2Excel").then((excel) => {
+            const tHeader = [
+              "机构编码",
+              "就诊人姓名",
+              "性别",
+              "年龄",
+              "身份证号码",
+              "就医日期",
+              "电话",
+              "医保目录编码",
+              "医保目录名称",
+              "机构内部编码",
+              "机构内部名称",
+              "就诊项目明细",
+              "单价",
+              "数量",
+              "金额",
+              "费用合计",
+              "记账金额",
+              "现金合计",
+              "结算方式",
+              "接诊医生",
+              "诊断",
+              "记账时间",
+              "是否医保",
+
+            ];
+            const filterVal = [
+              "机构编码",
+              "就诊人姓名",
+              "性别",
+              "年龄",
+              "身份证号码",
+              "就医日期",
+              "电话",
+              "医保目录编码",
+              "医保目录名称",
+              "机构内部编码",
+              "机构内部名称",
+              "就诊项目明细",
+              "单价",
+              "数量",
+              "金额",
+              "费用合计",
+              "记账金额",
+              "现金合计",
+              "结算方式",
+              "接诊医生",
+              "诊断",
+              "记账时间",
+              "是否医保",
+
+            ];
+            const data = this.formatJson(filterVal, tarList);
+            excel.export_json_to_excel({
+              header: tHeader,
+              data,
+              filename: "消费明细",
+            });
+          });
+        }
+      });
+
+    },
+    export_detail_five() {
+      let params = {};
+      getHisDataFive(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          let list = [];
+          for (let i = 0; i < response.data.data.order.length; i++) {
+            let order = response.data.data.order[i];
+            // console.log(data)
+            for (let b = 0; b < order.info.length; b++) {
+              if (order.info[b].project.project.cost_classify == 3) {
+                let obj = {
+                  p_name: order.psn_name,
+                  code: order.info[b].project.project.id,
+                  name: order.info[b].project.project.project_name,
+                  unit: order.info[b].project.project.unit,
+                  jiage: order.info[b].det_item_fee_sumamt,
+                  name_yibao: order.info[b].project.project.project_name,
+                  guoma: order.info[b].project.project.medical_code,
+                  zifu: order.info[b].selfpay_prop,
+                  cnt: order.info[b].cnt,
+                  pric: order.info[b].pric,
+                  gerenzifu: order.info[b].fulamt_ownpay_amt + order.info[b].preselfpay_amt,
+                  baoxiaojine: order.info[b].inscp_scp_amt,
+
+                }
+                if (order.info[b].chrgitm_lv == "01") {
+                  obj["yibao_dengji"] = "甲"
+                } else if (order.info[b].chrgitm_lv == "02") {
+                  obj["yibao_dengji"] = "乙"
+                } else {
+                  obj["yibao_dengji"] = "丙"
+                }
+                list.push(obj)
+              }
+            }
+
+          }
+          console.log(list)
+
+          var tarList = []
+          for (let i = 0; i < list.length; i++) {
+            let obj = {
+              "姓名": list[i].p_name,
+              "医保目录编码": list[i].guoma,
+              "名称": list[i].name,
+              "单位": list[i].unit,
+              "价格": list[i].jiage,
+              "医保等级": list[i].yibao_dengji,
+              "自付比例": list[i].zifu,
+              "数量": list[i].cnt,
+              "金额": list[i].pric,
+              "个人自付": list[i].gerenzifu,
+              "报销金额": list[i].baoxiaojine,
+
+            }
+            tarList.push(obj)
+          }
+
+          import("@/vendor/Export2Excel").then((excel) => {
+            const tHeader = [
+              "姓名",
+              "医保目录编码",
+              "名称",
+              "单位",
+              "价格",
+              "医保等级",
+              "自付比例",
+              "数量",
+              "金额",
+              "个人自付",
+              "报销金额",
+
+            ];
+            const filterVal = [
+              "姓名",
+              "医保目录编码",
+              "名称",
+              "单位",
+              "价格",
+              "医保等级",
+              "自付比例",
+              "数量",
+              "金额",
+              "个人自付",
+              "报销金额",
+            ];
+            const data = this.formatJson(filterVal, tarList);
+            excel.export_json_to_excel({
+              header: tHeader,
+              data,
+              filename: "消费明细",
+            });
+          });
+        }
+      });
+
+    },
+    export_detail_six() {
+      let params = {};
+      getHisDataSix(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          let list = [];
+          let new_list = [];
+          for (let i = 0; i < response.data.data.order.length; i++) {
+            let order = response.data.data.order[i];
+            for (let b = 0; b < order.info.length; b++) {
+              new_list.push(order.info[b])
+            }
+          }
+
+          var infos = this.setMonthPrescriptiontwo(new_list)
+          for (let b = 0; b < infos.length; b++) {
+            list.push(infos[b])
+          }
+
+          var tarList = []
+          for (let i = 0; i < list.length; i++) {
+            let obj = {
+              "周期": "2022年第三季度",
+              "类别": "门诊",
+              "医保目录编码": list[i].code,
+              "医保目录名称": list[i].name,
+              "本机构目录编码": list[i].code,
+              "本机构目录名称": list[i].name,
+              "使用例数": list[i].count,
+              "价格": list[i].price,
+
+            }
+            tarList.push(obj)
+          }
+
+          import("@/vendor/Export2Excel").then((excel) => {
+            const tHeader = [
+              "周期",
+              "类别",
+              "医保目录编码",
+              "医保目录名称",
+              "本机构目录编码",
+              "本机构目录名称",
+              "使用例数",
+              "价格",
+            ];
+            const filterVal = [
+              "周期",
+              "类别",
+              "医保目录编码",
+              "医保目录名称",
+              "本机构目录编码",
+              "本机构目录名称",
+              "使用例数",
+              "价格",
+            ];
+            const data = this.formatJson(filterVal, tarList);
+            excel.export_json_to_excel({
+              header: tHeader,
+              data,
+              filename: "消费明细",
+            });
+          });
+        }
+      });
+
+    },
+    export_detail_seven() {
+      let params = {};
+      handleData10106(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          let list = [];
+          for (let i = 0; i < response.data.data.order.length; i++) {
+            let order = response.data.data.order[i];
+            console.log(order)
+            let obj = {
+              md: order.mdtrt_id,
+              name: order.patient.name,
+              kaichu: this.getTimes(order.settle_start_time),
+              xianzhong: "",
+              yingshou: order.medfee_sumamt,
+              yibaotongchou: order.hifp_pay,
+              dabingjijin: order.hifmi_pay,
+              yiliaojiuzhu: order.maf_pay,
+              gongwujijin: order.cvlserv_pay,
+              gerenzhifu: order.psn_part_amt,
+              zongjine: order.medfee_sumamt,
+              setl_time: order.setl_time,
+              jiesuanleixing: '医保',
+              xueyetouxilvguo: 480,
+              lvhuana: 3,
+              zhihuanguan: 40,
+              good_name: "",
+            }
+            if (order.insutype == "390") {
+
+              obj.xianzhong = "城乡"
+            } else {
+
+              obj.xianzhong = "职工"
+
+            }
+
+            for (let b = 0; b < order.info.length; b++) {
+              if (order.info[b].advice_id == 0 && order.info[b].project_id > 0) {
+                console.log("11111")
+
+                if (order.info[b].project.type == 2) {
+                  console.log("22222222")
+
+                  if (order.info[b].project.project.id == 254 || order.info[b].project.project.id == 253 || order.info[b].project.project.id == 250 || order.info[b].project.project.id == 249) {
+                    obj.good_name = this.GetGoodName(order.info[b].project.project.id)
+                  }
+                } else if (order.info[b].project.type == 3) {
+                  console.log("3333333")
+
+                  if (order.info[b].project.project.id == 1478 || order.info[b].project.project.id == 1479 || order.info[b].project.project.id == 1482 || order.info[b].project.project.id == 1483 || order.info[b].project.project.id == 2577 || order.info[b].project.project.id == 2578 || order.info[b].project.project.id == 2058 || order.info[b].project.project.id == 2059) {
+                    obj.good_name = this.GetGoodName(order.info[b].project.good_info.id)
+                    console.log(obj.good_name)
+
+                  }
+                }
+              }
+            }
+            list.push(obj)
+          }
+
+          var tarList = []
+          for (let i = 0; i < list.length; i++) {
+            if (list[i].good_name.length > 0) {
+              let obj = {
+                "序号": i + 1,
+                "就诊号": list[i].md,
+                "患者姓名": list[i].name,
+                "开处时间": list[i].kaichu,
+                "项目(透析器)": list[i].good_name,
+                "血液透析滤过": list[i].xueyetouxilvguo,
+                "0.9%氯化钠注射液": list[i].lvhuana,
+                "置换液管": list[i].zhihuanguan,
+                "险种类型": list[i].xianzhong,
+                "应收金额": list[i].yingshou,
+                "医保统筹金额": list[i].yibaotongchou,
+                "大病基金金额": list[i].dabingjijin,
+                "医疗救助金额": list[i].yiliaojiuzhu,
+                "公务员基金": list[i].gongwujijin,
+                "个人支付基金": list[i].gerenzhifu,
+                "总金额": list[i].zongjine,
+                "收费时间": list[i].setl_time,
+                "结算类型": list[i].jiesuanleixing,
+                "收费状态": "已收费",
+              }
+              tarList.push(obj)
+            }
+          }
+
+          import("@/vendor/Export2Excel").then((excel) => {
+            const tHeader = [
+              "序号",
+              "就诊号",
+              "患者姓名",
+              "开处时间",
+              "项目(透析器)",
+              "血液透析滤过",
+              "0.9%氯化钠注射液",
+              "置换液管",
+              "险种类型",
+              "应收金额",
+              "医保统筹金额",
+              "大病基金金额",
+              "医疗救助金额",
+              "公务员基金",
+              "个人支付基金",
+              "总金额",
+              "收费时间",
+              "结算类型",
+              "收费状态",
+            ];
+            const filterVal = [
+              "序号",
+              "就诊号",
+              "患者姓名",
+              "开处时间",
+              "项目(透析器)",
+              "血液透析滤过",
+              "0.9%氯化钠注射液",
+              "置换液管",
+              "险种类型",
+              "应收金额",
+              "医保统筹金额",
+              "大病基金金额",
+              "医疗救助金额",
+              "公务员基金",
+              "个人支付基金",
+              "总金额",
+              "收费时间",
+              "结算类型",
+              "收费状态",
+            ];
+            const data = this.formatJson(filterVal, tarList);
+            excel.export_json_to_excel({
+              header: tHeader,
+              data,
+              filename: "消费明细",
+            });
+          });
+
+        }
+      });
+
+    },
+    getType(med_chrgitm_type) {
+      switch (med_chrgitm_type) {
+        case '01':
+          return '床位费'
+          break
+        case '02':
+          return '诊察费'
+
+          break
+        case '03':
+          return '检查费'
+
+          break
+        case '04':
+          return '化验费'
+          break
+        case '05':
+          return '治疗费'
+
+          break
+        case '06':
+          return '手术费'
+
+          break
+        case '07':
+          return '护理费'
+
+          break
+        case '08':
+          return '材料费'
+
+          break
+        case '09':
+          return '西药费'
+
+          break
+        case '10':
+          return '中药饮片费'
+
+          break
+        case '11':
+          return '中成药费'
+
+          break
+        case '12':
+          return '一般诊疗费'
+
+          break
+        case '13':
+          return '挂号费'
+          break
+        case '14':
+          return '其他费'
+          break
+        case '0':
+          return '其他费'
+          break
+
+      }
+
+    },
+
+    export_detail_ten() {
+      let params = {
+        start_time:this.start_time,
+        end_time:this.end_time
+      };
+      handleData10106(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          let list = [];
+          for (let i = 0; i < response.data.data.order.length; i++) {
+            let order = response.data.data.order[i];
+            let med_chrgitm_types = []
+            for (let b = 0; b < order.info.length; b++) {
+              med_chrgitm_types.push(order.info[b].med_chrgitm_type)
+              const obj = {}
+              med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
+                obj[next] ? '' : obj[next] = true && cur.push(next)
+                return cur
+              }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+            }
+
+            for (let i = 0; i < med_chrgitm_types.length; i++) {
+              let price = 0
+              let obj = {
+                name: order.patient.name,
+                idNo: order.patient.id_card_no,
+                med_chrgitm_name:this.getType(med_chrgitm_types[i]),
+                price:"",
+                remark:"",
+              }
+              if(i == 0){
+                obj.remark = "就诊日期:" + this.getTimes(order.settle_accounts_date) + " 医保报销: "+order.fund_pay_sumamt + " 现金:"+order.psn_cash_pay
+              }else{
+                obj.remark = ""
+              }
+              for (let b = 0; b < order.info.length; b++) {
+                if(med_chrgitm_types[i] ==  order.info[b].med_chrgitm_type){
+
+                  price = price + order.info[b].det_item_fee_sumamt
+                }
+              }
+              obj.price = price
+              list.push(obj)
+            }
+
+          }
+
+          var tarList = []
+          for (let i = 0; i < list.length; i++) {
+            let obj = {
+              "姓名": list[i].name,
+              "身份证":  list[i].idNo,
+              "收费项目": list[i].med_chrgitm_name,
+              "金额": list[i].price,
+              "备注": list[i].remark,
+
+            }
+            tarList.push(obj)
+          }
+
+          import("@/vendor/Export2Excel").then((excel) => {
+            const tHeader = [
+              "姓名",
+              "身份证",
+              "收费项目",
+              "金额",
+              "备注",
+            ];
+            const filterVal = [
+              "姓名",
+              "身份证",
+              "收费项目",
+              "金额",
+              "备注",
+            ];
+            const data = this.formatJson(filterVal, tarList);
+            excel.export_json_to_excel({
+              header: tHeader,
+              data,
+              filename: "消费明细",
+            });
+          });
+
+
+        }
+      });
+
+    },
+
+    GetGoodName(id) {
+      switch (id) {
+        case 254:
+          return "空心纤维透析器REXEED-18UC(旭化成)"
+          break
+        case 253:
+          return "空心纤维透析器REXEED-15UC(旭化成)"
+          break
+        case 250:
+          return "聚砜膜透析滤过器-XevontaHI18(贝朗)"
+          break
+        case 249:
+          return "聚砜膜透析滤过器-XevontaHI15(贝朗)"
+          break
+        case 1478:
+          return "聚砜膜透析滤过器-XevontaHI15(贝朗)"
+          break
+        case 1479:
+          return "聚砜膜透析滤过器-XevontaHI18(贝朗)"
+          break
+        case 1482:
+          return "空心纤维透析器REXEED-15UC(旭化成)"
+          break
+        case 1483:
+          return "REXEED-18UC(旭化成)"
+          break
+        case 2577:
+          return "空心纤维透析器(FB-15U)(尼普洛)"
+          break
+        case 2578:
+          return "空心纤维透析器(FB-17U)(尼普洛)"
+          break
+        case 2058:
+          return "中空纤维透析器CTA-1500"
+          break
+        case 2059:
+          return "中空纤维透析器CTA-2000"
+          break
+
+          break
+
+      }
+
+    },
 
     unique_two(array) {
       // res用来存储结果
@@ -1221,18 +1925,17 @@ export default {
       }
 
       drug_ids = this.unique(drug_ids)
-      project_ids= this.unique(project_ids)
+      project_ids = this.unique(project_ids)
 
       // additions_ids= this.unique(additions_ids)
 
-
       for (let i = 0; i < drug_ids.length; i++) {
         let obj = {}
         let count = 0
         for (let a = 0; a < drug_month_prescriptions.advices.length; a++) {
-          if (drug_ids[i].price == drug_month_prescriptions.advices[a].price && drug_ids[i].id ==  drug_month_prescriptions.advices[a].drug_id) {
+          if (drug_ids[i].price == drug_month_prescriptions.advices[a].price && drug_ids[i].id == drug_month_prescriptions.advices[a].drug_id) {
             obj['name'] = drug_month_prescriptions.advices[a].advice_name
-            obj['code'] =  drug_month_prescriptions.advices[a].id
+            obj['code'] = drug_month_prescriptions.advices[a].id
             obj['unit'] = drug_month_prescriptions.advices[a].drug.min_unit
             obj['price'] = parseFloat(drug_month_prescriptions.advices[a].price)
             count = count + drug_month_prescriptions.advices[a].prescribing_number
@@ -1246,28 +1949,72 @@ export default {
         let obj = {}
         let count = 0
         for (let a = 0; a < project_month_prescriptions.project.length; a++) {
-          if (project_ids[i].price == project_month_prescriptions.project[a].price &&project_ids[i].id == project_month_prescriptions.project[a].project_id ) {
+          if (project_ids[i].price == project_month_prescriptions.project[a].price && project_ids[i].id == project_month_prescriptions.project[a].project_id) {
 
-            if(project_month_prescriptions.project[a].type == 2){
+            if (project_month_prescriptions.project[a].type == 2) {
               obj['name'] = project_month_prescriptions.project[a].project.project_name
               obj['code'] = project_month_prescriptions.project[a].id
               obj['unit'] = project_month_prescriptions.project[a].project.unit
               obj['type'] = 2
 
-
-            }else if (project_month_prescriptions.project[a].type == 3){
+            } else if (project_month_prescriptions.project[a].type == 3) {
               obj['name'] = project_month_prescriptions.project[a].good_info.good_name
-              obj['code'] =  project_month_prescriptions.project[a].id
+              obj['code'] = project_month_prescriptions.project[a].id
               obj['unit'] = project_month_prescriptions.project[a].good_info.packing_unit
               obj['type'] = 3
 
-
             }
             count = count + parseFloat(project_month_prescriptions.project[a].count)
             obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
             obj['type'] = 1
 
+          }
+        }
+        obj['count'] = count
+        tableData.push(obj)
+
+      }
+      return tableData
+    },
+    setMonthPrescriptiontwo(month_prescriptions) {
+      let tableData = []
+
+      let project_month_prescriptions = {
+        project: []
+
+      }
+      let project_ids = []
 
+      for (let i = 0; i < month_prescriptions.length; i++) {
+        if (month_prescriptions[i].type == 2) { //项目
+          for (let a = 0; a < month_prescriptions[i].project.length; a++) {
+            if (month_prescriptions[i].project[a].type == 2) {
+              let obj = {
+                id: month_prescriptions[i].project[a].project_id,
+                price: month_prescriptions[i].project[a].price
+
+              }
+              project_ids.push(obj)
+              project_month_prescriptions.project.push(month_prescriptions[i].project[a])
+            }
+          }
+        }
+      }
+
+      project_ids = this.unique(project_ids)
+      console.log(project_ids)
+
+      for (let i = 0; i < project_ids.length; i++) {
+        let obj = {}
+        let count = 0
+        for (let a = 0; a < project_month_prescriptions.project.length; a++) {
+          if (project_ids[i].price == project_month_prescriptions.project[a].price && project_ids[i].id == project_month_prescriptions.project[a].project_id) {
+            if (project_month_prescriptions.project[a].type == 2) {
+              obj['name'] = project_month_prescriptions.project[a].project.project_name
+              obj['code'] = project_month_prescriptions.project[a].project.medical_code
+              count = count + parseFloat(project_month_prescriptions.project[a].count)
+              obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
+            }
           }
         }
         obj['count'] = count
@@ -1423,7 +2170,7 @@ export default {
       } else if (index == 2) {
         this.allListVisible = true;
       }
-    },    unique(array) {
+    }, unique(array) {
       // res用来存储结果
       var res = []
       for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {

src/xt_pages/outpatientDoctorStation/batch_delete.vue

@@ -0,0 +1,828 @@
+<template>
+  <!--批量删除-->
+  <div class="main-contain">
+    <div class="app-container">
+    <div class="bannar_list">
+      <div class="banner_left">
+        <div>
+          透析模式:
+          <el-select
+            v-model="modeOptions_value"
+            placeholder="请选择"
+            @change="getUsername"
+          >
+            <el-option
+              v-for="item in modeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <div>
+          删除类型:
+          <el-select
+            v-model="new_type"
+            placeholder="请选择"
+            @change="changetype"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <div v-if="new_type == 1">
+          请输入需要删除的药品:
+          <el-select
+            filterable
+            v-model="id"
+            placeholder="请选择"
+            @change="getUsername"
+          >
+            <el-option
+              v-for="item in druglist"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <div v-if="new_type == 2">
+          请输入需要删除的项目:
+          <el-select
+            filterable
+            v-model="id"
+            placeholder="请选择"
+            @change="getUsername"
+          >
+            <el-option
+              v-for="item in projectlist"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
+      </div>
+
+      <!--        <button @click="lili">调试</button>-->
+      <el-button type="primary" @click="save">保存</el-button>
+    </div>
+
+    <el-container>
+      <div class="left_table" style="width: 211px;height: 70vh;border: 1px solid #DCDFE6;box-shadow: 0 2px 4px 0 rgb(0 0 0 / 12%), 0 0 6px 0 rgb(0 0 0 / 4%);">
+        <el-table
+          border
+          height="70vh"
+          ref="multipleTable"
+          :data="tableData"
+          tooltip-effect="dark"
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+          @current-change="test"
+          :row-style="{ color: '#303133' }"
+          :header-cell-style="{
+            backgroundColor: 'rgb(245, 247, 250)',
+            color: '#606266',
+          }"
+        >
+          <el-table-column type="selection" width="55" align="center"> </el-table-column>
+          <el-table-column label="患者姓名" width="155" align="center">
+            <template slot-scope="scope">{{ scope.row.name }}</template>
+          </el-table-column>
+        </el-table>
+      </div>
+
+      <el-main>
+        <el-tabs type="border-card" v-if="isshow == 1 && list.length > 0" style="min-height: 70vh;">
+        <el-tab-pane
+          v-for="(item, index) in list"
+          :key="index"
+          :label="'处方' + (index + 1)"
+          :name="index"
+        >
+          <el-table
+            v-if="item.advices.length > 0"
+            :data="item.advices"
+            style="width: 100%"
+            max-height="250"
+            border
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266',
+            }"
+          >
+            <el-table-column fixed label="药品名称" width="230" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.advice_name }}
+              </template>
+            </el-table-column>
+            <el-table-column label="单次用量" width="200" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.single_dose }}{{ scope.row.single_dose_unit }}
+              </template>
+            </el-table-column>
+            <el-table-column label="用法" width="120" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.delivery_way }}
+              </template>
+            </el-table-column>
+            <el-table-column label="频率" width="120" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.execution_frequency }}
+              </template>
+            </el-table-column>
+            <el-table-column label="天数" width="110" align="center">
+              <template slot-scope="scope"> {{ scope.row.day }}天 </template>
+            </el-table-column>
+            <el-table-column label="总量" width="200" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.prescribing_number
+                }}{{ scope.row.prescribing_number_unit }}
+              </template>
+            </el-table-column>
+            <el-table-column label="单价" width="120" align="center">
+              <template slot-scope="scope"> {{ scope.row.price }}元 </template>
+            </el-table-column>
+            <el-table-column label="备注" width="120" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.remark }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="120" align="center">
+              <template slot-scope="scope">
+                <el-button
+                  @click.native.prevent="delects(scope.$index, scope, item)"
+                  type="danger"
+                  size="small"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <el-table
+            v-if="item.project.length > 0"
+            :data="item.project"
+            style="width: 100%"
+            max-height="250"
+            border
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266',
+            }"
+          >
+            <el-table-column fixed label="项目名称" width="230" align="center">
+              <template slot-scope="scope">
+                <div v-if="scope.row.type == 2">
+                  {{ scope.row.project.project_name }}
+                </div>
+                <div v-if="scope.row.type == 3">
+                  {{ scope.row.good_info.good_name }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="组" width="120" align="center">
+              <template slot-scope="scope">
+                <div v-if="scope.row.type == 2">
+                  {{ scope.row.project.translate }}
+                </div>
+                <div v-if="scope.row.type == 3">
+                  {{ scope.row.good_info.translate }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="单次用量" width="120" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.single_dose }}
+                {{ scope.row.unit }}
+              </template>
+            </el-table-column>
+            <el-table-column label="用法" width="120" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.delivery_way }}
+              </template>
+            </el-table-column>
+            <el-table-column label="频率" width="120" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.execution_frequency }}
+              </template>
+            </el-table-column>
+            <el-table-column label="天数" width="110" align="center">
+              <template slot-scope="scope"> {{ scope.row.day }}天 </template>
+            </el-table-column>
+            <el-table-column label="总量" width="100" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.count }}
+                {{ scope.row.unit }}
+              </template>
+            </el-table-column>
+            <el-table-column label="单价" width="120" align="center">
+              <template slot-scope="scope"> {{ scope.row.price }}元 </template>
+            </el-table-column>
+            <el-table-column label="备注" width="120" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.remark }}
+              </template>
+            </el-table-column>
+            <el-table-column label="推送频率" width="120" align="center">
+              <template slot-scope="scope">
+                <div v-if="scope.row.frequency_type == 1">
+                  {{ "每次必推" }}
+                </div>
+                <div v-if="scope.row.frequency_type == 2">
+                  {{ scope.row.day_count }}天/次
+                </div>
+                <div v-if="scope.row.frequency_type == 3">
+                  {{ scope.row.week_days }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column fixed="right" label="操作" width="102" align="center">
+              <template slot-scope="scope">
+                <el-button
+                  @click.native.prevent="delects(scope.$index, scope, item)"
+                  type="danger"
+                  size="small"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+      </el-main>
+      
+    </el-container>
+  
+  </div>
+  </div>
+</template>
+<script>
+import { gethisusertoalive } from "@/api/deposit";
+import {
+  getdrugsinformation,
+  replacepeoplename,
+  replaceconfig,
+  deletedrugsbatch,
+  batchdeleteitems,
+  getmodeconfigs,
+  ptemplateinformation,
+  deleteone,
+} from "@/api/batch/batch";
+
+export default {
+  data() {
+    return {
+      dialogVisible: false,
+      tableList: [],
+      editableTabsValue: "1",
+      modeOptions: {},
+      tableDatas: [
+        {
+          id: "",
+          drug_name: "",
+          single_dose: "",
+          single_dose_unit: "",
+          delivery_way: "",
+          execution_frequency: "",
+          day: "",
+          prescribing_number: "",
+          prescribing_number_unit: "",
+          price: "",
+          remark: "",
+        },
+      ], //药品
+      project: [
+        {
+          id: "",
+          drug_name: "",
+          translate: "",
+          single_dose: "",
+          unit: "",
+          delivery_way: "",
+          execution_frequency: "",
+          day: "",
+          prescribing_number: "",
+          price: "",
+          remark: "",
+          frequency_type: 1,
+          day_count: "",
+          week_days: "",
+        },
+      ], //项目
+      tabIndex: 2,
+      modeOptions_value: 1, //透析模式
+      multipleSelection: [], //选中的患者
+      tableData: [],
+      options: [
+        { id: 1, name: "药品" },
+        { id: 2, name: "项目" },
+      ],
+      options_patient: [
+        { id: 1, name: "是" },
+        { id: 2, name: "否" },
+      ],
+      options_2: [
+        { id: 1, name: "普通门诊" },
+        { id: 2, name: "门诊特殊病" },
+      ],
+      new_type: 1, //新增类型
+      druglist: [], //药品列表
+      projectlist: [], //项目列表
+      id: "", //药品、项目、耗材
+      tmplist: [], //临时
+      unit: [
+        { id: 1, name: "g" },
+        { id: 2, name: "mg" },
+        { id: 3, name: "u" },
+        { id: 4, name: "ml" },
+        { id: 5, name: "万U" },
+        { id: 6, name: "枚" },
+        { id: 7, name: "粒" },
+        { id: 8, name: "片" },
+        { id: 9, name: "支" },
+        { id: 10, name: "μg" },
+        { id: 11, name: "iu" },
+        { id: 12, name: "包" },
+        { id: 13, name: "袋" },
+        { id: 14, name: "万" },
+        { id: 15, name: "万iu" },
+        { id: 16, name: "丸" },
+        { id: 17, name: "盒" },
+        { id: 18, name: "瓶" },
+        { id: 19, name: "瓶（袋）" },
+        { id: 20, name: "次" },
+      ],
+      usage: [], //用法
+      frequency: [], //频率
+      frequency_type: "", //周期提醒
+      day_count: "", //周期提醒天
+      week_days: [], //周期提醒星期
+      tabhang: 0, //tab的下标
+      hang: 0, //行数
+      list: [],
+      isshow: 0, //是否显示处方
+      tmpid: 0,
+    };
+  },
+  created() {
+    // console.log("this.$store.getters.treatment_mode",this.$store.getters.treatment_mode)
+    for (let key in this.$store.getters.treatment_mode) {
+      this.modeOptions[key] = this.$store.getters.treatment_mode[key];
+    }
+    // console.log("this.modeOptions",this.modeOptions)
+    this.getdrugconfigs();
+    this.isshow = 0;
+    this.tmpid = 0;
+  },
+  methods: {
+    save() {
+      var tmp = this.modeOptions[this.modeOptions_value].name;
+      var tmp2 = "";
+      if (this.druglist != null) {
+        for (let i = 0; i < this.druglist.length; i++) {
+          if (this.id == this.druglist[i].id) {
+            tmp2 = this.druglist[i].name;
+          }
+        }
+      }
+      if (this.projectlist != null) {
+        for (let j = 0; j < this.projectlist.length; j++) {
+          if (this.id == this.projectlist[j].id) {
+            tmp2 = this.projectlist[j].name;
+          }
+        }
+      }
+      this.$confirm(
+        "请确定是否删除?", //注：该操作将会把所选患者的"+tmp+"透析模式中的"+tmp2+"进行删除，
+        "",
+        {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning",
+        }
+      ).then(() => {
+        if (this.multipleSelection.length == 0) {
+          this.$message.error("没有选中有效信息");
+          return;
+        }
+        let st = "";
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          st = st + this.multipleSelection[i].id + ",";
+        }
+        console.log("string", st);
+        let params = {
+          mode_id: this.modeOptions_value,
+          patient_id: st,
+          type: this.new_type,
+          replaced: this.id,
+        };
+        if (this.new_type == 1) {
+          deletedrugsbatch(params).then((res) => {
+            if (res.data.state == 1) {
+              this.$message.success("删除成功");
+              this.getUsername();
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          });
+        } else {
+          batchdeleteitems(params).then((res) => {
+            if (res.data.state == 1) {
+              this.$message.success("删除成功");
+              this.getUsername();
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          });
+        }
+      });
+    },
+    test(val) {
+      console.log("val?:", val);
+      this.tmpid = val.id;
+      var params = {
+        mode_id: this.modeOptions_value,
+        patient_id: val.id,
+      };
+      ptemplateinformation(params).then((res) => {
+        if (res.data.state == 1) {
+          this.list = res.data.data.list;
+          this.isshow = 1;
+        }
+      });
+    },
+    lili() {
+      console.log("this.list", this.list);
+      console.log("this.multipleSelection", this.multipleSelection);
+      // console.log("this.mode",this.modeOptions_value)
+      // console.log("this.projectlist2",this.projectlist2)
+      // console.log("patient_value",this.patient_value)
+    },
+    delects(hang, sc, item) {
+      this.$confirm("删除后不可恢复，是否确认删除?", "删除", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          var params = {
+            type: item.type, //1药品2项目
+            id: sc.row.id,
+          };
+          var params2 = {
+            mode_id: this.modeOptions_value,
+            patient_id: this.tmpid,
+          };
+          deleteone(params).then((res) => {
+            if (res.data.state == 1) {
+              this.$message.success("删除成功");
+              ptemplateinformation(params2).then((res) => {
+                if (res.data.state == 1) {
+                  this.list = res.data.data.list;
+                  this.isshow = 1;
+                }
+              });
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: 'success',
+            message: "已取消删除",
+          });
+        });
+      // console.log("hang",hang)
+      // console.log("sc",sc)
+      // console.log("item",item)
+    },
+    changetype() {
+      console.log(">>>>>>>", this.new_type);
+      this.id = "";
+      this.tableData = [];
+    },
+    changeid(item, index) {
+      item.id = item.drug_name;
+      var params = {
+        id: item.id,
+      };
+      getdrugsinformation(params).then((res) => {
+        if (res.data.state == 1) {
+          console.log("res??", res);
+          this.tableDatas[0].single_dose = res.data.data.list[0].single_dose;
+          this.tableDatas[0].single_dose_unit =
+            res.data.data.list[0].single_dose_unit;
+          this.tableDatas[0].delivery_way = res.data.data.list[0].delivery_way;
+          this.tableDatas[0].execution_frequency =
+            res.data.data.list[0].execution_frequency;
+          this.tableDatas[0].day = res.data.data.list[0].drug_day;
+          this.tableDatas[0].prescribing_number =
+            res.data.data.list[0].prescribing_number;
+          this.tableDatas[0].prescribing_number_unit =
+            res.data.data.list[0].prescribing_number_unit;
+          this.tableDatas[0].price = res.data.data.list[0].retail_price;
+          this.tableDatas[0].remark = res.data.data.list[0].remark;
+        }
+      });
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    changeid2(item, index) {
+      item.id = item.drug_name;
+      var params = {
+        id: item.id,
+      };
+      getdrugsinformation(params).then((res) => {
+        if (res.data.state == 1) {
+          console.log("res??", res);
+          this.project[0].single_dose = res.data.data.list[0].single_dose;
+          this.project[0].translate = res.data.data.list[0].translate;
+          this.project[0].delivery_way = res.data.data.list[0].delivery_way;
+          this.project[0].execution_frequency =
+            res.data.data.list[0].execution_frequency;
+          this.project[0].day = res.data.data.list[0].day;
+          this.project[0].prescribing_number =
+            res.data.data.list[0].prescribing_number;
+          this.project[0].unit = res.data.data.list[0].unit;
+          this.project[0].price = res.data.data.list[0].retail_price;
+          this.project[0].remark = res.data.data.list[0].remark;
+        }
+      });
+    },
+    //获取配置
+    getdrugconfigs() {
+      var params = {};
+      replaceconfig(params).then((res) => {
+        if (res.data.state == 1) {
+          this.druglist = res.data.data.list;
+          this.projectlist = res.data.data.list2;
+        }
+      });
+      getmodeconfigs(params).then((res) => {
+        if (res.data.state == 1) {
+          this.frequency = res.data.data.efs;
+          this.usage = res.data.data.drugways;
+        }
+      });
+    },
+    getUsername() {
+      var params = {
+        id: this.id,
+        mode: this.modeOptions_value,
+      };
+      replacepeoplename(params).then((res) => {
+        if (res.data.state == 1) {
+          this.tableData = res.data.data.list;
+        }
+      });
+    },
+    handleClose(done) {
+      this.$confirm("确认关闭？")
+        .then((_) => {
+          done();
+        })
+        .catch((_) => {});
+    },
+  },
+};
+</script>
+
+
+
+<style lang="scss" scoped>
+::v-deep .el-tabs__content {
+  padding: 8px;
+}
+
+/deep/ .el-table__fixed {
+  bottom: 0px !important;
+}
+.app-container {
+  padding: 10px;
+  background: #f6f8f9;
+}
+::v-deep .el-table__body-wrapper {
+  height: 500px;
+  overflow-y: scroll;
+
+}
+.bannar_list {
+  margin-bottom: 10px;
+  display: flex;
+  justify-content: space-between;
+  .banner_left {
+    width: 960px;
+    display: flex;
+    justify-content: space-around;
+    div {
+      white-space: nowrap;
+      font-size: 14px;
+      color: #606266;
+    }
+  }
+}
+.left_table{
+  /deep/ .el-table{
+    .el-table__body-wrapper{
+      overflow-x: hidden;
+    }
+  }
+}
+.frequence {
+  text-align: center;
+}
+/deep/ .el-button--small {
+  padding: 9px 6px;
+}
+.zone {
+  //  margin-left: 30px;
+  //  text-align: left;
+  width: 70px;
+  display: inline-block;
+  color: #606266;
+}
+.disinfect {
+  position: relative;
+  .newButton {
+    // position: absolute;
+    // right: 2%;
+    // top:4px;
+    // z-index: 9;
+    margin-bottom: 10px;
+    margin-left: 90%;
+  }
+}
+.disinfectOne {
+  position: relative;
+  .newButtonOne {
+    position: absolute;
+    right: 0;
+    top: -10;
+    z-index: 18;
+  }
+}
+.but {
+  width: 200px;
+  height: 50px;
+  // border: solid 1px red;
+  margin-left: 77%;
+}
+.clearn {
+  width: 460px;
+  height: 50px;
+  // border:solid 1px red;
+  margin-left: 650px;
+}
+
+.zClass {
+  width: 200px;
+  height: 200px;
+  // border:solid 1px red;
+  margin-left: 450px;
+  margin-top: 200px;
+}
+.warn {
+  color: red;
+  font-size: 14px;
+  width: 100%;
+  display: inline-block;
+  margin-left: 96px;
+}
+
+.userbutton {
+  margin-bottom: 10px;
+  margin-left: 82%;
+}
+</style>
+<style lang="scss" >
+.a {
+  margin-bottom: 10px;
+  margin-top: 6px;
+}
+
+.b {
+  .el-button {
+    margin-left: 90%;
+    margin-bottom: 10px;
+  }
+}
+
+.stoppage {
+  .el-form-item__label {
+    width: 190px;
+  }
+}
+.st {
+  .el-form-item__label {
+    width: -10px;
+  }
+}
+.main {
+  position: relative;
+  .newButtonOne {
+    position: absolute;
+    right: 0;
+    z-index: 2;
+  }
+}
+
+.elbutton {
+  // border: solid 1px red;
+  height: 50px;
+  width: 400px;
+  margin-left: 650px;
+}
+// .el-form-item__label {
+//   width: 130px;
+//   font-size: 14px;
+// }
+.el-form-item__error {
+  margin-left: 130px;
+}
+
+.el-upload-list__item-name {
+  color: #606266;
+  display: block;
+  margin-right: 40px;
+  overflow: hidden;
+  padding-left: 4px;
+  text-overflow: ellipsis;
+  transition: color 0.3s;
+  white-space: nowrap;
+}
+.el-main {
+  padding-top: 0px;
+  padding-left: 18px;
+  padding-right: 0px;
+  .el-tabs{
+    .el-tabs__content{
+      padding: 12px;
+      .el-table .el-table__header-wrapper table{
+        width: 100% !important;
+      }
+      .el-table .el-table__body-wrapper table{
+        width: 100% !important;
+      }
+    }
+  }
+}
+
+.newMain {
+  .el-form-item__label {
+    width: 104px;
+  }
+}
+.newDisinfectOne {
+  .el-input--prefix .el-input__inner {
+    // padding-left: 15px;
+    padding-right: 0px !important;
+  }
+}
+.stoppage {
+  .el-form-item__label {
+    width: 18%;
+  }
+}
+.newItem {
+  .el-form-item__label {
+    width: 130px;
+  }
+}
+.formItem {
+  .el-form-item__label {
+    width: 104px;
+    line-height: 30px;
+  }
+}
+.newname {
+  .el-form-item__label {
+    width: 60px;
+  }
+}
+::-webkit-scrollbar {
+  height: 20px;
+}
+
+.el-table td .cell {
+  padding: 0 5px !important;
+}
+.addTab {
+  position: absolute;
+  right: 8px;
+  top: 3px;
+  z-index: 20;
+}
+</style>

src/xt_pages/outpatientDoctorStation/checkPrint.vue

@@ -13,7 +13,7 @@
       </template> -->
 
       <div class='dialysisPage' style="padding-top:40px;">
-        <printOne :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+        <printOne :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printOne>
       </div>
   </div>
 </template>
@@ -32,7 +32,9 @@ export default {
     printOne,
   },
   props:{
-    paramsObj:Object
+    paramsObj:Object,
+    newHisPatient:Object,
+
   },
   data() {
     return {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -667,12 +667,15 @@
     methods: {
 
       changeClass(id) {
+        console.log("asdaff,id",id)
+        console.log("asdaff,this.value",this.value)
+        console.log("asdaff,this.allProject",this.allProject)
         this.tabProject = []
         if (id == 0) {
           this.tabProject = this.allProject
         } else {
           for (let i = 0; i < this.allProject.length; i++) {
-            if (this.allProject[i].cost_classify == id) {
+            if (this.allProject[i].project.cost_classify == id) {
               this.tabProject.push(this.allProject[i])
             }
           }
@@ -1818,7 +1821,7 @@
       },
 
       tabclickEvent(val) {
-
+        console.log("li3333333333333li")
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].name == val.name) {
             this.prescription_id = this.prescriptions[i].id
@@ -2154,10 +2157,12 @@
       },
 
       moreState(tab, event) {
+        console.log("li222222222")
         if (tab == 'more') {
           return false
         }
-      }, open_three() {
+      },
+      open_three() {
         for (let i = 0; i < this.prescriptions.length; i++) {
           for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
             if (this.prescriptions[i].advices[b].prescribing_number == 0 || this.prescriptions[i].advices[b].prescribing_number == '') {
@@ -2654,7 +2659,7 @@
       },
       addTab(targetName) {
 
-        console.log("this.prescriptions",this.prescriptions)
+        console.log("this.prescriptionsaaaaaa",this.prescriptions)
         for(let i = 0; i < this.prescriptions.length; i++){
           if (this.prescriptions[i].is_medicine_status) {
             this.$message.error('处方中包含已发药处方,无法新增')
@@ -2741,7 +2746,7 @@
 
       },
       removeTab(targetName) {
-
+        console.log("1111111111111111")
         if (this.curPrescriptions.order_status == 2 || this.curPrescriptions.order_status == 5 || this.curPrescriptions.is_medicine_status) {
           this.$message.error('该处方已经结算或者记账或者已发药，无法删除')
           return
@@ -3402,11 +3407,10 @@
         // }
         // console.log(res)
         // var idstr = res.join(',')
-
+        this.teamList = []
         let teamList = []
         for (let i = 0; i < row.length; i++) {
           let team_id = row[i].id
-          console.log(team_id)
           const params = {
             project_id: row[i].item_id
           }
@@ -3474,8 +3478,7 @@
                 }
               }
 
-              this.teamList = this.teamList.concat(teamList)
-              console.log(this.teamList)
+              this.teamList = teamList
             }
           })
         }

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -27,7 +27,9 @@
                         <el-select v-model="scope.row.single_dose_unit" placeholder="请选择" style="width:50%;"
                                    @change="getAllChangeTwo(scope)" :disabled="prescription.is_medicine_status" >
                             <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
-                            <el-option :label="scope.row.drug.dose_unit"
+                          <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
+
+                          <el-option :label="scope.row.drug.dose_unit"
                                        v-if="scope.row.drug.dose_unit != scope.row.drug.min_unit"
                                        :value="scope.row.drug.dose_unit"></el-option>
                         </el-select>

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue

@@ -4,19 +4,19 @@
         <el-table v-if="prescription.advices && prescription.advices.length > 0" :data="prescription.advices" border
                   style="width: 99%;" :row-style="{ color: '#303133' }"
                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-            <el-table-column align="center" width="70" label="序号">
+            <el-table-column align="center" width="50" label="序号">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
                         <el-input v-model="scope.row.groupno" placeholder=""></el-input>
                     </div>
                 </template>
             </el-table-column>
-            <el-table-column align="center" prop="drug_name" label="名称">
+            <el-table-column align="center" prop="drug_name" label="名称"  width="297" >
                 <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span>
                 </template>
             </el-table-column>
 
-          <el-table-column align="center" prop="single_dose" width="120" label="单次用量">
+          <el-table-column align="center" prop="single_dose" width="150" label="单次用量">
             <template slot-scope="scope">
               <div style="display:flex;align-items:center;">
                 <el-input v-model="scope.row.single_dose" @input="getAllChange(scope)"
@@ -32,7 +32,7 @@
               </div>
             </template>
           </el-table-column>
-            <el-table-column align="center" prop="delivery_way" width="100" label="用法">
+            <el-table-column align="center" prop="delivery_way" width="110" label="用法">
                 <template slot-scope="scope">
                     <el-select v-model="scope.row.delivery_way" placeholder="请选择">
                         <el-option
@@ -44,7 +44,7 @@
                     </el-select>
                 </template>
             </el-table-column>
-            <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
+            <el-table-column align="center" prop="execution_frequency" width="110" label="频率">
                 <template slot-scope="scope">
                     <el-select v-model="scope.row.execution_frequency" placehold er="请选择" @change="getAllChange(scope)">
                         <el-option
@@ -58,7 +58,7 @@
             </el-table-column>
 
 
-            <el-table-column align="center" prop="day" width="70" label="天数">
+            <el-table-column align="center" prop="day" width="90" label="天数">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
                         <el-input v-model="scope.row.day" @input="getAllChange(scope)" placeholder=""></el-input>
@@ -83,7 +83,7 @@
                     </div>
                 </template>
             </el-table-column>
-            <el-table-column align="center" prop="retail_price" width="80" label="单价">
+            <el-table-column align="center" prop="retail_price" width="100" label="单价">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
                         <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
@@ -92,13 +92,13 @@
 
                 </template>
             </el-table-column>
-            <el-table-column align="center" prop="remark" width="50" label="备注">
+            <el-table-column align="center" prop="remark" width="100" label="备注">
                 <template slot-scope="scope">
                     <el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>
                 </template>
             </el-table-column>
 
-            <el-table-column align="center" prop="remark" width="50" label="推送频率">
+            <el-table-column align="center" prop="remark" width="80" label="推送频率">
                 <template slot-scope="scope">
                     <div v-if="scope.row.frequency_type == 1">{{'每次必推'}}</div>
                     <div v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/次</div>
@@ -108,7 +108,7 @@
             </el-table-column>
 
 
-            <el-table-column align="center" width="100" prop="name" label="操作">
+            <el-table-column align="center" width="140" prop="name" label="操作">
                 <template slot-scope="scope">
                     <!--<i class="el-icon-delete" @click="deleteDrug(scope.$index, scope.row)"></i>-->
                     <el-button size="mini" type="primary" @click="handleEdit(scope.row,scope.$index)">推送</el-button>
@@ -120,7 +120,11 @@
         <el-table v-if="prescription.project &&prescription.project.length > 0" :data="prescription.project" border
                   style="width: 99%;" :row-style="{ color: '#303133' }"
                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-            <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+            <el-table-column align="center" width="40" label="序号">
+              <template slot-scope="scope">
+                {{scope.$index+1}}
+              </template>
+            </el-table-column>
             <el-table-column align="center" prop="project_name" label="名称">
                 <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span>
                 </template>
@@ -136,6 +140,7 @@
                         <el-input v-model="scope.row.single_dose" @input="getProjectSingleDose(scope)"
                                   placeholder=""></el-input>
                         <div>{{scope.row.unit}}</div>
+                      <div v-if="scope.row.unit == ''">{{scope.row.good_info.default_count_unit}}</div>
                     </div>
 
                 </template>
@@ -170,7 +175,7 @@
                     <div style="display:flex;align-items:center;">
                         <el-input v-model="scope.row.total" style="width:60%" placeholder=""></el-input>
                         <div>{{scope.row.unit}}</div>
-
+                      <div v-if="scope.row.unit == ''">{{scope.row.good_info.default_count_unit}}</div>
                     </div>
                 </template>
             </el-table-column>
@@ -355,6 +360,10 @@
         this.templateFormVisible = true
 
 
+      },
+      lili(data){
+        console.log("data",this.prescription)
+
       },
       createFilter(queryString) {
         return (restaurant) => {
@@ -413,7 +422,7 @@
           }
         })
 
-      }, 
+      },
       deleteDrug: function(row, index) {
 
         this.$confirm('药品删除后不可恢复，是否确认删除', '删除', {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -104,11 +104,15 @@
       </div>
       <div class="mainRight">
         <div class="mainHeader">
+
           <el-tabs v-model="titleType" @tab-click="handleClick"
                    style="position: fixed;width: calc(100% - 490px);background:#fff;">
             <el-tab-pane label="电子处方" name="电子处方"></el-tab-pane>
-            <el-tab-pane label="透析记录" name="透析记录"></el-tab-pane>
+            <el-tab-pane label="透析记录" name="透析记录">
+
+            </el-tab-pane>
             <el-tab-pane label="电子病历" name="电子病历"></el-tab-pane>
+
           </el-tabs>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
             <el-button size="small" ref="button_one" @click="open(1)" type="primary"
@@ -138,6 +142,11 @@
             <el-button size="small" @click="opentwo(3)" type="primary">病历调用</el-button>
             <el-button size="small" @click="opentwo(4)" type="primary">存模板</el-button>
           </div>
+
+          <div class="mainCell fixedCellOne" style="float:right" v-if="titleType == '透析记录'">
+            <el-button size="small" ref="button_one" @click="printOrderOne" type="primary">打印上机单
+            </el-button>
+          </div>
         </div>
         <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
         <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
@@ -284,9 +293,9 @@
           >
         </template>
         <div id='printMain'>
-          <print ref="print" v-if="selecting_schs1.length > 0" :paramsObj='paramsObj'></print>
-          <treatPrint ref="treatPrint" v-if="selecting_schs2.length > 0" :paramsObj='paramsObj2'></treatPrint>
-          <checkPrint ref="checkPrint" v-if="selecting_schs3.length > 0" :paramsObj='paramsObj3'></checkPrint>
+          <print ref="print" v-if="selecting_schs1.length > 0" :paramsObj='paramsObj' :newHisPatient="hisPatientInfo"></print>
+          <treatPrint ref="treatPrint" v-if="selecting_schs2.length > 0" :paramsObj='paramsObj2' :newHisPatient="hisPatientInfo"></treatPrint>
+          <checkPrint ref="checkPrint" v-if="selecting_schs3.length > 0" :paramsObj='paramsObj3' :newHisPatient="hisPatientInfo"></checkPrint>
         </div>
 
       </el-dialog>
@@ -311,6 +320,174 @@
     </recordPrint>
     </el-dialog>
 
+    <el-dialog
+      :visible.sync="startVisibility"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :show-close="false"
+      width="30%"
+      >
+         <el-button
+            size="small"
+            icon="el-icon-printer"
+            type="primary"
+            @click="printAction"
+            style="float:right"
+            >打印</el-button
+          >
+       <div id="print_content">
+        <div class="print_main_content">
+          <div class="table_panel">
+             <div v-for="(main_collection,index) in printList" :key="index">
+              <div class="signPrint" style="width: 360px;font-size:16px;">
+                <div style="margin-left:50px;">姓名:
+                  <span>{{main_collection.patient.name}} </span>
+                  （{{ main_collection.patient.dialysis_no }}，{{ main_collection.patient.age }}岁）
+                </div>
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                  <span style="display: block;width: 50%;">
+                    床号：{{ main_collection.number.number }}
+                    <span style="width:auto;" v-if="main_collection.schedule_type == 1">上午</span>
+                    <span style="width:auto;" v-if="main_collection.schedule_type == 2">下午</span>
+                    <span style="width:auto;" v-if="main_collection.schedule_type == 3">晚上</span>
+                  </span>
+                  <span style="display: block;width: 50%;">{{ printDate }}</span>
+                </div>
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                   <span style="display: block;width: 50%;">干体重：{{main_collection.assessmentbefor.dry_weight}}Kg</span>
+                    <span style="display: block;width: 50%;">抗凝剂：{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}</span>
+
+                </div>
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                  <span style="display: block;width: 50%;">净重值：{{ main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.additional_weight }}Kg</span>
+
+                  <span style="display: block;width: 50%;">
+                    首剂： <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">
+                   {{main_collection.dialysissolution.anticoagulant_shouji}}mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                   {{main_collection.dialysissolution.anticoagulant_shouji}} mg
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">
+                   {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                     {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                    </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                   </span>
+                    </span>
+
+                </div>
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                  <span style="display: block;width: 50%;">体重增加：{{ (main_collection.assessmentbefor.weight_before - assessmentAfterDislysis.weight_after).toFixed(2) }}Kg</span>
+                 <span style="display: block;width: 50%;">
+                     维持：{{main_collection.dialysissolution.anticoagulant_weichi}}
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
+                    mg/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                    mg/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                   iu/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">
+                    mg/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                    mg/h
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">
+                   iu/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                   iu/h
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                    iu/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                    iu/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                    iu/h
+                    </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                    iu/h
+                   </span>
+                  </span>
+
+                </div>
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                  <span style="display: block;width: 50%;">处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}
+                    <span v-if="$store.getters.xt_user.org.id == 10278">ml</span>
+                    <span v-else>L</span>
+                    </span>
+                  <span style="display: block;width: 50%;">
+                    总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 1">
+                    mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                    mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                    iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">
+                   mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                    mg
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">
+                   iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                    iu
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                     iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                   iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                    iu
+                    </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                   iu
+                   </span>
+                  </span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="startVisibility = false">取 消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -329,7 +506,7 @@ import treatPrint from './treatPrint'
 import recordPrint from './recordPrint'
 import checkPrint from './checkPrint'
 import dialysisIndex from './components/dialysisIndex'
-
+import {getInitPrintDataOne} from '@/api/dialysis_record'
 const moment = require('moment')
 
 export default {
@@ -423,7 +600,13 @@ export default {
       all_his_patients: [],
       checkVisible: false,
       current_tab: 'day',
-      org_id: 0
+      org_id: 0,
+      loading:false,
+      startVisibility:false,
+      assessmentAfterDislysis:{},
+      printList:[],
+      printDate:'',
+      anticoagulants_confit:null,
     }
   },
 
@@ -4990,11 +5173,53 @@ export default {
       })
 
     },
+
     getInitDataOne(val){
       this.prescriptions = val
-    }
+    },
+    printOrderOne(){
+      this.getInitPrintData()
+    },
+    getInitPrintData(){
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+       })
+
+       var params = {
+         patient_id:this.patientInfo.id,
+         record_date:this.record_date,
+       }
+      console.log("param2332323233232222wode",params)
+      getInitPrintDataOne(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          var assessmentAfterDislysis =  response.data.data.assessmentAfterDislysis
+          console.log("list2332322332",list)
+          this.printList = list
+          this.assessmentAfterDislysis = assessmentAfterDislysis
+          this.startVisibility = true
+          loading.close()
+        }
+      })
+    },
+    printAction: function() {
+      const style = '@media print {.signPrint{margin-left:30px;} .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 180px;} @page {margin-top:10px;}}'
+      const style1 = '@page {margin-top:10px;} @media print{}'
+      printJS({
+        printable: 'print_content',
+        type: 'html',
+        documentTitle: '',
+        style: style1,
+        scanStyles: false
+      })
+    },
   },
   created() {
+    this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
+    this.printDate = moment().format("YYYY-MM-DD HH:mm:ss")
     this.$nextTick(() => {
 
     })
@@ -5229,6 +5454,16 @@ p {
   display: flex;
   justify-content: space-between;
 }
+
+.fixedCellOne {
+  position: fixed;
+  z-index: 99;
+  right: -180px;
+  background: #fff;
+  width: 300px;
+  display: flex;
+  justify-content: space-between;
+}
 </style>
 
 <style lang="scss">

src/xt_pages/outpatientDoctorStation/modeTemplate.vue

@@ -87,11 +87,11 @@
     },
     methods: {
       searchAction() {
-      
+
       },
       handleSizeChange(val) {
         this.limit = val
-      
+
       },
       getTime(val, temp) {
         if (val != 0) {
@@ -114,7 +114,7 @@
 
            this.templates = modeTeplate
          }
-       })   
+       })
       },
       handleCurrentChange(row){
         this.mode_id = row.id
@@ -126,7 +126,7 @@
           if(id == this.tablelist[i].id){
             mode_name = this.tablelist[i].name
           }
-        } 
+        }
         return mode_name
       },
       deleteModeTemplate(row,index) {
@@ -152,9 +152,9 @@
        jumpDetail(row) {
         this.$router.push('/hisTool/modeTemplateDetail?id=' + row.id + '&patient_id=' + this.patient_id + '&patient_name=' + this.patient_name +"&modes="+this.mode_str)
       },
-      batchAdd(){
-        this.$router.push("/hisTool/batchTemplate")
-      }
+      // batchAdd(){
+      //   this.$router.push("/hisTool/batchTemplate")
+      // }
     },
     created() {
       this.tablelist =  Object.values(this.$store.getters.treatment_mode)

src/xt_pages/outpatientDoctorStation/modeTemplateDetail.vue

@@ -56,7 +56,8 @@
                             <prescription-template-mode-table ref="prescription_tables"
                                                          :prescription="curPrescriptions"
                                                          :preDrugs="preDrugs"
-                                                         :activeType="customTabIndex"></prescription-template-mode-table>
+                                                         :activeType="customTabIndex">
+                            </prescription-template-mode-table>
                         </el-tabs>
                     </div>
                 </div>
@@ -952,7 +953,7 @@
                 this.prescriptions[i].addition[b].count = this.prescriptions[i].addition[b].count.toString()
               }
             }
-            
+
             let data = {
               'prescriptions': this.prescriptions
             }
@@ -1632,12 +1633,17 @@
                     obj['medical_code'] = prescription.project[b].project.medical_code
                     obj['project_name'] = prescription.project[b].project.project_name
                     obj['project'] = prescription.project[b].project
+                    obj['unit'] = prescription.project[b].project.unit
+
 
                   } else if (prescription.project[b].type == 3) {
                     obj['statistical_classification'] = ''
                     obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                     obj['project_name'] = prescription.project[b].good_info.good_name
                     obj['good_info'] = prescription.project[b].good_info
+                    // obj['unit'] = prescription.project[b].project.unit
+                    obj['unit'] = prescription.project[b].good_info.packing_unit
+
 
                   }
                   tempProject.push(obj)
@@ -1894,7 +1900,7 @@
       clearSelection() {
         this.$refs.tabProjectTeam.clearSelection()
       }
-    }, 
+    },
     created() {
       for(let key in this.$store.getters.treatment_mode){
         this.modeOptions[key] = this.$store.getters.treatment_mode[key]
@@ -1983,7 +1989,7 @@
         display: flex;
         flex-direction: column;
         position: relative;
-
+        
     .el-form-item {
         width: 33%;
         margin-bottom: 14px;

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1288,6 +1288,7 @@
           this.showOne = true
           this.showTwo = false
           this.$nextTick(() => {
+            console.log("lilili1111111111111111111111111111111111111111111",this.prescriptions[this.prescriptions.length - 1])
             this.$refs.prescription_tables.setNewData(this.prescriptions[this.prescriptions.length - 1])
           })
           this.customTabIndex = 1
@@ -1299,6 +1300,7 @@
           this.showTwo = true
           this.showOne = false
           this.$nextTick(() => {
+            console.log("lilili1111111111111111111111111111111111111111111",this.prescriptions[this.prescriptions.length - 1])
             this.$refs.prescription_tables.setNewData(this.prescriptions[this.prescriptions.length - 1])
           })
           this.customTabIndex = 2
@@ -1599,19 +1601,14 @@
             return false
           } else {
             this.prescriptions = []
-            // console.log(this.tempForm)
-
             if (response.data.data.template.id > 0) {
-
               this.tempForm.name = response.data.data.template.name
               this.tempForm.mode_id = response.data.data.template.mode
-
               for (let i = 0; i < response.data.data.prescriptions.length; i++) {
                 var prescription = response.data.data.prescriptions[i]
                 let tempAdvice = []
                 let tempProject = []
                 let tempAddition = []
-
                 //药品
                 for (let b = 0; b < prescription.advices.length; b++) {
                   let obj = {
@@ -1653,7 +1650,6 @@
                     price: prescription.project[b].price,
                     remark: prescription.project[b].remark,
                     medical_code: prescription.project[b].project.medical_code,
-                    unit: prescription.project[b].project.unit,
                     type: prescription.project[b].type,
                     frequency_type: prescription.project[b].frequency_type,
                     day_count: prescription.project[b].day_count,
@@ -1666,13 +1662,13 @@
                     obj['medical_code'] = prescription.project[b].project.medical_code
                     obj['project_name'] = prescription.project[b].project.project_name
                     obj['project'] = prescription.project[b].project
-
+                    obj['unit'] = prescription.project[b].unit
                   } else if (prescription.project[b].type == 3) {
                     obj['statistical_classification'] = ''
                     obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                     obj['project_name'] = prescription.project[b].good_info.good_name
                     obj['good_info'] = prescription.project[b].good_info
-
+                    obj['unit'] = prescription.project[b].good_info.packing_unit
                   }
                   tempProject.push(obj)
                 }
@@ -1713,17 +1709,12 @@
                 order_status: 0,
                 med_type: ''
               }
-
               obj.med_type = 14
-
               this.prescriptions.push(obj)
               this.curPrescriptions = this.prescriptions[0]
             }
-
           }
-
         })
-
       },
       getlist() {
         this.tabProject = []
@@ -2151,7 +2142,7 @@
         display: flex;
         flex-direction: column;
         position: relative;
-
+        overflow-x: auto;
     .el-form-item {
         width: 33%;
         margin-bottom: 14px;

src/xt_pages/outpatientDoctorStation/print.vue

@@ -18,7 +18,7 @@
 9675:测试
  -->
     <div class="dialysisPage" style="padding-top: 40px">
-      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243">
+      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 0">
 
         <printOne v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
 
@@ -68,7 +68,7 @@
           :advicePrint="advicePrint"
           :ids="ids"
           :patient="patient"
-          :hisPatient="hisPatient"
+          :newHisPatient="newHisPatient"
           :doctorPorject="doctorPorject"
           :patient_id="patient_id"
           :record_date="record_date"
@@ -105,6 +105,7 @@ export default {
   },
   props: {
     paramsObj: Object,
+    newHisPatient:Object
   },
   data() {
     return {

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -37,17 +37,18 @@
           </div>
           <div style="display: flex">
             <div style="width: 33%; display: flex">
-              费别：<span class="under_line"
-                ><span>{{
-                  faber && faber.transBody
-                    ? getName(faber.transBody.outputlist1)
-                    : "自费"
-                }}</span></span
-              >
+              费别：
+              <span class="under_line">
+                <span v-if="newHisPatient.id > 0">{{
+                    newHisPatient.balance_accounts_type == 1 ? '医保':'自费'
+                }}</span>
+                   <span v-else>{{
+                     }}</span>
+            </span>
             </div>
             <div style="width: 33%; display: flex">
               电脑号：<span class="under_line">{{
-                faber && faber.transBody ? faber.transBody.aac999 : ""
+                newHisPatient.id_card_no
               }}</span>
             </div>
             <div style="width: 33%; display: flex">
@@ -258,6 +259,7 @@ export default {
     prescription_id: Number,
     his_patient_id:Number,
     ids: String,
+    newHisPatient:Object,
   },
   data() {
     return {
@@ -269,6 +271,7 @@ export default {
       prescriptionInfo: [],
       doc_name: "",
       hisPatient: {},
+
       department: [],
       prescriptions: [],
       projectList: [],

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -11,12 +11,12 @@
           >打印</el-button
         >
       </template> -->
-            
+
       <div class='dialysisPage' style="padding-top:40px;">
         <!-- 此下条为本地开发下页面 -->
         <!-- <printTwo v-if="org_id == 4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo> -->
         <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4&& org_id !=0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
-        <printTwo v-else v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo>
+        <printTwo v-else v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
       </div>
   </div>
 </template>
@@ -42,7 +42,8 @@ export default {
     printTwo
   },
   props:{
-    paramsObj:Object
+    paramsObj:Object,
+    newHisPatient:Object
   },
   data() {
     return {
@@ -78,7 +79,7 @@ export default {
             scanStyles: false
           });
         },500)
-        
+
       }else{
         const style =
         '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.prescription-print{font-size: 14px;}.printTitle{font-size: 18px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:5px;padding:0 10px;}.infoTitle div{width: 300px;margin-bottom:5px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;}.prescriptionBox{padding:0 10px;min-height:380px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; padding:0 10px;margin:5px 0;} .actionBar div{width:150px;}}';
@@ -89,7 +90,7 @@ export default {
           scanStyles: false
         });
       }
-      
+
 
       // if (this.org_template_info.template_id == 1) {
       //   printJS({
@@ -104,10 +105,10 @@ export default {
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
     getAllHisPatientList(){
          const params = {
@@ -133,7 +134,7 @@ export default {
             // console.log(this.patientTableData[0])
             // this.choosePatient(this.patientTableData[0])
             this.cal_one = cal_one
-            this.cal_two = cal_two   
+            this.cal_two = cal_two
          }
       })
     },
@@ -167,7 +168,7 @@ export default {
     searchAction(){
 
     }
-    
+
   },
 
   created() {
@@ -191,7 +192,7 @@ export default {
         var prescription_id = this.paramsObj.prescription_id
         this.prescription_id = prescription_id
         this.ids = this.paramsObj.ids
-        
+
       },
       deep:true
     }
@@ -364,7 +365,7 @@ export default {
   .dialysisPage::-webkit-scrollbar {
     height: 15px;
   }
-  
+
   .el-date-editor{
     .el-input__inner{
       padding-right:0px;

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -34,16 +34,21 @@
       </div>
       <div style="display: flex">
         <div style="width: 33%; display: flex">
-          费别：<span class="under_line">{{
-            faber && faber.transBody
-              ? getName(faber.transBody.outputlist1)
-              : "自费"
-          }}</span>
+          费别：
+          <span class="under_line">
+                <span v-if="newHisPatient.id > 0">{{
+                    newHisPatient.balance_accounts_type == 1 ? '医保':'自费'
+                  }}</span>
+                   <span v-else>{{
+                     }}</span>
+            </span>
         </div>
         <div style="width: 33%; display: flex">
-          电脑号：<span class="under_line">{{
-            faber && faber.transBody ? faber.transBody.aac999 : ""
-          }}</span>
+          电脑号：  <span class="under_line">
+                <span>{{
+                    newHisPatient.id_card_no
+                  }}</span>
+            </span>
         </div>
         <div style="width: 33%; display: flex">
           处方编号：<span class="under_line">{{
@@ -325,6 +330,7 @@ export default {
     record_date: String,
     prescription_id: Number,
     ids: String,
+    newHisPatient:Object,
   },
   data() {
     return {

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -167,11 +167,11 @@
     <div style="display: flex; justify-content: space-around; margin-top: 25px">
       <div>总费用:{{ getAllPice() }}</div>
       <div>
-        个人支付: 
+        个人支付:
         {{getActPay()}}
-        <!-- <span v-if="his_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>  
+        <!-- <span v-if="his_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
         <span v-if="his_patient.balance_accounts_type != 2">{{ getActPay() }}</span> -->
-      
+
       </div>
       <div>基金支付记账:{{ getFundPaySumamt() }}</div>
       <div>补充医疗支付记账:{{ getHifesPay() }}</div>
@@ -305,6 +305,7 @@ export default {
           var list = response.data.data.list;
           this.his_patient = response.data.data.his_patient;
           this.list = list;
+          console.log( this.list)
           this.tableData = [];
           for (let i = 0; i < list.length; i++) {
             for (let j = 0; j < list[i].orders.length; j++) {
@@ -345,7 +346,7 @@ export default {
             this.item_type = this.id;
           }
 
-          
+
           if (this.keywords != "") {
             for (let i = 0; i < this.tableData.length; i++) {
               if (this.tableData[i].index != "合计") {
@@ -444,25 +445,19 @@ export default {
       return total_price.toFixed(2);
     },
     getActPay() {
-      var arrNew = []
       var act_pay = 0;
       for (let i = 0; i < this.list.length; i++) {
         for (let j = 0; j < this.list[i].orders.length; j++) {
-          //个人支付
-          console.log("is",this.list[i].orders[j])
-          if(this.list[i].orders[j].is_medicine_insurance == 0){
-             arrNew.push(this.list[i].orders[j])
+          if(this.list[i].orders[j].is_medicine_insurance == 1){
+            act_pay = act_pay + this.list[i].orders[j].psn_cash_pay
+          }else{
+            console.log(this.list[i].orders[j].medfee_sumamt)
+            act_pay= act_pay +  this.list[i].orders[j].medfee_sumamt
           }
+
         }
       }
-      if(arrNew.length > 0){
-        for(let i=0;i<arrNew.length;i++){
-           for(let j=0;j<arrNew[i].order_info.length;j++){
-             act_pay += arrNew[i].order_info[j].cnt * arrNew[i].order_info[j].pric
-           }
-        }
-      }
-      console.log("arrNew2332323223",arrNew)
+
       return act_pay.toFixed(2);
     },
     getFundPaySumamt() {
@@ -472,7 +467,7 @@ export default {
           fund_pay_sumamt += this.list[i].orders[j].fund_pay_sumamt;
         }
       }
-      return fund_pay_sumamt;
+      return fund_pay_sumamt.toFixed(2);
     },
     getHifesPay() {
       var hifes_pay = 0;
@@ -481,7 +476,7 @@ export default {
           hifes_pay += this.list[i].orders[j].hifes_pay;
         }
       }
-      return hifes_pay;
+      return hifes_pay.toFixed(2);
     },
     getMafPay() {
       var maf_pay = 0;
@@ -490,7 +485,7 @@ export default {
           maf_pay += this.list[i].orders[j].maf_pay;
         }
       }
-      return maf_pay;
+      return maf_pay.toFixed(2);
     },
     toPrint() {
       this.$router.push({

src/xt_pages/outpatientTool/detailPrint.vue

@@ -28,7 +28,7 @@
           <span v-if="his_patient!=null && his_patient.number!=''">{{his_patient.number}}</span>
           <span v-if="his_record_patient!=null && his_record_patient.ipt_otp_no!=''">{{his_record_patient.ipt_otp_no}}</span></td>
             <td>科室：
-          <span v-if="his_patient!=null && his_patient.departments >0"> {{ getDepartment(his_patient.departments) }}</span> 
+          <span v-if="his_patient!=null && his_patient.departments >0"> {{ getDepartment(his_patient.departments) }}</span>
           <span v-if="his_record_patient!=null && his_record_patient.departments > 0">{{ getDepartment(his_record_patient.departments) }}</span></td>
             <td>就诊流水号：
           <span v-if="his_patient!=null && his_patient.number!=''"> {{ his_patient.number }}</span>
@@ -60,7 +60,7 @@
         <div>患者姓名：{{ patient.name }}</div>
         <div>性别：{{ patient.gender == 1 ? "男" : "女" }}</div>
         <div>结算类别：
-          
+
           {{getType(his_record_patient.balance_accounts_type)}}
         </div>
         <div style="min-width:300px;">发票号码：{{order.fa_piao_number}}</div>
@@ -73,7 +73,7 @@
           {{ getDepartment(his_record_patient.departments) }}
         </div>
         <div style="min-width:350px;">就诊流水号：
-       
+
           {{his_record_patient.number}}
         </div>
       </div> -->
@@ -108,7 +108,7 @@
             <span v-if="item.is_total == 2">合计</span>
           </td>
           <td style="text-align: center">
-            <span v-if="item.is_total == 1">{{getTimes(item.record_date)}}</span> 
+            <span v-if="item.is_total == 1">{{getTimes(item.record_date)}}</span>
           </td>
           <td width="80" style="text-align: center">{{ item.number }}</td>
           <td style="text-align: center">
@@ -239,11 +239,11 @@ export default {
           this.patient = response.data.data.patient;
 
           this.his_patient = response.data.data.his_patient;
-         
+
          this.his_record_patient = response.data.data.his_record_patient
 
          this.hisDepatment = response.data.data.hisDepatment;
-          
+
          this.orderList = response.data.data.orderList
           this.order = response.data.data.order
           this.tableData = [];
@@ -271,7 +271,7 @@ export default {
           this.tableData.push(obj);
 
 
-         
+
           if (this.$route.query.keyword != "") {
             var new_arr = []
             for (let i = 0; i < this.tableData.length; i++) {
@@ -314,7 +314,7 @@ export default {
             objs.total_price = this.getPrice(new_arr)
             new_arr.push(objs)
             this.tableData = new_arr;
-           
+
           }
 
           if(this.$route.query.id == 1){
@@ -347,10 +347,10 @@ export default {
                 }
               }
             }
-         
+
             this.tableData = []
             obj.total_price = this.getPrice(new_arr)
-           
+
             for(let i=0;i<new_arr.length;i++){
               new_arr[i].is_total = 1
             }
@@ -376,7 +376,7 @@ export default {
               new_arr[i].is_total = 1
             }
             new_arr.push(obj)
-           
+
             this.tableData = new_arr
           }
 
@@ -393,25 +393,18 @@ export default {
       return total_price;
     },
     getActPay() {
-      var arrNew = []
       var act_pay = 0;
       for (let i = 0; i < this.list.length; i++) {
         for (let j = 0; j < this.list[i].orders.length; j++) {
-          //个人支付
-          console.log("is",this.list[i].orders[j])
-          if(this.list[i].orders[j].is_medicine_insurance == 0){
-             arrNew.push(this.list[i].orders[j])
+          if(this.list[i].orders[j].is_medicine_insurance == 1){
+            act_pay = act_pay + this.list[i].orders[j].psn_cash_pay
+          }else{
+            act_pay= act_pay +  this.list[i].orders[j].medfee_sumamt
           }
+
         }
       }
-      if(arrNew.length > 0){
-        for(let i=0;i<arrNew.length;i++){
-           for(let j=0;j<arrNew[i].order_info.length;j++){
-             act_pay += arrNew[i].order_info[j].cnt * arrNew[i].order_info[j].pric
-           }
-        }
-      }
-      console.log("arrNew2332323223",arrNew)
+
       return act_pay.toFixed(2);
     },
     getFundPaySumamt() {

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -10,12 +10,12 @@
         </div>
         <div class="listInfo">
             <div>科别：
-              <span v-if="org_id!=10215"> {{getDepartment(his_patient.departments)}}</span> 
+              <span v-if="org_id!=10215"> {{getDepartment(his_patient.departments)}}</span>
               {{getDepartment(his_record_patient.departments)}}
             </div>
             <div>床号：<span v-if="schedule.length > 0">{{getBedName(schedule[0].bed_id)}}</span></div>
             <div>门诊号：
-               <span v-if="org_id!=10215">{{his_patient.number}}</span> 
+               <span v-if="org_id!=10215">{{his_patient.number}}</span>
                {{his_record_patient.ipt_otp_no}}
             </div>
             <div>姓名：{{patient.name}}</div>
@@ -76,27 +76,27 @@
                    {{item.cost_type}}
                  </span>
                   <span v-if="item.type == 2">
-                    {{item.cost_type}} 
+                    {{item.cost_type}}
                   </span>
                   <span v-if="item.type == 3">
                     材料费
-                  </span> 
+                  </span>
                 </td>
                 <td style="text-align:center" >
-                  <span>{{item.name}}</span>  
+                  <span>{{item.name}}</span>
                 </td>
                 <td style="text-align:center" >
                   {{ item.spec }}
                 </td>
                 <td style="text-align:center" >
-                  {{item.pric}}  
+                  {{item.pric}}
                 </td>
                 <td style="text-align:center" >
                    {{item.count_number }}{{item.unit }}
                 </td>
                 <td style="text-align:center" >
-                   <span v-if="item.is_total == 1">{{ item.total }}</span>  
-                   <span v-if="item.is_total == 2">{{ (item.pric * item.count_number).toFixed(2) }}</span> 
+                   <span v-if="item.is_total == 1">{{ item.total }}</span>
+                   <span v-if="item.is_total == 2">{{ (item.pric * item.count_number).toFixed(2) }}</span>
                 </td>
                 <td style="text-align:center" >
                   {{getChrgitmLv(item.medical_insurance_level)}}
@@ -194,7 +194,7 @@
             return false
           } else {
           this.drugTypeList =response.data.data.drugTypeList
-          this.costClassifyList = response.data.data.costClassifyList 
+          this.costClassifyList = response.data.data.costClassifyList
           var list = response.data.data.list
           this.list = list
           this.orderList = response.data.data.orderList
@@ -206,7 +206,7 @@
                new_arr.push(list[i].orders[j])
             }
           }
-          
+
 
           var order_info = []
           for(let i=0;i<new_arr.length;i++){
@@ -228,8 +228,8 @@
               }
             }
           }
-          
-          
+
+
           //合并，相同的合并在一起
 
           let dataInfo = {}
@@ -257,8 +257,8 @@
             }
             dataInfo[item_id].child.push(item)
           })
-          let arr = Object.values(dataInfo) 
-          
+          let arr = Object.values(dataInfo)
+
           for(let i=0;i<arr.length;i++){
             for(let j=0;j<arr[i].child.length;j++){
                if(arr[i].advice_id >0){
@@ -269,8 +269,8 @@
                   arr[i].unit = arr[i].child[0].advice.prescribing_number_unit
                   arr[i].cost_type = arr[i].child[0].advice.drug.drug_type
                   arr[i].medical_insurance_level = arr[i].child[0].advice.drug.medical_insurance_level
-                 
-                 
+
+
                }
                if(arr[i].project_id > 0){
                   arr[i].record_date = arr[i].child[0].project.record_date
@@ -293,7 +293,7 @@
                arr[i].count_number +=arr[i].child[j].cnt
             }
           }
-          
+
           var obj = {is_total:1,total:0}
           obj.total = this.getAllPiceTwo(arr)
           for(let i=0;i<arr.length;i++){
@@ -307,18 +307,18 @@
           arr.push(obj)
 
           this.tableList = arr
-         
+
           this.patient = response.data.data.patient
-         
+
           this.his_patient = response.data.data.his_patient
           this.hisDepatment =  response.data.data.hisDepatment
           this.order =  response.data.data.order
           this.his_record_patient = response.data.data.his_record_patient
-          this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList  
+          this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList
           this.schedule = response.data.data.schedule
           this.bedNumber = response.data.data.bedNumber
           if(this.$route.query.keyword !=""){
-           
+
             var new_arr = []
             for(let i=0;i<this.tableList.length;i++){
               if(this.tableList[i].is_total!=1){
@@ -326,7 +326,7 @@
                   new_arr.push(this.tableList[i])
                 }
               }
-             
+
              }
               var obj ={index:"合计",is_total:1,total:0}
               obj.total = this.getAllPiceTwo(new_arr)
@@ -341,9 +341,9 @@
                 if(this.tableList[i].is_total!=1){
                   if(this.tableList[i].type == 1){
                    new_arr.push(this.tableList[i])
-                }  
+                }
               }
-                
+
              }
              this.tableList = []
              this.tableList = new_arr
@@ -353,9 +353,9 @@
              for(let i=0;i<this.tableList.length;i++){
                if(this.tableList[i].is_total!=1){
                   if(this.tableList[i].type == 2){
-                
+
                   new_arr.push(this.tableList[i])
-                }  
+                }
               }
              }
              this.tableList = []
@@ -367,7 +367,7 @@
                 if(this.tableList[i].is_total!=1){
                   if(this.tableList[i].type == 3){
                     new_arr.push(this.tableList[i])
-                }  
+                }
               }
              }
              this.tableList = []
@@ -404,7 +404,7 @@
               id: details[i].advice.drug_id,
               price: details[i].advice.price,
               record_date:details[i].advice.advice_date
-              
+
             }
             drug_ids.push(obj)
           } else if (details[i].project && details[i].project.id > 0 && details[i].project.prescription && details[i].project.prescription.type == 2) { //项目
@@ -418,10 +418,10 @@
           }
 
         }
-      
+
         let new_drug_ids = this.unique(drug_ids)
         let new_project_ids = this.unique(project_ids)
-       
+
         let list = []
         if (new_drug_ids.length > 0 && new_project_ids.length == 0) {
           for (let i = 0; i < new_drug_ids.length; i++) {
@@ -476,7 +476,7 @@
             }
             obj['count'] = count
             list.push(obj)
-          
+
           }
         }
 
@@ -502,7 +502,7 @@
             list.push(obj)
 
           }
-         
+
           for (let i = 0; i < new_project_ids.length; i++) {
             let obj = {}
             let count = 0
@@ -529,13 +529,13 @@
             }
             obj['count'] = count
             list.push(obj)
-          
+
           }
          }
-       
+
         return list
-      }, 
-    
+      },
+
       getMedicineInsuranceType(type) {
         switch (type) {
           case "01":
@@ -663,7 +663,7 @@
       }else{
         return "0.00"
       }
-     
+
     },
     getAllPiceTwo(arr){
 
@@ -678,7 +678,7 @@
       }else{
         return total_price
       }
-     
+
     },
     setMonthPrescription(month_prescriptions) {
       let drug_month_prescriptions = {
@@ -718,7 +718,7 @@
 
       drug_ids = this.unique(drug_ids)
       project_ids= this.unique(project_ids)
-  
+
       for (let i = 0; i < drug_ids.length; i++) {
         let obj = {}
         let count = 0
@@ -738,7 +738,7 @@
             obj['record_date'] = drug_month_prescriptions.advices[a].advice_date
             obj['spec'] = drug_month_prescriptions.advices[a].drug.dose  + drug_month_prescriptions.advices[a].drug.dose_unit +"*" + drug_month_prescriptions.advices[a].drug.min_number + drug_month_prescriptions.advices[a].drug.min_unit + "/" + drug_month_prescriptions.advices[a].drug.max_unit
             obj['is_total'] = 2
-            obj['chrgitm_lv'] =  drug_month_prescriptions.advices[a].drug.medical_insurance_level 
+            obj['chrgitm_lv'] =  drug_month_prescriptions.advices[a].drug.medical_insurance_level
             obj['unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
             count = count + drug_month_prescriptions.advices[a].prescribing_number
 
@@ -777,7 +777,7 @@
             obj['day'] = project_month_prescriptions.project[a].day
             obj['single_dose_unit'] = project_month_prescriptions.project[a].unit
             obj['prescribing_number_unit'] = project_month_prescriptions.project[a].unit
-           
+
             count = count + parseFloat(project_month_prescriptions.project[a].count)
             obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
             obj['remark'] = project_month_prescriptions.project[a].remark
@@ -911,7 +911,7 @@
             total_price += this.tableList[i].count_number * this.tableList[i].pric
          }
       }
-      
+
       return total_price.toFixed(2)
     },
     getChineseTraditionalMedicineCostTotal(){
@@ -1041,7 +1041,7 @@
       return total_price.toFixed(2)
     },
     getDrugType(id){
-    
+
       var name = ""
       for(let i=0;i<this.drugTypeList.length;i++){
          if(id == this.drugTypeList[i].value){
@@ -1108,42 +1108,35 @@
       for(let i=0;i<this.orderList.length;i++){
         fund_pay_sumamt +=this.orderList[i].fund_pay_sumamt
       }
-     
+
       if(fund_pay_sumamt >0){
         return fund_pay_sumamt.toFixed(2)
       }else{
-      
+
         return "0.00"
       }
     },
     getActPay() {
-      var arrNew = []
       var act_pay = 0;
       for (let i = 0; i < this.list.length; i++) {
         for (let j = 0; j < this.list[i].orders.length; j++) {
-          //个人支付
-          console.log("is",this.list[i].orders[j])
-          if(this.list[i].orders[j].is_medicine_insurance == 0){
-             arrNew.push(this.list[i].orders[j])
+          if(this.list[i].orders[j].is_medicine_insurance == 1){
+            act_pay = act_pay + this.list[i].orders[j].psn_cash_pay
+          }else{
+            act_pay= act_pay +  this.list[i].orders[j].medfee_sumamt
           }
+
         }
       }
-      if(arrNew.length > 0){
-        for(let i=0;i<arrNew.length;i++){
-           for(let j=0;j<arrNew[i].order_info.length;j++){
-             act_pay += arrNew[i].order_info[j].cnt * arrNew[i].order_info[j].pric
-           }
-        }
-      }
-      console.log("arrNew2332323223",arrNew)
+
       return act_pay.toFixed(2);
     },
 
     },
     created(){
       this.org_id = this.$store.getters.xt_user.org.id;
-     
-      this.getGatherDetailList()   
+
+      this.getGatherDetailList()
     }
 
   }

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

@@ -294,6 +294,12 @@ export default {
             if(modeIdCount[i].mode_id == 30){
                modeIdCount[i].mode_id = "血浆胆红素吸附+HP"
             }
+           if(modeIdCount[i].mode_id == 31){
+               modeIdCount[i].mode_id = "HPD"
+            }
+            if(modeIdCount[i].mode_id == 32){
+               modeIdCount[i].mode_id = "HDP"
+            }
           }
           this.modeIdCount = modeIdCount
           let dataInfo = {}
@@ -475,7 +481,14 @@ export default {
           patients[i].mode_id = "CVVHDF"
         }else if(patients[i].mode_id == 29){
           patients[i].mode_id = "PE"
+        }else if(patients[i].mode_id == 30){
+          patients[i].mode_id = "血浆胆红素吸附+HP"
+        }else if(patients[i].mode_id == 31){
+          patients[i].mode_id = "HPD"
+        }else if(patients[i].mode_id == 32){
+          patients[i].mode_id = "HDP"
         }
+
       }
     },
      querySearchAsync(keyword, cb) {
@@ -540,14 +553,17 @@ export default {
          this.DialysisData[i].CVVHD = this.getHdModeIdCount(this.DialysisData[i].patient_id,"CVVHD")
          this.DialysisData[i].CVVHDF = this.getHdModeIdCount(this.DialysisData[i].patient_id,"CVVHDF")
          this.DialysisData[i].PE = this.getHdModeIdCount(this.DialysisData[i].patient_id,"PE")
+         this.DialysisData[i].XUEHP = this.getHdModeIdCount(this.DialysisData[i].patient_id,"血浆胆红素吸附+HP")
+         this.DialysisData[i].HPD = this.getHdModeIdCount(this.DialysisData[i].patient_id,"HPD")
+          this.DialysisData[i].HDP = this.getHdModeIdCount(this.DialysisData[i].patient_id,"HDP")
 
          this.DialysisData[i].age = this.getAge(this.DialysisData[i].id_card_no)
          this.DialysisData[i].total_count = this.getDialysisCount(this.DialysisData[i].patient_id)
        }
        console.log("hhh2323323232",this.DialysisData)
        import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','总数']
-        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','total_count']
+        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','总数']
+        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','total_count']
 
         const data = this.formatJson(filterVal, this.DialysisData)
 

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -421,10 +421,15 @@
                 total_diffcult_nurse = total_diffcult_nurse + resp.data.data[i].difficult_nuser_count
                 total_new_fistula_nurse = total_new_fistula_nurse + resp.data.data[i].new_nuser_count
                 total_start_nurse = total_start_nurse + resp.data.data[i].start_nuser_count
+                console.log( resp.data.data[i].start_nuser_count)
+
+                console.log(total_start_nurse)
                 total_finish_nurse = total_finish_nurse + resp.data.data[i].finish_nuser_count
                 total_washpipe_nurse = total_washpipe_nurse + resp.data.data[i].washpipe_nuser_count
                 this.tableData.push(resp.data.data[i])
              }
+              console.log(total_start_nurse)
+
               this.tableData.push( {
                 user_name:"合计",
                 cure_count:total_cure,

src/xt_pages/sign/components/beforeDialysisCalling.vue

@@ -116,7 +116,7 @@ export default {
         websocketSend(data) {
             try {
                 this.websocket.send(JSON.stringify(data))
-                
+
             } catch (error) {
                 this.showError = true;
                 this.showIndex = 4;
@@ -128,8 +128,8 @@ export default {
             this.websocket.onmessage = e => {
                 let res = JSON.parse(e.data);
                 // let res = re.data;
-                console.log('res3333333333',res)
-                
+                console.log('res3333ssss333333',res)
+
                     if(res.channel == 'queue/join'){
                         if(res.data.type == 3){
                             let fisrtQueueInfo = []
@@ -237,7 +237,7 @@ export default {
                         }
                         this.fisrtQueueInfo = fisrtQueueInfo
                     }
-                
+
             }
         },
         handleStateChange: function(index) {
@@ -249,7 +249,7 @@ export default {
             //         if(item.schedule_type == 1){
             //             newArr.push(item)
             //         }
-            //     }) 
+            //     })
             //     this.waitingCalledAm = newArr
             // }else if(index == 1){
             //     let arr = this.waitingCalledPm
@@ -258,7 +258,7 @@ export default {
             //         if(item.schedule_type == 2){
             //             newArr.push(item)
             //         }
-            //     }) 
+            //     })
             //     this.waitingCalledPm = newArr
             // }
             if(index == 2){

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -162,8 +162,7 @@
             <span v-if="scope.row.is_total !=1">
               <span v-if="org_id == 9919">{{(scope.row.last_price * scope.row.count).toFixed(2)}} </span>
               <span v-if="org_id == 10210 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span>
-              <span v-if="org_id == 9671 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span>
-              <span v-if ="org_id!=9919 && org_id!=10210 && org_id!=9671">
+              <span v-if ="org_id!=9919 && org_id!=10210">
                  {{scope.row.total_price}}
                </span>
             </span>
@@ -431,6 +430,7 @@ export default {
                console.log("555555555555",order[i])
                if(order[i].price > 0){
                 console.log("近来33232323322323")
+                  order[i].total_price = 0
                  if(order[i].count_unit == order[i].min_unit && order[i].max_unit!=order[i].min_unit){
                    order[i].total_price = order[i].count * order[i].price
                  }
@@ -438,6 +438,7 @@ export default {
                    if(order[i].is_sys == 0){
                      order[i].total_price += order[i].count * order[i].price
                    }else{
+                    
                      order[i].total_price += order[i].count * order[i].price * order[i].min_number
                    }
                  }

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -112,6 +112,7 @@
         <el-button size="small" type="primary" @click="toExport()"
           >导出</el-button
         >
+        <el-button @click="lili">调试</el-button>
         <div>
           <span>&nbsp;&nbsp;</span>
           <label class="title"><span class="name">审核状态</span> :</label>
@@ -997,6 +998,9 @@ export default {
       });
     },
 
+    lili(){
+      console.log("exportList",this.exportList)
+    },
     toExport() {
       if (this.order_id == "") {
         this.$message.error("请勾选入库单");

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -18,6 +18,7 @@
           size="small"
           type="primary"
           @click="submit()"
+          v-loading="loading"
           v-if="is_check == 2"
           class="filter-item"
           >保 存</el-button

src/xt_pages/stock/drugs/query.vue

@@ -708,9 +708,8 @@ export default {
           this.tableList[i].min_unit,
           this.tableList[i].min_number
         );
-        if (this.end_time == 0) {
           this.tableList[i].outCount = this.getWarehouseOutInfo(
-            this.tableList[i].drug_warehouse_out,
+            this.tableList[i].drug_warehouse_info,
             this.tableList[i].max_unit,
             this.tableList[i].min_unit,
             this.tableList[i].min_number
@@ -721,16 +720,16 @@ export default {
             this.tableList[i].min_unit,
             this.tableList[i].min_number
           );
-        }
-        if (this.end_time != 0) {
-          this.tableList[i].outCount =
-            this.getOutCount(this.tableList[i].id) +
-            this.getAutoCount(this.tableList[i].id);
-          this.tableList[i].overplusCount =
-            this.getWarehoseInfo(this.tableList[i].drug_warehouse_info) -
-            this.getOutCount(this.tableList[i].id) -
-            this.getAutoCount(this.tableList[i].id);
-        }
+      
+        // if (this.end_time != 0) {
+        //   this.tableList[i].outCount =
+        //     this.getOutCount(this.tableList[i].id) +
+        //     this.getAutoCount(this.tableList[i].id);
+        //   this.tableList[i].overplusCount =
+        //     this.getWarehoseInfo(this.tableList[i].drug_warehouse_info) -
+        //     this.getOutCount(this.tableList[i].id) -
+        //     this.getAutoCount(this.tableList[i].id);
+        // }
       }
       import("@/vendor/Export2Excel").then((excel) => {
         const tHeader = [
@@ -1087,10 +1086,9 @@ export default {
       var max_str = "";
       var min_str = "";
       var total = 0;
-      var newarr = arr;
-      if (newarr.length > 0) {
-        for (let i = 0; i < newarr.length; i++) {
-          total += newarr[i].stock_max_number + newarr[i].stock_min_number;
+      if (arr!=null&&arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          total += arr[i].stock_max_number + arr[i].stock_min_number;
         }
       }
       if (total < min_number) {
@@ -1113,13 +1111,21 @@ export default {
     getWarehouseOutInfo(arr, max_unit, min_unit, min_number) {
       var min_str = "";
       var max_str = "";
-      var total = 0;
-      if (arr.length > 0) {
+      var total_one = 0;
+      var total_two = 0
+      var total =0 
+      if (arr!=null&&arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          total_one += parseInt(arr[i].warehousing_count);
+        }
+      }
+      if (arr!=null&&arr.length > 0) {
         for (let i = 0; i < arr.length; i++) {
-          total += parseInt(arr[i].count);
+          total_two += parseInt(arr[i].stock_max_number)+ parseInt(arr[i].stock_min_number);
         }
       }
 
+      total = total_one - total_two
       if (total < min_number) {
         min_str = total + min_unit;
       }