Merge branches '2022-10-17_vue_schedule_branch' and '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

config/dev.env.js

@@ -6,8 +6,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://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
+  //  BASE_API: '"https://api.xt.test.sgjyun.com"',
   BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',

config/index.js

@@ -29,7 +29,7 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-   // host: 'xt.test.sgjyun.com',
+    // 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,

package-lock.json

@@ -239,7 +239,7 @@
     "amdefine": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg=="
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
     },
     "ansi-escapes": {
       "version": "3.2.0",
@@ -433,7 +433,7 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
     "assign-symbols": {
       "version": "1.0.0",
@@ -459,7 +459,7 @@
     "async-foreach": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
-      "integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA=="
+      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI="
     },
     "async-limiter": {
       "version": "1.0.0",
@@ -478,7 +478,7 @@
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "atob": {
       "version": "2.1.2",
@@ -503,7 +503,7 @@
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
       "version": "1.11.0",
@@ -1489,7 +1489,7 @@
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
       "requires": {
         "tweetnacl": "^0.14.3"
       }
@@ -1509,7 +1509,7 @@
     "block-stream": {
       "version": "0.0.9",
       "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-      "integrity": "sha512-OorbnJVPII4DuUKbjARAe8u8EfqOmkEEaSFIyoQ7OjTHn6kafxWl0wLgoZ2rXaYd7MyLcDaU4TmhfxtwgcccMQ==",
+      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "requires": {
         "inherits": "~2.0.0"
       }
@@ -1918,7 +1918,7 @@
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "center-align": {
       "version": "0.1.3",
@@ -2511,7 +2511,7 @@
     "console-control-strings": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
     },
     "consolidate": {
       "version": "0.14.5",
@@ -3144,7 +3144,7 @@
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -3310,7 +3310,7 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "delegate": {
       "version": "3.2.0",
@@ -3320,7 +3320,7 @@
     "delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
     },
     "depd": {
       "version": "1.1.2",
@@ -3498,7 +3498,7 @@
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
       "requires": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
@@ -4355,7 +4355,7 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "fast-deep-equal": {
       "version": "2.0.1",
@@ -4602,7 +4602,7 @@
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
       "version": "2.3.3",
@@ -4759,7 +4759,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4782,13 +4783,15 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4804,19 +4807,22 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "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=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4946,7 +4952,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4960,6 +4967,7 @@
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4976,6 +4984,7 @@
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4983,13 +4992,15 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5010,6 +5021,7 @@
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5097,7 +5109,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5111,6 +5124,7 @@
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5205,7 +5219,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5247,6 +5262,7 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5268,6 +5284,7 @@
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5315,13 +5332,15 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -5351,7 +5370,7 @@
     "gauge": {
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "requires": {
         "aproba": "^1.0.3",
         "console-control-strings": "^1.0.0",
@@ -5366,12 +5385,12 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5379,7 +5398,7 @@
         "string-width": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5389,7 +5408,7 @@
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5434,7 +5453,7 @@
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -5583,7 +5602,7 @@
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
       "version": "5.1.5",
@@ -5656,7 +5675,7 @@
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
     },
     "has-value": {
       "version": "1.0.0",
@@ -6070,7 +6089,7 @@
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
       "requires": {
         "assert-plus": "^1.0.0",
         "jsprim": "^1.2.2",
@@ -6184,6 +6203,14 @@
       "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz",
       "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ=="
     },
+    "increase-memory-limit": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/increase-memory-limit/-/increase-memory-limit-1.0.7.tgz",
+      "integrity": "sha512-ozyn+HHAPD9VxMT1U50A7G8XXlktUWhnnEDYSeDYnQjKsNrBWHqq6XfEA0uhMdDPD+q/7rXWlzF1CbXX/c1LiQ==",
+      "requires": {
+        "glob": "^7.1.1"
+      }
+    },
     "indent-string": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
@@ -6580,7 +6607,7 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -6618,7 +6645,7 @@
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "jest-get-type": {
       "version": "22.4.3",
@@ -6672,7 +6699,7 @@
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
     },
     "jsesc": {
       "version": "1.3.0",
@@ -6711,7 +6738,7 @@
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "json3": {
       "version": "3.3.2",
@@ -7685,7 +7712,7 @@
         "semver": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha512-mfmm3/H9+67MCVix1h+IXTpDwL6710LyHuk7+cWC9T1mE0qz4iHhh6r4hU2wrIT9iTsAAC2XQRvfblL028cpLw=="
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
         }
       }
     },
@@ -7880,7 +7907,7 @@
     "nopt": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-      "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==",
+      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "requires": {
         "abbrev": "1"
       }
@@ -8494,7 +8521,7 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "pify": {
       "version": "3.0.0",
@@ -12265,7 +12292,7 @@
     "scss-tokenizer": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
-      "integrity": "sha512-dYE8LhncfBUar6POCxMTm0Ln+erjeczqEvCJib5/7XNkdw1FkUGgwMPY360FY0FgPWQxHWCx29Jl3oejyGLM9Q==",
+      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "requires": {
         "js-base64": "^2.1.8",
         "source-map": "^0.4.2"
@@ -12274,7 +12301,7 @@
         "source-map": {
           "version": "0.4.4",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "requires": {
             "amdefine": ">=0.0.4"
           }
@@ -13721,7 +13748,7 @@
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
       "requires": {
         "safe-buffer": "^5.0.1"
       }
@@ -13729,7 +13756,7 @@
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
     },
     "type-check": {
       "version": "0.3.2",
@@ -14099,7 +14126,7 @@
     "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",

package.json

@@ -12,7 +12,7 @@
     "lint": "eslint --ext .js,.vue src",
     "test": "npm run lint",
     "precommit": "lint-staged",
-    "build": "cross-env NODE_ENV=production env_config=sit node build/build.js && npm run fixfont && npm run fiximg",
+    "build": "cross-env NODE_ENV=production env_config=sit node --max_old_space_size=8192 build/build.js && npm run fixfont && npm run fiximg",
     "fixfont": "xcopy %cd%\\dist\\static\\fonts %cd%\\dist\\static\\css\\static\\fonts /s /y /d /e /i",
     "fiximg": "xcopy %cd%\\dist\\static\\img %cd%\\dist\\static\\css\\static\\img /s /y /d /e /i"
   },
@@ -50,6 +50,7 @@
     "element-ui": "^2.13.2",
     "file-saver": "^1.3.8",
     "font-awesome": "4.7.0",
+    "increase-memory-limit": "^1.0.7",
     "js-cookie": "2.2.0",
     "jsbarcode": "^3.11.5",
     "jsonlint": "1.6.3",

src/api/advice.js

@@ -505,6 +505,7 @@ export function getSchedualDoctors(params) {
 }
 
 export function getNewSchedualDoctors(params) {
+  console.log('params-----', params)
   return request({
     url: '/api/schedule/new/advices',
     method: 'get',
@@ -568,10 +569,10 @@ export function excutionDoctorAdviceById(params) {
   })
 }
 
-export function GetMobileScheduleList(params){
+export function GetMobileScheduleList(params) {
   return request({
-    url:"/api/schedule/getmobileschedulelist",
-    method:"Get",
-    params:params,
+    url: '/api/schedule/getmobileschedulelist',
+    method: 'Get',
+    params: params
   })
-}
+}

src/api/patient.js

@@ -612,3 +612,43 @@ export function getDialysisSolutionDetailList(params) {
     params: params
   })
 }
+
+export function createFirstDisease(data) {
+  return request({
+    url: '/api/patient/createfirstdisease',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getFirstDiseaseList(params) {
+  return request({
+    url: '/api/patient/getfirstdiseaselist',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getFirstDetail(id, params) {
+  return request({
+    url: '/api/patient/getfirstdetailbyid?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function updateFirstDisease(data) {
+  return request({
+    url: '/api/patient/updatefirstdisease',
+    method: 'post',
+    data: data
+  })
+}
+
+export function deleteFirstDisease(params) {
+  return request({
+    url: '/api/patient/deletefirstdisease',
+    method: 'get',
+    params: params
+  })
+}

src/lang/zh.js

@@ -405,6 +405,13 @@ export default {
     illness_discharge: '出院时病情',
     discharge_advice: '出院医嘱',
     dialysis_remark: '透析备注',
-    catheter_operation:'导管备注',
+    catheter_operation: '导管备注',
+    main_content: '主诉内容',
+    patient_case: '病例特点',
+    tentative_diagnosis: '初步诊断',
+    diagnostic_basis: '诊断依据',
+    differential_diagnosis: '鉴别诊断',
+    treatment_plan: '诊疗计划'
+
   }
 }

src/router/modules/dialysis.js

@@ -789,6 +789,19 @@ export default {
         title: '批量打印',
         noCache: true
       }
-    }
+    },
+
+    {
+      path: '/dialysis/print/batch/fiftyOne',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_fiftyOne'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_fiftyOne',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
   ]
 }

src/router/modules/patient.js

@@ -247,6 +247,28 @@ export default {
       title: 'templateSummary',
       noCache: true
     }
+  },
+  {
+    path: '/patient/patient/:id/firstDisease',
+    component: () => import('@/xt_pages/user/firstDisease'),
+    hidden: true,
+    is_menu: false,
+    name: 'firstDisease',
+    meta: {
+      title: 'firstDisease',
+      noCache: true
+    }
+  },
+  {
+    path: '/patient/patient/firstDisease/print',
+    component: () => import('@/xt_pages/user/firstDiseasePrint'),
+    hidden: true,
+    is_menu: false,
+    name: 'firstDiseasePrint',
+    meta: {
+      title: 'firstDiseasePrint',
+      noCache: true
+    }
   }
 
   ]

src/xt_pages/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017-present PanJiaChen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -484,7 +484,7 @@ export default {
       isVisibility: "",
       propsTable: "",
       doctorList: [],
-      admin_user_id: 0,
+      admin_user_id:0,
       waiting_drug: [], //待发药列表
       issued_drug: [], //已发药列表
       currentRow: null,
@@ -1091,7 +1091,25 @@ export default {
       };
       getpatientswithdrugs(params).then((res) => {
         if (res.data.state == 1) {
-          this.tableData = res.data.data.list; //列表数据
+          var list = res.data.data.list; //列表数据
+
+          if(this.$store.getters.xt_user.org.id == 10188 || this.$store.getters.xt_user.org.id == 10217 ){
+            this.tableData = []
+            if(list!=null && list.length >0){
+              for(let i=0;i<list.length;i++){
+                if(list[i].data_sources != "临时医嘱"){
+                  this.tableData.push(list[i])
+                }
+              }
+            }
+
+          }
+          if(this.$store.getters.xt_user.org.id != 10188 && this.$store.getters.xt_user.org.id != 10217){
+            this.tableData = []
+            this.tableData = list
+          }
+         
+         
           this.total = res.data.data.total; //合计
         } else {
           this.$message.error(res.data.msg);

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -515,6 +515,7 @@ export default {
     },
     //获取患者信息详情
     getpatientdetails(val) {
+      console.log("val2332323223",this.currentRow)
       var params = {
         patient_id: this.currentRow.PatientID,
         is_medicine: val,
@@ -522,7 +523,23 @@ export default {
       };
       getpharmacycontent(params).then((res) => {
         if (res.data.state == 1) {
-          this.tableData = res.data.data.list;
+           var list = res.data.data.list;
+           console.log("hhhhawoowowow",list)
+          if(this.$store.getters.xt_user.org.id == 10188 || this.$store.getters.xt_user.org.id == 10217 || this.$store.getters.xt_user.org.id == 0 ){
+            this.tableData = []
+            if(list!=null && list.length >0){
+              for(let i=0;i<list.length;i++){
+                if(list[i].DataSources != "临时医嘱"){
+                  this.tableData.push(list[i])
+                }
+              }
+            }
+
+          }
+          if(this.$store.getters.xt_user.org.id != 10188 && this.$store.getters.xt_user.org.id != 10217 && this.$store.getters.xt_user.org.id != 0){
+            this.tableData = []
+            this.tableData = list
+          }
         } else {
           this.$message.error(res.data.msg);
         }

src/xt_pages/data/template.vue

@@ -56,6 +56,12 @@ export default {
         { label: this.$t("data_config.discharge_advice"), key:"discharge_advice"},
         { label: this.$t("data_config.dialysis_remark"), key:"dialysis_remark"},
         { label: this.$t("data_config.catheter_operation"), key:"catheter_operation"},
+        { label: this.$t("data_config.main_content"), key:"main_content"},
+        { label: this.$t("data_config.patient_case"), key:"patient_case"},
+        { label: this.$t("data_config.tentative_diagnosis"), key:"tentative_diagnosis"},
+        { label: this.$t("data_config.diagnostic_basis"), key:"diagnostic_basis"},
+        { label: this.$t("data_config.differential_diagnosis"), key:"differential_diagnosis"},
+        { label: this.$t("data_config.treatment_plan"), key:"treatment_plan"},
       ],
       activeName: "education",
       createdTimes: 0

src/xt_pages/dialysis/PatientBox.vue

@@ -158,16 +158,21 @@
         </p>
 
 
-        <p v-if="$store.getters.xt_user.org.id!=9671 && $store.getters.xt_user.org.id!=9675 && $store.getters.xt_user.org.id!=10340">
+        <p v-if="$store.getters.xt_user.org.id!=9675 && $store.getters.xt_user.org.id!=10340">
           透析器/灌流器:{{schedule.prescription? schedule.prescription.dialyzer_perfusion_apparatus: ""}}
           <span v-if="schedule.prescription != null">{{schedule.prescription? schedule.prescription.dialysis_dialyszers: ""}}</span>
           <span v-if="schedule.prescription != null &&schedule.prescription.dialysis_irrigation != ''">/</span>
           <span v-if="schedule.prescription != null">{{schedule.prescription? schedule.prescription.dialysis_irrigation: ""}}</span>
         </p>
-        <p v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==9675 || $store.getters.xt_user.org.id==10340">
+        <p v-if="$store.getters.xt_user.org.id==9675 || $store.getters.xt_user.org.id==10340">
              透析器/灌流器:
              <span v-if="schedule.dialysis_order!=null">{{schedule.dialysis_order.dialysis_dialyszers}}</span>
              <span v-if="schedule.dialysis_order!=null">{{schedule.dialysis_order.dialysis_irrigation}}</span>
+             
+        </p>
+        <p v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==10445">
+           滤过器:
+           <span v-if="schedule.prescription != null">{{schedule.prescription? schedule.prescription.dialysis_strainer: ""}}</span>
         </p>
       
         <p v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==9675 || $store.getters.xt_user.org.id==10340">

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -39,7 +39,13 @@
                 display: inline-block;
               "
             >
-              血液净化治疗记录单
+              <span v-if="org_id != 0 && org_id!=10449 && org_id!=3877">
+                血液净化治疗记录单
+              </span>
+              <span v-if="org_id == 0 || org_id == 3877 || org_id == 10449">
+                <span v-if="record&&record.prescription.mode_id!=13">血液净化治疗记录单</span>
+                <span v-if="record&&record.prescription.mode_id==13">连续性肾脏替代治疗（CRRT）记录单</span>
+              </span>
             </div>
           </div>
           <div class="row">
@@ -928,7 +934,8 @@
                               : "/"
                           }}
                         </div>
-                        L
+                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469">ml</span> 
+                         <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469">L</span>
                       </div>
                       <div class="inline_block" style="flex: 1">
                         干体重：
@@ -1021,6 +1028,7 @@
                         ml/min
                       </div>
                     </div>
+
                     <div class="row" style="padding: 2px 0; line-height: 23px">
                       <div class="inline_block">
                         抗凝剂：
@@ -1171,6 +1179,57 @@
                         </div>
                       </div>
                     </div>
+
+                    <div class="row" style="padding: 2px 0; line-height: 23px" v-if="org_id ==0 ||org_id == 3877 || org_id == 10449">
+                      <div class="inline_block">
+                        置换速度：
+                        <div
+                          class="under_line"
+                          style="width: 50px; text-align: center"
+                        >
+                          {{
+                            record.prescription &&
+                            record.prescription.displace_speed
+                              ? record.prescription.displace_speed
+                              : "/"
+                          }}
+                        </div>
+                        ml/h
+                      </div>
+                      <span>&nbsp;&nbsp;&nbsp;</span>
+                      <div class="inline_block">
+                        透析液流速：
+                        <div
+                          class="under_line"
+                          style="width: 50px; text-align: center"
+                        >
+                          {{
+                            record.prescription &&
+                            record.prescription.dialysis_fluid_flow
+                              ? record.prescription.dialysis_fluid_flow
+                              : "/"
+                          }}
+                        </div>
+                        ml/h
+                      </div>
+                      
+                      <span>&nbsp;&nbsp;&nbsp;</span>
+                      <div class="inline_block">
+                        碳酸氢钠流速：
+                        <div
+                          class="under_line"
+                          style="width: 50px; text-align: center"
+                        >
+                          {{
+                            record.prescription &&
+                            record.prescription.sodium_bicarbonate_flow
+                              ? record.prescription.sodium_bicarbonate_flow
+                              : "/"
+                          }}
+                        </div>
+                        ml/h
+                      </div>
+                    </div>
                   </td>
                 </tr>
                 <tr>
@@ -1224,7 +1283,8 @@
                           >
                             SpO₂<br />(%)
                           </td>
-                          <td width="50">超滤量<br />(ml)</td>
+                          <td width="50" v-if="org_id != 0 && org_id != 3877 && org_id != 10449">超滤量<br />(ml)</td>
+                          <td width="50" v-if="org_id ==0 || org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td
                             v-if="
                               record.prescription.mode_id == 2 ||
@@ -1235,7 +1295,7 @@
                           >
                             置换量<br />(ml)
                           </td>
-
+                          <td v-if="org_id == 3877 || org_id == 0 || org_id == 10449" width="50">滤前压(mmHg)</td>
                           <td
                             width="50"
                             v-if="
@@ -1369,11 +1429,20 @@
                           </td>
 
                           <td>
-                            <span>{{
+                            <span v-if="org_id == 9671 || org_id == 10440">
+                                {{
+                              monitor_record.ultrafiltration_volume
+                                ? monitor_record.ultrafiltration_volume
+                                : "0"
+                            }}
+                            </span>
+                             <span v-if="org_id!=9671 && org_id!=10440">
+                                {{
                               monitor_record.ultrafiltration_volume
                                 ? monitor_record.ultrafiltration_volume
                                 : ""
-                            }}</span>
+                            }}
+                            </span>
                           </td>
 
                           <td
@@ -1390,6 +1459,13 @@
                                 : ""
                             }}
                           </td>
+                          <td v-if="org_id == 3877 || org_id == 0 || org_id == 10449">
+                            {{
+                              monitor_record.filter_pressure
+                                ? monitor_record.filter_pressure
+                                : ""
+                            }}
+                          </td>
                           <td
                             width="50"
                             v-if="
@@ -1438,14 +1514,14 @@
                                   "
                                   >【开始透析】</template
                                 >
-                                <template
+                                <!-- <template
                                   v-if="
                                     record.dialysis_order &&
                                     monitor_record.operate_time ==
                                       record.dialysis_order.end_time
                                   "
                                   >【结束透析】</template
-                                >
+                                > -->
                                 {{ monitor_record.end }}
                                 {{ monitor_record.symptom }} &nbsp;{{
                                   monitor_record.dispose
@@ -1820,7 +1896,13 @@
                   display: inline-block;
                 "
               >
-                血液净化治疗记录单
+                <span v-if="org_id != 0 && org_id!=10449 && org_id!=3877">
+                  血液净化治疗记录单
+                </span>
+                <span v-if="org_id == 0 || org_id == 3877 || org_id == 10449">
+                  <span v-if="record&&record.prescription.mode_id!=13">血液净化治疗记录单</span>
+                  <span v-if="record&&record.prescription.mode_id==13">连续性肾脏替代治疗（CRRT）记录单</span>
+                </span>
               </div>
             </div>
             <div class="row">
@@ -2734,20 +2816,20 @@
                           <template
                             v-if="
                               record.prescription &&
-                              record.prescription.prescription_doctor
+                              record.prescription.creater
                             "
                           >
                             <span
                               v-if="
                                 setAdminUserES(
                                   record.prescription,
-                                  'prescription_doctor'
+                                  'creater'
                                 ) == ''
                               "
                               >{{
                                 getAdminUser(
                                   record.prescription,
-                                  "prescription_doctor"
+                                  "creater"
                                 )
                               }}</span
                             >
@@ -2756,7 +2838,7 @@
                               :src="
                                 setAdminUserES(
                                   record.prescription,
-                                  'prescription_doctor'
+                                  'creater'
                                 )
                               "
                               alt=""
@@ -2915,7 +2997,22 @@ export default {
         var resp = rs.data;
         if (resp.state == 1) {
           this.records = this.records.concat(resp.data.schedules);
-
+          var tempmonitorflag = true;
+          for(let i=0;i<this.records.length;i++){
+            for(let j=0;j<this.records[i].monitor_records.length;j++){
+              this.records[i].monitor_records[j].end = ""
+              if (this.records[i].dialysis_order &&this.records[i].monitor_records[j].operate_time ==  this.records[i].dialysis_order.end_time) {
+              this.records[i].monitor_records[j].end = "【结束透析】";
+              tempmonitorflag = false;
+            }
+            if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
+              this.records[i].monitor_records[j].end = "【结束透析】";
+             }
+             if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
+               this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】"
+             }
+            }
+          }
           for (const recordIndex in this.records) {
             var dlegh = 0;
             if (

src/xt_pages/dialysis/batch_print/batch_print_order_sixty.vue

@@ -1329,14 +1329,14 @@
                                   "
                                   >【开始透析】</template
                                 >
-                                <template
+                                <!-- <template
                                   v-if="
                                     record.dialysis_order &&
                                     monitor_record.operate_time ==
                                       record.dialysis_order.end_time
                                   "
                                   >【结束透析】</template
-                                >
+                                > -->
                                 {{ monitor_record.end }}
                                 {{ monitor_record.symptom }} &nbsp;{{
                                   monitor_record.dispose
@@ -2675,7 +2675,24 @@ export default {
         var resp = rs.data;
         if (resp.state == 1) {
           this.records = this.records.concat(resp.data.schedules);
-
+          console.log("this.records------",this.records)
+          var tempmonitorflag = true;
+          for(let i=0;i<this.records.length;i++){
+            for(let j=0;j<this.records[i].monitor_records.length;j++){
+              this.records[i].monitor_records[j].end = ""
+              if (this.records[i].dialysis_order &&this.records[i].monitor_records[j].operate_time ==  this.records[i].dialysis_order.end_time) {
+              this.records[i].monitor_records[j].end = "【结束透析】";
+              tempmonitorflag = false;
+            }
+            if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
+              this.records[i].monitor_records[j].end = "【结束透析】";
+            }
+             if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
+               this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】"
+             }
+            }
+          }
+          console.log("hhhhhhhhh",this.records)
           for (const recordIndex in this.records) {
             var dlegh = 0;
             if (

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo.vue

@@ -200,10 +200,7 @@
                   </td>
                 </tr>
                 <tr>
-                  <td style="text-align:left;" colspan="1">
-                    <span style="display:inline-block;margin-left:15px;"
-                      >透前体重:{{record.assessment_before_dislysis.weight_before?record.assessment_before_dislysis.weight_before:"/"}}&nbsp;kg</span>
-                  </td>
+                
                   <td style="text-align:left;" colspan="1">
                     <span style="display:inline-block;margin-left:15px;"
                       >设定脱水量:{{record.prescription.target_ultrafiltration?record.prescription.target_ultrafiltration:"/"}}&nbsp;ml</span
@@ -217,7 +214,7 @@
                          ></label-box>
                      </span>
                    </td>
-                   <td style="text-align: left" colspan="2">
+                   <td style="text-align: left" colspan="3">
               <span style="display: inline-block; margin-left: 15px">
                 <span v-if="record.prescription.anticoagulant == 2">普通肝素首剂:</span>
                 <span v-if="record.prescription.anticoagulant == 3"
@@ -306,7 +303,56 @@
               <span v-if="record.prescription.anticoagulant == 2">mg</span>
               <span v-if="record.prescription.anticoagulant == 1">mg</span>
             </td>
-                </tr>
+           
+            </tr>
+                 <td style="text-align:left;" colspan="1">
+                    <span style="display:inline-block;margin-left:15px;"
+                      >透前体重:{{record.assessment_before_dislysis.weight_before?record.assessment_before_dislysis.weight_before:"/"}}&nbsp;kg</span>
+                  </td>
+                 <td style="text-align:left;" colspan="1" >
+                    <span style="display:inline-block;margin-left:15px;"
+                      >透析器型号:
+                    <span v-if="record.prescription.dialysis_dialyszers!=''">
+                      {{
+                        record.prescription.dialysis_dialyszers
+                         ?  record.prescription.dialysis_dialyszers
+                           : "/"
+                        }}
+                      </span> 
+                    
+                      </span>
+                  </td>
+
+                  <td style="text-align:left;" colspan="2">
+                    <span style="display:inline-block;margin-left:15px;"
+                      >灌流器型号:
+                   
+                      <span v-if="record.prescription.dialysis_irrigation!=''">
+                        &nbsp;&nbsp;{{
+                        record.prescription.dialysis_irrigation
+                        ? record.prescription.dialysis_irrigation
+                        : "/"
+                    }}
+                      </span>
+                      </span>
+                  </td>
+
+                   <td style="text-align:left;" colspan="2">
+                    <span style="display:inline-block;margin-left:15px;"
+                      >滤过器型号:
+                      <span v-if="record.prescription.dialysis_strainer!=''">
+                      &nbsp;&nbsp;{{
+                          record.prescription.dialysis_strainer
+                          ? record.prescription.dialysis_strainer
+                          : "/"
+                      }}
+                      </span> 
+                      </span>
+                  </td>
+                  <td></td>
+             <tr>
+
+             </tr>
                 <tr>
                   <td style="text-align:left;" colspan="1">
                     <span style="display:inline-block;margin-left:15px;"
@@ -340,41 +386,30 @@
                           }}分钟</span>
                       &nbsp;
                   </td>
-                   <td style="text-align:left;" >
-                    <span style="display:inline-block;margin-left:15px;"
-                      >透析/灌流器型号:
-                     {{
-                        record.prescription.dialysis_dialyszers
-                         ?  record.prescription.dialysis_dialyszers
-                           : "/"
-                        }}&nbsp;&nbsp;{{
-                        record.prescription.dialysis_irrigation
-                        ? record.prescription.dialysis_irrigation
-                        : "/"
-                    }}
-                      </span>
-                  </td>
-                   <td style="text-align:left;" colspan="2">
+               
+                   <td style="text-align:left;" colspan="3">
                     <span style="display:inline-block;margin-left:15px;"
                       >置换方式:
                        <label-box
                          :isChecked="
-                          record.prescription.displace_liqui_part == 1 ? true : false
+                          record.prescription.displace_liqui_part == 1 && record.prescription.mode_id != 2 &&  record.prescription.mode_id != 5 && record.prescription.mode_id != 12 ? true : false
                           "
                          showValue="前"
                          ></label-box
                          >&nbsp;
                         <label-box
                           :isChecked="
-                            record.prescription.displace_liqui_part == 2 ? true : false
+                            record.prescription.displace_liqui_part == 2 && record.prescription.mode_id != 2 &&  record.prescription.mode_id != 5 && record.prescription.mode_id != 12? true : false
                           "
                           showValue="后"
                         ></label-box>
-                          &nbsp; (总量：{{
+                          &nbsp; (总量：
+                          <span v-if="record.prescription.mode_id == 2 || record.prescription.mode_id == 5 || record.prescription.mode_id == 12">{{
                             record.prescription.displace_liqui_value
                               ? record.prescription.displace_liqui_value
                               : "/"
                           }}L)
+                          </span>
                       </span>&nbsp;
                   </td>
                 </tr>
@@ -398,7 +433,7 @@
                             :src="
                               setAdminUserES(
                                 record.dialysis_order,
-                                'start_nurse'
+                                'quality_nurse_id'
                               )
                             "
                             alt=""
@@ -436,7 +471,7 @@
                           />
                       </span>
                   </td>
-                   <td style="text-align:left;" colspan="3">
+                   <td style="text-align:left;" colspan="2">
                     <span style="display: inline-block; margin-left: 15px">
                     穿刺护士:
                        <span
@@ -464,7 +499,10 @@
                             style="height: 30px;"
                           />
                       </span>
-                      <span style="display: inline-block; margin-left: 15px">
+                      
+                  </td>
+                   <td style="text-align:left;" colspan="1">
+                   <span style="display: inline-block; margin-left: 15px">
                         核对护士:
                        <span
                        style="height: 30px; display: inline-block"
@@ -492,7 +530,7 @@
                             style="height: 30px;"
                           />
                       </span>
-                  </td>
+                   </td>
                   <td style="text-align:left;" colspan="3">
                     <!-- <span style="display:inline-block;margin-left:15px;display:flex;align-items:center;height:36px;"
                       >医生签名:
@@ -1358,8 +1396,8 @@
                               >* {{ advice[0].prescribing_number
                               }}{{ advice[0].prescribing_number_unit }}</span
                             >
-                            <span v-if="advice[0].single_dose != 0"
-                              >{{ advice[0].single_dose
+                            <span v-if="advice[0].single_dose != 0"> 
+                             <span v-if="advice[0].single_dose >0"> 单次用量 </span>{{ advice[0].single_dose
                               }}{{ advice[0].single_dose_unit }}</span
                             >
                             <span>{{ advice[0].delivery_way }}</span>

src/xt_pages/dialysis/batch_print/batch_print_order_twentyFive.vue

@@ -1330,21 +1330,43 @@ export default {
         return age
       }
     },
+    // getAge: function(val) {
+    //   val.birth = uParseTime(val.birthday, "{y}-{m}-{d}");
+    //   if (
+    //     this.org_template_info.template_id == 2 ||
+    //     this.org_template_info.template_id == 0
+    //   ) {
+    //     if (val.age == 0) {
+    //       return jsGetAge(val.birth, "-");
+    //     } else {
+    //       return val.age;
+    //     }
+    //   } else {
+    //     return jsGetAge(val.birth, "-");
+    //   }
+    // },
     getAge: function(val) {
-      val.birth = uParseTime(val.birthday, "{y}-{m}-{d}");
-      if (
-        this.org_template_info.template_id == 2 ||
-        this.org_template_info.template_id == 0
-      ) {
-        if (val.age == 0) {
-          return jsGetAge(val.birth, "-");
-        } else {
-          return val.age;
-        }
-      } else {
-        return jsGetAge(val.birth, "-");
+     
+     if (val.id_card_no) {
+       var thisLen = val.id_card_no.length
+
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + val.id_card_no.substr(6, 6)
+       } else {
+         birth = val.id_card_no.substr(6, 8)
+       }
+       var birthtwo =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+
+       var age = jsGetAge(birthtwo, '-')
+       return age
       }
-    },
+     },
     printAction: function() {
       const style =
         '@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; } .option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 14px; 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; 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 { display: inline-block; border-bottom: 1px solid #999; text-align: center; white-space: nowrap; } .under_line::before { content: "\\00A0"; } .under_line::after { content: "\\00A0"; } .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: 10px 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: 8px 5px; line-height: 25px; } }.es-img{height: 20px; }.advice-name{text-align: left !important;line-height: 16px !important;}.advice-children{display:flex;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 2px;position: absolute;}';

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -329,6 +329,15 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 51">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button>
+      </template>
       <template v-if="this.template_id == 59">
         <el-button
           size="small"
@@ -336,7 +345,7 @@
           :disabled="selecting_schs.length == 0"
           @click="batchPrintAction"
           type="primary"
-          >打印</el-button>
+          >批量打印</el-button>
       </template>
       <template v-if="this.template_id == 60">
         <el-button
@@ -534,7 +543,12 @@
           align="center"
           width="100"
         ></el-table-column>
-
+        <el-table-column
+          prop="dry_weight"
+          label="干体重(kg)"
+          align="center"
+          width="120"
+        ></el-table-column>
         <el-table-column
           prop="dialysis_before_weight"
           label="透前称重(kg)"
@@ -1408,11 +1422,11 @@ export default {
         this.getTemplateInfo();
       }else {
         var start_month = moment().startOf('month').format('YYYY-MM-DD')
-        var start_time = this.getTimestamp(start_month)
+        var start_time = this.getTimestamp(start_month) 
         this.listQuery.start_time = start_time
         var end_month = moment(new Date()).add('year',0).format("YYYY-MM-DD")
         var end_time = this.getTimestamp(end_month)
-        this.listQuery.end_time = end_time
+        this.listQuery.end_time = end_time 
         this.getSchedualPatientList()
       
         this.getAllZone();
@@ -1435,12 +1449,13 @@ export default {
       var date = new Date(nowDate + " 00:00:00");
       this.listQuery.schedul_time = date.getTime();
       var start_month = moment().startOf('month').format('YYYY-MM-DD')
-      var start_time = this.getTimestamp(start_month)
+      var start_time = this.getTimestamp(start_month) 
+     
       this.listQuery.start_time = start_time
       var end_month = moment(new Date()).add('year',0).format("YYYY-MM-DD")
       var end_time = this.getTimestamp(end_month)
       this.listQuery.end_time = end_time
-      console.log("listQuery---------",this.listQuery)
+     
       this.getAllZone();
       this.getSchedualPatientList();
       this.getTemplateInfo();
@@ -1513,7 +1528,7 @@ export default {
     },
     getTimestamp(time) { //把时间日期转成时间戳
 
-      return (new Date(time)).getTime()
+      return (new Date(time)).getTime() - 28800000
     },
     getTimestampOne(time) { //把时间日期转成时间戳
 
@@ -1529,7 +1544,9 @@ export default {
         this.listQuery.schedul_time = "";
 
       }
-      console.log("params332322332323232",this.listQuery)
+    
+      
+      console.log("params332322332323232",this.listQuery.start_time)
       this.SchedualPatientsTableData = [];
       getSchedualPatient(this.listQuery).then(response => {
 
@@ -1540,7 +1557,7 @@ export default {
         } else {
           this.loading = false;
           this.total = response.data.data.total;
-          // console.log(response.data.data)
+          console.log(response.data.data.schedule)
           for (let i = 0; i < response.data.data.schedule.length; i++) {
 
             if (response.data.data.schedule[i].patient&&response.data.data.schedule[i].patient.id > 0) {
@@ -1576,6 +1593,10 @@ export default {
               if (response.data.data.schedule[i].assessment_before_dislysis != null) {
                 SchedualPatientsTable["dialysis_before_weight"] =response.data.data.schedule[i].assessment_before_dislysis.weight_before;
               }
+
+               if (response.data.data.schedule[i].assessment_before_dislysis != null) {
+                SchedualPatientsTable["dry_weight"] =response.data.data.schedule[i].assessment_before_dislysis.dry_weight;
+              }
               if (response.data.data.schedule[i].assessment_after_dislysis !=null) {
                 SchedualPatientsTable["dialysis_after_weight"] =response.data.data.schedule[i].assessment_after_dislysis.weight_after;
               }
@@ -1870,8 +1891,8 @@ export default {
 
 
               this.SchedualPatientsTableData.push(SchedualPatientsTable);
-              console.log("wode数据",(-100).toString())
-              console.log("数据哦哦😯噢232o",this.SchedualPatientsTableData)
+              // console.log("wode数据",(-100).toString())
+              // console.log("数据哦哦😯噢232o",this.SchedualPatientsTableData)
 
             }
           }
@@ -2057,6 +2078,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/fortyThree" });
       } else if (this.template_id == 48) {
         this.$router.push({ path: "/dialysis/print/batch/six" });
+      }else if (this.template_id == 51) {
+        this.$router.push({ path: "/dialysis/print/batch/fiftyOne" });
       }else if (this.template_id == 59) {
         this.$router.push({ path: "/dialysis/print/batch/fiftynine" });
       }else if (this.template_id == 60) {

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -124,6 +124,12 @@
           <span class="unit"></span>
         </li>
 
+         <li v-if="isShow('滤过器')">
+          <label>滤过器 : </label>
+          <span class="content">{{ dialysis_strainer }}</span>
+          <span class="unit"></span>
+        </li>
+
         <li v-if="isShow('透析前使用特殊药物')">
           <label>透析前使用特殊药物: </label>
           <span class="content">{{ special_medicine }}</span>
@@ -142,8 +148,8 @@
           <label>目标超滤量 : </label>
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
           
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395  && this.$store.getters.xt_user.template_info.template_id!=60  && this.$store.getters.xt_user.template_info.org_id != 10340  && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10441 && this.$store.getters.xt_user.template_info.org_id != 10445 && this.$store.getters.xt_user.template_info.org_id != 9829 &&  this.$store.getters.xt_user.template_info.org_id != 10440"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id==10441 || this.$store.getters.xt_user.template_info.org_id==10445 || this.$store.getters.xt_user.template_info.org_id == 9829 ||  this.$store.getters.xt_user.template_info.org_id == 10440" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395  && this.$store.getters.xt_user.template_info.template_id!=60  && this.$store.getters.xt_user.template_info.org_id != 10340  && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10441 && this.$store.getters.xt_user.template_info.org_id != 10445 && this.$store.getters.xt_user.template_info.org_id != 9829 &&  this.$store.getters.xt_user.template_info.org_id != 10440  &&  this.$store.getters.xt_user.template_info.org_id != 10469"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id==10441 || this.$store.getters.xt_user.template_info.org_id==10445 || this.$store.getters.xt_user.template_info.org_id == 9829 ||  this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
 
          <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">
@@ -157,6 +163,14 @@
           <span class="unit">{{ glucose != "0" ? "mmol/l" : "" }}</span>
         </li> -->
 
+
+        <li v-if="isShow('处方脱水量')">
+          <label>处方脱水量 : </label>
+          <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
+          <span class="unit">{{ prescription_water != "0" ? "ml" : "" }}</span>
+        </li>
+
+       
         <li v-if="isShow('钾')">
           <label>钾 : </label>
           <span class="content">{{ kalium != "0" ? kalium : "" }}</span>
@@ -572,6 +586,21 @@
           <span class="content">{{this.prescription.sodium_curve}}</span>
         </li>
 
+        <li v-if="isShow('开始钠')">
+          <label>开始钠: </label>
+          <span class="content">{{this.prescription.start_sodium}}</span>
+        </li>
+
+        <li v-if="isShow('透析液流速')">
+          <label>透析液流速(ml/h): </label>
+          <span class="content">{{this.prescription.dialysis_fluid_flow}}</span>
+        </li>
+
+        <li v-if="isShow('碳酸氢钠流速')">
+          <label>碳酸氢钠流速(ml/h): </label>
+          <span class="content">{{this.prescription.sodium_bicarbonate_flow}}</span>
+        </li>
+
         <li v-if="isShow('病情处理')">
           <label>病情处理: </label>
           <span class="content">{{this.prescription.treatment_remark}}</span>
@@ -901,6 +930,12 @@ export default {
     },
     reduce_amount:function(){
        return this.getValueStr('reduce_amount','reduce_amount')
+    },
+    prescription_water:function(){
+      return this.getValueStr('prescription_water','prescription_water')
+    },
+    dialysis_strainer:function(){
+       return this.getValueStr('dialysis_strainer','dialysis_strainer')
     }
   
   },

src/xt_pages/dialysis/details/NavIgation.vue

@@ -121,6 +121,7 @@
       :admin_users="admin_users"
       :dry_weight="last_dryWeight_dislysis"
       :lastAssessment="lastAssessment"
+       :prescription="prescription"
     ></assessment-before-dislysis-dialog>
 
     <treatment-summary-dialog
@@ -662,6 +663,7 @@ export default {
       this.$refs.finish_dialog.show(this.dialysis_order);
     },
     showPrescription: function() {
+      console.log("prescirpiton+++++++++++",this.prescription)
       this.$refs.prescription.show(this.prescription,this.schedual,this.last_dialysis_prescribe,this.his_is_open,this.is_advice_open,this.admin_users);
     },
     showAccepts: function() {
@@ -685,6 +687,12 @@ export default {
         this.assessment_after_dislysis
       );
       this.$emit("assessmentAfterDislysis", this.assessment_after_dislysis);
+    },
+    showPre(){
+
+    },
+    getParentMethods:function(val){
+      this.$parent.getScheduleDetail()
     }
   }
 };

src/xt_pages/dialysis/details/consumable/dialysisDrug.vue

@@ -130,7 +130,7 @@
             </el-option>
            </el-select>
            <label class="title"> <span class="name">病区选择</span> : </label>
-           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionType">
+           <el-select v-model="partion_type" placeholder="请选择" multiple @change="changePartionType">
             <el-option
               v-for="item in partitionArr"
               :key="item.id"
@@ -258,6 +258,8 @@
             return v.getTime() < new Date().getTime() - 86400000;
           },
         },
+        zoneIdList:[],
+        partion_str:"",
       }
     },
     created() {
@@ -398,15 +400,28 @@
             return false
           } else {
             this.partitionArr = response.data.data.zone
-            this.partitionArr.unshift({ id: 0, name: '全部' })
+            for(let i=0;i<this.partitionArr.length;i++){
+              this.zoneIdList.push(this.partitionArr[i].id)
+            }
+            // this.partitionArr.unshift({ id: 0, name: '全部' })
           }
         })
       },
       statistics() {
          this.tableList = []
+
+          var str = ""
+         if(this.partion_type==0){
+            str = this.zoneIdList.join(",")
+         }
+         if(this.partion_type!=0){
+            str = this.partion_type.join(",")
+         }
+         this.partion_str = ""
+         this.partion_str = str  
           var params = {
             schedule_type:this.schedule_type,
-            partion_type:this.partion_type,
+            partion_type:str,
             selected_date:this.query.schedule_date,
           }
         // console.log("params2332232wo",params)
@@ -726,7 +741,7 @@
        this.$router.push({path:'/dialysis/consumable/dialysisdrugprint?limit='+this.query.limit+"&page="+this.query.page+"&partition_id="+this.query.partition_id+"&schedule_date="+this.query.schedule_date+"&schedule_type="+this.query.schedule_type+"&keywords="+this.query.keywords+"&ids="+this.ids})
       },
       toPrintOne(){
-        this.$router.push({path:'/dialysis/consumable/dialysisdrugcountprint?schedule_type='+this.schedule_type+"&partion_type="+this.partion_type+"&schedule_date="+this.query.schedule_date+"&is_open="+this.config.is_open})
+        this.$router.push({path:'/dialysis/consumable/dialysisdrugcountprint?schedule_type='+this.schedule_type+"&partion_type="+this.partion_str+"&schedule_date="+this.query.schedule_date+"&is_open="+this.config.is_open})
       },
      changeScheduleType(){
       this.tableList = []

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

@@ -212,7 +212,7 @@
             </el-option>
            </el-select>
            <label class="title"> <span class="name">病区选择</span> : </label>
-           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionType">
+           <el-select v-model="partion_type" placeholder="请选择" multiple @change="changePartionType" >
             <el-option
               v-for="item in partitionArr"
               :key="item.id"
@@ -320,7 +320,7 @@
             </el-option>
            </el-select>
            <label class="title"> <span class="name">病区选择</span> : </label>
-           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionType">
+           <el-select v-model="partion_type" placeholder="请选择" multiple @change="changePartionType">
             <el-option
               v-for="item in partitionArr"
               :key="item.id"
@@ -475,6 +475,8 @@
         typeList:[],
         ids:"",
         org_id:0,
+        zoneIdList:[],
+        pationType_str:"",
       }
     },
     created() {
@@ -754,17 +756,33 @@
             return false
           } else {
             this.partitionArr = response.data.data.zone
-            this.partitionArr.unshift({ id: 0, name: '全部' })
+            for(let i=0;i<this.partitionArr.length;i++){
+              this.zoneIdList.push(this.partitionArr[i].id)
+            }
+            // this.partitionArr.unshift({ id: 0, name: '全部' })
           }
         })
       },
       statistics() {
         this.tableList = []
+        
+        var arr = this.zoneIdList.join(",")
+        var str = ""
+         if(this.partion_type == 0){
+            str = arr
+         }
+         if(this.partion_type != 0){
+            str = this.partion_type.join(',')
+         }
+         this.pationType_str = ""
+         this.pationType_str = str
+        console.log("str-==-------",str)
         var params = {
           schedule_type:this.schedule_type,
-          partion_type:this.partion_type,
+          partion_type:str,
           selected_date:this.query.schedule_date,
         }
+       
        getDialysisGoodTotalCount(params).then(response=>{
           if(response.data.state == 1){
             this.startDialogVisible = true
@@ -1102,9 +1120,19 @@
       },
       toStatistics(){
         this.tableList = []
+        var arr = this.zoneIdList.join(",")
+        var str = ""
+         if(this.partion_type == 0){
+            str = arr
+         }
+         if(this.partion_type != 0){
+            str = this.partion_type.join(',')
+         }
+         this.pationType_str=""
+         this.pationType_str = str
          var params = {
           schedule_type:this.schedule_type,
-          partion_type:this.partion_type,
+          partion_type:str,
           selected_date:this.query.schedule_date,
         }
         getHisDialysisGoodCount(params).then(response=>{
@@ -1974,10 +2002,10 @@
      this.$router.push({path:'/dialysis/consumable/dialysisgoodprint?limit='+this.query.limit+"&page="+this.query.page+"&partition_id="+this.query.partition_id+"&schedule_date="+this.query.schedule_date+"&schedule_type="+this.query.schedule_type+"&keywords="+this.query.keywords+"&ids="+this.ids})
     },
     toPrintOne(){
-      this.$router.push({path:"/dialysis/consumable/dialysisgoodcountprint?schedule_type="+this.schedule_type+"&partion_type="+this.partion_type+"&schedule_date="+this.query.schedule_date+"&is_open="+this.his_config.is_open})
+      this.$router.push({path:"/dialysis/consumable/dialysisgoodcountprint?schedule_type="+this.schedule_type+"&partion_type="+this.pationType_str+"&schedule_date="+this.query.schedule_date+"&is_open="+this.his_config.is_open})
     },
     toHisPrint(){
-      this.$router.push({path:"/dialysis/consumable/dialysisgoodcountprint?schedule_type="+this.schedule_type+"&partion_type="+this.partion_type+"&schedule_date="+this.query.schedule_date+"&is_open="+this.his_config.is_open})
+      this.$router.push({path:"/dialysis/consumable/dialysisgoodcountprint?schedule_type="+this.schedule_type+"&partion_type="+this.pationType_str+"&schedule_date="+this.query.schedule_date+"&is_open="+this.his_config.is_open})
     },
     toExportListOne(){
       import('@/vendor/Export2Excel').then(excel => {

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

@@ -28,7 +28,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): "
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445"  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>
@@ -377,7 +377,7 @@
                 :value="item.id"
                 :key="item.id"
               ></el-option>
-            </el-select> 
+            </el-select>
           </el-form-item>
         </el-col>
 
@@ -625,7 +625,7 @@
             </el-form-item>
         </el-col>
 
-      
+
       </el-form>
 
 
@@ -967,7 +967,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.breathing_rate 
+      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
@@ -1211,14 +1211,14 @@ export default {
       if(predialysis.id > 0){
         this.form.hypopiesia = predialysis.hypopiesia.toString()
       }
-     
+
       //针对长沙南雅 ，透后体重 - 目标超滤量
       // if(predialysis.id > 0){
       //  if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675 || this.$store.getters.xt_user.template_info.org_id == 10340){
       //    if(predialysis.weight_after == 0){
       //      if(this.predialysis_evaluation!=null && this.prescription.target_ultrafiltration!=null){
       //        this.form.weight_after = this.predialysis_evaluation.weight_before - (this.prescription.target_ultrafiltration/1000)
-      //      }  
+      //      }
       //    }
       //  }
       // }
@@ -1253,7 +1253,7 @@ export default {
         //    if(this.prescription!=null && this.predialysis_evaluation!=null){
         //     this.form.weight_after = this.predialysis_evaluation.weight_before - (this.prescription.target_ultrafiltration/1000)
         //    }
-          
+
         // }
       }
 
@@ -1366,7 +1366,7 @@ export default {
 
     var date = this.$route.query && this.$route.query.date
     this.record_date = date ? uParseTime(date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
-    if(this.$store.getters.xt_user.template_info.org_id == 0 ||  this.$store.getters.xt_user.template_info.org_id==9829){
+    if(this.$store.getters.xt_user.template_info.org_id == 0 ||  this.$store.getters.xt_user.template_info.org_id==9829 ||  this.$store.getters.xt_user.template_info.org_id==10469){
       this.form.pulse_frequency = 80
     }
   },

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -213,11 +213,11 @@
                 </template>
               </el-table-column>
 
-              <!--<el-table-column label="医嘱嘱托" min-width="80" property="remark" align="center">-->
-              <!--<template slot-scope="scope">-->
-              <!--<span v-if="scope.row.parent_row==0">{{scope.row.remark}}</span>-->
-              <!--</template>-->
-              <!--</el-table-column>-->
+              <el-table-column label="医嘱嘱托" min-width="80" property="remark" align="center">-->
+              <template slot-scope="scope">
+              <span v-if="scope.row.parent_row==0">{{scope.row.remark}}</span>
+              </template>
+             </el-table-column>
             </el-table>
           </el-col>
         </el-row>
@@ -538,14 +538,13 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!--<el-row>-->
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="医嘱嘱托 :" prop="delivery_way">-->
-        <!--<el-input v-model="nameForm.remark"></el-input>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
-
-        <!--</el-row>-->
+       <el-row>
+       <el-col :span="12">
+      <el-form-item label="医嘱嘱托 :" prop="delivery_way">
+     <el-input v-model="nameForm.remark"></el-input>
+      </el-form-item>
+      </el-col>
+    </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="nameFormVisible = false">取消</el-button>
@@ -1619,6 +1618,36 @@ export default {
           }
       }
 
+    
+      if( this.$store.getters.xt_user.org.id == 10469 ){
+          var year = date.getFullYear()
+          var month = date.getMonth() + 1
+          var day = date.getDate()
+
+          var hours = date.getHours()
+          var minites = date.getMinutes()
+
+          if (month < 10) {
+            month = '0' + month
+          }
+          if (day < 10) {
+            day = '0' + day
+          }
+          if (hours < 10) {
+            hours = '0' + hours
+          }
+          if (minites < 10) {
+            minites = '0' + minites
+          }
+          if (this.schedulePatient.schedule_type == 1) {
+            this.groupForm.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
+          } else if (this.schedulePatient.schedule_type == 2) {
+            this.groupForm.start_time= year + '-' + month + '-' + day + ' ' + '11:00'
+          } else if (this.schedulePatient.schedule_type == 3) {
+           this.groupForm.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
+          }
+      }
+
     },
     selectAllTemplateAdvice(selection) {
       console.log("params",selection)

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -190,7 +190,7 @@
                 align="center"
               >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.parent_row == 0">{{
+                  <span>{{
                     scope.row.remark
                   }}</span>
                 </template>

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

@@ -649,6 +649,14 @@
               <el-input v-model="assessmentBeforeDislysis.suction" @focus="showInnerDialog('20')"></el-input>
             </el-form-item>
           </el-col>
+
+
+           <el-col :span="8">
+            <el-form-item label="透前净体重:" 
+              v-if="this.$store.getters.xt_user.template_info.template_id == 6">
+              <el-input v-model="body_weight_before" readonly></el-input>
+            </el-form-item>
+          </el-col>
          
         
  
@@ -846,7 +854,8 @@
         skins:[],
         pinholings:[],
         catheter_maintenancelist:[],
-        thrombuShow:false
+        thrombuShow:false,
+        body_weight_before:"",
       }
     },
     props: {
@@ -874,7 +883,15 @@
          default: () => {
           return []
         }
-      }
+      },
+
+       prescription: {
+        // 透析处方
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
 
     },
     methods: {
@@ -1083,7 +1100,7 @@
           case '3': // 透析前症状
 
             this.InnerDialogProps.values = this.symptom_before_dialysis
-            this.InnerDialogProps.titles = '透析期间'
+            this.InnerDialogProps.titles = '透析前症状'
             this.InnerDialogProps.type = 'symptom_before_dialysis'
             this.InnerDialogProps.selected = this.assessmentBeforeDislysis.symptom_before_dialysis
             this.InnerDialogProps.isShowTextArea = false
@@ -1350,21 +1367,27 @@
               type: 'success',
               duration: 2000
             })
-
+            
+            if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id==3877 || this.$store.getters.xt_user.template_info.org_id ==10469){
+              this.$parent.getParentMethods()
+            }
+            
             const assessment_before_dislysis_resp = response.data.data.assessmentBeforeDislysis
-            // console.log("返回数据",assessment_before_dislysis_resp)
-            // prop
+           
             var predialysis_evaluation = this.predialysis_evaluation
             for (var index in assessment_before_dislysis_resp) {
               // predialysis_evaluation[index] = assessment_before_dislysis_resp[index];
               this.$set(predialysis_evaluation, index, assessment_before_dislysis_resp[index])
             }
+             
+           
             let orgId = parseInt(sessionStorage.getItem("org_id"));
             axios.get('/api/index/patientsign/'+ orgId + '/'+ this.patient.id).then((res) => {
               console.log('res',res.data)
 
             }) 
             this.hide()
+            console.log("hhh23h3h223h23h23h23h2h3")
           }
         })
           } else {
@@ -1565,7 +1588,39 @@
             this.assessmentBeforeDislysis['pulse_frequency'] = ''
           }
         }
-      }
+      },
+      'assessmentBeforeDislysis.weight_before': {
+        handler (newWeight, oldWeight) {
+          let weight = parseFloat(
+            newWeight - this.assessmentBeforeDislysis.additional_weight
+          ).toFixed(1)
+          if (weight > 0) {
+            this.body_weight_before = weight
+          } else {
+            this.body_weight_before = ''
+          }
+        },
+        deep: true,
+        immediate: true
+      },
+
+    'assessmentBeforeDislysis.additional_weight': {
+      handler (newWeight, oldWeight) {
+        if (newWeight > 0) {
+          let weight = parseFloat(
+            this.assessmentBeforeDislysis.weight_before - newWeight
+          ).toFixed(1)
+          if (weight > 0) {
+            this.body_weight_before = weight
+          } else {
+            this.body_weight_before = ''
+          }
+        }
+      },
+      deep: true,
+      immediate: true,
+      data: []
+    },
     }
   }
 

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

@@ -20,7 +20,7 @@
           label="班次"
           v-if="isShowFiled('班次')"
           :prop="isName('班次')"
-          :rules="isCheckmust('班次')"
+         
         >
           <el-select
             v-model="form.schedual_type"
@@ -70,7 +70,7 @@
           label="穿刺者"
           v-if="isShowFiled('穿刺者')"
           prop="puncture_nurse_id"
-          :rules="isCheckmust('穿刺者')"
+         
         >
           <el-select
             v-model="form.puncture_nurse_id"
@@ -487,13 +487,16 @@ export default {
     if (this.form.new_fistula_nurse == 0) {
       this.form.new_fistula_nurse = this.$store.getters.xt_user.user.id;
     }
-    console.log("dialysis_order9999999999wo", this.dialysis_order);
+    // console.log("dialysis_order9999999999wo", this.dialysis_order);
     this.form.puncture_needle = this.dialysis_order.puncture_needle;
     this.form.puncture_way = this.dialysis_order.puncture_way;
     this.form.dialysis_dialyszers = this.dialysis_order.dialysis_dialyszers;
     this.form.dialysis_irrigation = this.dialysis_order.dialysis_irrigation;
     this.form.blood_access_id = this.dialysis_order.blood_access_id;
     this.blood_access_option_name = this.changeBloodAccessOpion(this.dialysis_order.blood_access_id)
+    // this.form.schedual_type = this.dialysis_order.schedule_type
+    // this.schedual_type = this.dialysis_order.schedule_type
+    // console.log("班次",this.form.schedual_type)
     this.punctureNeedleOptions = getDataConfig(
       "hemodialysis",
       "puncture_needle"
@@ -549,7 +552,8 @@ export default {
       this.form.blood_access_id = this.dialysis_order.blood_access_id;
      
       var blood_access_option_name = this.changeBloodAccessOpionOne(this.dialysis_order.blood_access_id)
-    
+      // this.form.schedual_type = this.dialysis_order.schedule_type
+      // console.log("8823832323223",this.form.schedual_type)
       this.blood_access_option_name = blood_access_option_name
       this.form.catheter_operation = this.dialysis_order.catheter_operation
       this.form.nuclein_date =
@@ -796,7 +800,7 @@ export default {
           ":" +
           (nowMinutes < 10 ? "0" + nowMinutes : nowMinutes);
       }
-
+      console.log("hhahhahahahaha",this.dialysis_order)
       if (this.dialysis_order.id == 0) {
         let now = new Date();
         let hour = now.getHours();
@@ -808,6 +812,7 @@ export default {
           this.schedual_type = 3;
         }
       } else {
+        this.form.schedual_type = this.dialysis_order.schedual_type;
         this.schedual_type = this.dialysis_order.schedual_type;
       }
 

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

@@ -95,7 +95,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249 || this.$store.getters.xt_user.template_info.org_id == 10395 ||this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 9829|| this.$store.getters.xt_user.template_info.org_id == 10440)">
+                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249 || this.$store.getters.xt_user.template_info.org_id == 10395 ||this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 9829|| this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469)">
                         <el-form-item label="目标超滤量(ml)：">
                             <el-input
                                     type="number"
@@ -104,9 +104,11 @@
                         </el-form-item>
                     </el-col>
 
+                    
+
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id!=10441 && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=9829 && this.$store.getters.xt_user.template_info.org_id != 10440">
+                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id!=10441 && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469">
                         <el-form-item label="目标超滤量(L)：">
                             <el-input
                                     type="number"
@@ -115,6 +117,16 @@
                         </el-form-item>
                     </el-col>
 
+                    <el-col :span="8"
+                            v-if="isShows('处方脱水量')">
+                        <el-form-item label="处方脱水量(ml)：">
+                            <el-input
+                                    type="number"
+                                    v-model="dialysisPrescription.prescription_water"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+
                    <el-col :span="8" v-if="isShows('带水上机')">
                         <el-form-item label="带水上机:">
                            <el-select v-model="dialysisPrescription.water_machine">
@@ -273,7 +285,7 @@
                     </el-col>
 
                     <el-col :span="8" v-if="anticoagulant!=undefined && anticoagulant.shouji != -1 && isShows('首剂')  && dialysisPrescription.anticoagulant!=1 && dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.template_id!=54  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.template_id!=54  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440  && this.$store.getters.xt_user.template_info.org_id != 10469">
                           <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='dialysisPrescription.anticoagulant != 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!=9990'
@@ -356,7 +368,7 @@
 
 
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.weichi != -1 && isShows('维持')  && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469">
                           <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 && this.$store.getters.xt_user.template_info.org_id != 9990">
@@ -420,7 +432,7 @@
 
 
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.zongliang != -1 && isShows('总量') && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469">
                           <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 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 9990'
@@ -597,7 +609,7 @@
                           type="number"
                           v-model="dialysisPrescription.glucose"
                         ></el-input>
-                      </el-form-item>
+                      </el-form-item>28
                     </el-col> -->
                     <el-col :span="8" v-if="isShows('透析液流量')">
                         <el-form-item label="透析液流量(ml/min)：">
@@ -649,6 +661,14 @@
                         </el-form-item>
                     </el-col>
 
+
+                     <el-col :span="8" v-if="isShows('滤过器')">
+                        <el-form-item label="滤过器:">
+                            <el-input v-model="dialysisPrescription.dialysis_strainer"
+                                      @focus="showInnerDialog('12')"></el-input>
+                        </el-form-item>
+                    </el-col>
+
                     <el-col :span="8" v-if="isShows('血浆分离器')">
                         <el-form-item label="血浆分离器:">
                             <el-input v-model="dialysisPrescription.plasma_separator"
@@ -1011,6 +1031,27 @@
                     </el-col>
                 </el-row>
 
+                <el-row>
+                  <el-col :span="8" v-if="isShows('透析液流速')">
+                        <el-form-item label="透析液流速(ml/h):">
+                            <el-input
+                                  
+                                    v-model="dialysisPrescription.dialysis_fluid_flow"
+                                    :rows="5"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8" v-if="isShows('碳酸氢钠流速')">
+                        <el-form-item label="碳酸氢钠流速(ml/h):">
+                            <el-input
+                                    v-model="dialysisPrescription.sodium_bicarbonate_flow"
+                                    :rows="5"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
               <el-row :gutter="20">
                     <el-col :span="24"  v-if="isShows('病情处理')">
                         <el-form-item  label="病情处理： ">
@@ -1559,6 +1600,10 @@
           prescription_sodium:"",
           start_sodium:"",
           sodium_curve:"",
+          dialysis_fluid_flow:"",
+          sodium_bicarbonate_flow:"",
+          prescription_water:"",
+          dialysis_strainer:"",
         },
 
         anticoagulant: {
@@ -1582,6 +1627,7 @@
         bloods: [],
         irrigations: [],
         dialyzers: [],
+        dialysisStrainerList:[],
         illnessList: [],
         plasmaSeparatorList: [],
         bilirubinAdsorptionColumn: [],
@@ -1624,6 +1670,7 @@
 
       },
       showInnerDialog: function(val) {
+       
         this.InnerDialogProps.visibility = true
         switch (val) {
           case '5': // 透析器/灌流器
@@ -1631,7 +1678,7 @@
             this.InnerDialogProps.values = this.dialyzerPerfusionApparatus
             this.InnerDialogProps.titles = '透析器/灌流器'
             this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
-
+           
             this.InnerDialogProps.selected = this.dialysisPrescription.dialyzer_perfusion_apparatus
             this.InnerDialogProps.isShowTextArea = false
             break
@@ -1690,22 +1737,84 @@ mu
             this.InnerDialogProps.selected = this.dialysisPrescription.puncture_needle
             this.InnerDialogProps.isShowTextArea = false
             break
+
+          case '12':
+            for (let i = 0; i < this.dialysisStrainerList.length; i++) {
+              this.dialysisStrainerList[i].name = this.dialysisStrainerList[i].specification_name
+            }
+            this.InnerDialogProps.values = this.dialysisStrainerList
+            this.InnerDialogProps.titles = '滤过器'
+            this.InnerDialogProps.type = 'dialysis_strainer'
+            this.InnerDialogProps.selected = this.dialysisPrescription.dialysis_strainer
+            this.InnerDialogProps.isShowTextArea = false
+            break
         }
       },
       innerDialogComfirm: function(val) {
+      
+
         this.InnerDialogProps.visibility = false
         switch (val.type) {
+
           case 'dialyzer_perfusion_apparatus':
-            this.dialysisPrescription.dialyzer_perfusion_apparatus = val.value.join(',')
+            var newArr = []
+            if(this.dialyzerPerfusionApparatus!=null && this.dialyzerPerfusionApparatus.length>0){
+              for(let i=0;i<this.dialyzerPerfusionApparatus.length;i++){
+                for(let j=0;j<val.value.length;j++){
+                   if(this.dialyzerPerfusionApparatus[i].name == val.value[j]){
+                     newArr.push(val.value[j])
+                   }
+                }
+              }
+            } 
+            if(newArr!=null && newArr.length>0){
+              
+              this.dialysisPrescription.dialyzer_perfusion_apparatus = newArr.join(',')
+            }else{
+              this.dialysisPrescription.dialyzer_perfusion_apparatus = ""
+            }
+           
             break
           case 'blood':
+            
             this.dialysisPrescription.blood = val.value.join(',')
             break
           case 'dialyzers':
-            this.dialysisPrescription.dialysis_dialyszers = val.value.join(',')
+            
+            var newArr = []
+            if(this.dialyzers!=null && this.dialyzers.length >0){
+              for(let i=0;i<this.dialyzers.length;i++){
+                for(let j=0;j<val.value.length;j++){
+                  if(this.dialyzers[i].specification_name == val.value[j]){
+                      newArr.push(val.value[j])
+                  }
+                }
+              }
+            }
+            if(newArr!=null && newArr.length >0){
+             this.dialysisPrescription.dialysis_dialyszers = newArr.join(',')
+            }else{
+              this.dialysisPrescription.dialysis_dialyszers = ""
+            }
+            
             break
           case 'irrigations':
-            this.dialysisPrescription.dialysis_irrigation = val.value.join(',')
+            var newArr = []
+            if(this.irrigations!=null && this.irrigations.length >0){
+              for(let i=0;i<this.irrigations.length;i++){
+                for(let j=0;j<val.value.length;j++){
+                  if(this.irrigations[i].specification_name == val.value[j]){
+                     newArr.push(val.value[j])
+                  }
+                }
+              }
+            }
+            if(newArr!=null && newArr.length>0){
+             this.dialysisPrescription.dialysis_irrigation = newArr.join(',')
+            }else{
+              this.dialysisPrescription.dialysis_irrigation = ""
+            }
+            
             break
           case 'plasma_separator':
             this.dialysisPrescription.plasma_separator = val.value.join(',')
@@ -1716,6 +1825,9 @@ mu
           case 'puncture_needle':
             this.dialysisPrescription.puncture_needle = val.value.join(',')
             break
+          case 'dialysis_strainer':
+            this.dialysisPrescription.dialysis_strainer = val.value.join(',')
+            break
         }
       },
       innerDialogCancle: function() {
@@ -2207,6 +2319,7 @@ mu
       },
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
         console.log("pres",pre)
+        console.log("schedual",schedual)
         if (pre != undefined) {
           this.dialysisPrescription.admin_user_id = pre.id == 0 ? this.$store.getters.xt_user.user.id : pre.admin_user_id
           if (pre.oxygen_uptake == 1) {
@@ -2318,6 +2431,14 @@ mu
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '18:00'
             }
+           }else if(this.$store.getters.xt_user.org.id == 10440){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
+            }
            }else if(this.$store.getters.xt_user.org.id == 9829){
               if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '6:30'
@@ -2326,6 +2447,14 @@ mu
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '15:30'
             }
+           }else if(this.$store.getters.xt_user.org.id == 10469){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
+            }
            } else {
             if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '07:00'
@@ -3844,9 +3973,13 @@ mu
     },
 
     watch: {
-      'dialysisPrescription.blood_flow_volume': function () {
-        this.dialysisPrescription.replacement_flow = replacementFlow(this.dialysisPrescription.blood_flow_volume)
-      },
+      // 'dialysisPrescription.blood_flow_volume': function () {
+      //   this.dialysisPrescription.blood_flow_volume = replacementFlow(this.dialysisPrescription.blood_flow_volume)
+      // },
+      // 'dialysisPrescription.replacement_flow': function () {
+      //   console.log("血流量",this.dialysisPrescription.replacement_flow)
+      //   this.dialysisPrescription.replacement_flow = this.dialysisPrescription.replacement_flow
+      // },
       'dialysisPrescription.dialysis_duration_hour': function() {
         let dialysis_duration_minute = 0
         let dialysis_duration_hour = 0
@@ -4412,6 +4545,7 @@ mu
         console.log('stockType', this.stockType)
         var arr = []
         var arrTwo = []
+        var arrThree = []
         for (let i = 0; i < this.stockType.length; i++) {
           if (this.stockType[i].stock_attribute == 2) {
             arr.push(this.stockType[i])
@@ -4419,9 +4553,13 @@ mu
           if (this.stockType[i].stock_attribute == 3) {
             arrTwo.push(this.stockType[i])
           }
+          if(this.stockType[i].stock_attribute == 4){
+            arrThree.push(this.stockType[i])
+          }
         }
         var dialyzator = []
         var irrigation = []
+        var dialysis_strainer = []
         for (let i = 0; i < arr.length; i++) {
           for (let j = 0; j < arr[i].GoodInfo.length; j++) {
             dialyzator.push(arr[i].GoodInfo[j])
@@ -4435,7 +4573,14 @@ mu
           }
         }
         this.irrigations = irrigation
+        
+        for(let i=0;i<arrThree.length;i++){
+          for (let j = 0; j < arrThree[i].GoodInfo.length; j++) {
+            dialysis_strainer.push(arrThree[i].GoodInfo[j])
+          }
+        }
        
+        this.dialysisStrainerList = dialysis_strainer
       },
       
       admin_user_id:function(){

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

@@ -121,6 +121,7 @@
           <el-checkbox :label="dialys_mode"></el-checkbox>
           <el-checkbox :label="long_time"></el-checkbox>
           <el-checkbox :label="target_ultrafiltration"></el-checkbox>
+          <el-checkbox :label="prescription_water" v-if="org_id == 10469"></el-checkbox>
           <el-checkbox :label="anticoagulant"></el-checkbox>
           <el-checkbox :label="anticoagulant_shouji"></el-checkbox>
           <el-checkbox :label="anticoagulant_weichi"></el-checkbox>
@@ -333,6 +334,7 @@ export default {
       dialys_mode: "透析模式:",
       long_time: "透析时长:",
       target_ultrafiltration: "目标超滤量:",
+      prescription_water:"处方脱水量:",
       anticoagulant: "抗凝剂:",
       anticoagulant_shouji: "首剂:",
       anticoagulant_weichi: "维持:",
@@ -818,9 +820,27 @@ export default {
               : "")
         );
       }
-      if (str.indexOf("目标超滤量") != -1 && this.prescription == null) {
+       if (str.indexOf("目标超滤量") != -1 && this.prescription == null) {
         arr.push("目标超滤量:");
       }
+      if (str.indexOf("处方脱水量") != -1 && this.prescription == null) {
+        arr.push("处方脱水量:");
+      }
+      
+      if (str.indexOf("处方脱水量") != -1 && this.prescription != null) {
+        arr.push(
+          "处方脱水量:" +
+            (this.prescription.prescription_water
+              ? this.prescription.prescription_water
+              : "")
+        );
+      }
+
+        if (str.indexOf("处方脱水量") != -1 && this.prescription == null) {
+        arr.push("处方脱水量:");
+      }
+     
+
       if (str.indexOf("抗凝剂") != -1 && this.prescription != null) {
         arr.push(
           "抗凝剂:" +
@@ -1333,6 +1353,17 @@ export default {
           this.target_ultrafiltration = this.target_ultrafiltration;
         }
 
+         if (this.prescription.prescription_water != "") {
+          this.prescription_water = "处方脱水量:";
+          this.prescription_water =
+            this.prescription_water +
+            (this.prescription.prescription_water
+              ? this.prescription.prescription_water
+              : "");
+        } else {
+          this.prescription_water = this.prescription_water;
+        }
+
         if (this.prescription.anticoagulant != "") {
           this.anticoagulant = "抗凝剂:";
           this.anticoagulant =
@@ -1490,6 +1521,17 @@ export default {
                 : "")
           );
         }
+
+         if (
+          this.double_check.dialysis_parameter_desc.indexOf("处方脱水量") != -1
+        ) {
+          this.checkListOne.push(
+            "处方脱水量:" +
+              (this.prescription.prescription_water
+                ? this.prescription.prescription_water
+                : "")
+          );
+        }
         if (this.double_check.dialysis_parameter_desc.indexOf("抗凝剂") != -1) {
           this.checkListOne.push(
             "抗凝剂:" +

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

@@ -238,15 +238,25 @@
                 org_id == 10210 ||
                 org_id == 9555 || org_id == 10387
                 || org_id == 10432
-                || org_id == 10445)
+                || org_id == 10445
+                || org_id == 10410)
             "
           >
             <template slot-scope="scope">
+             <span v-if="org_id == 10440 || org_id == 9671">
+              {{
+                scope.row.ultrafiltration_volume
+                  ? scope.row.ultrafiltration_volume
+                  : "0"
+              }}
+              </span> 
+               <span v-if="org_id != 10440 && org_id!=9671">
               {{
                 scope.row.ultrafiltration_volume
                   ? scope.row.ultrafiltration_volume
                   : ""
               }}
+              </span> 
             </template>
           </el-table-column>
           <el-table-column
@@ -296,6 +306,7 @@
               org_id!= 10210 &&
               org_id != 9555 && org_id!=10387
               && org_id!=10432 && org_id!=10445
+              && org_id!=10410
             "
           >
             <template slot-scope="scope">
@@ -345,7 +356,8 @@
                 template_id == 47 ||
                 template_id == 60 ||
                 org_id == 10432 ||
-                org_id == 10445)
+                org_id == 10445 ||
+                org_id == 10410)
             "
           >
             <template slot-scope="scope">
@@ -394,7 +406,8 @@
               template_id != 47 &&
               template_id != 60 &&
               org_id!=10432 &&
-              org_id!=10445
+              org_id!=10445 &&
+              org_id!=10410
             "
           >
             <template slot-scope="scope">
@@ -832,6 +845,18 @@
             </template>
           </el-table-column>
 
+          <el-table-column
+            prop="heparin"
+            align="center"
+            label="滤前压(mmHg)"
+            width="140"
+            v-if="isShow('滤前压')"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.filter_pressure }}
+            </template>
+          </el-table-column>
+
           <el-table-column
             prop="heparin"
             align="center"
@@ -1066,7 +1091,8 @@
                 template_id == 47 ||
                 template_id == 60 ||
                 org_id== 10432 || 
-                org_id== 10445)
+                org_id== 10445 ||
+                org_id== 10410)
             "
           >
             <el-form-item label="超滤率(ml/h)" :prop="isName('超滤率')"
@@ -1109,7 +1135,8 @@
               template_id != 47 &&
               template_id != 60 &&
               org_id!=10432 && 
-              org_id!=10445
+              org_id!=10445 &&
+              org_id!=10410
             "
           >
             <el-form-item label="超滤率(L/h)" :prop="isName('超滤率')"
@@ -1162,7 +1189,8 @@
                 org_id == 10340 ||
                 org_id == 10387 ||
                 org_id == 10432 ||
-                org_id == 10445)
+                org_id == 10445 ||
+                org_id == 10410)
             "
           >
             <el-form-item label="超滤量(ml)：" :prop="isName('超滤量')"
@@ -1215,7 +1243,8 @@
               org_id != 9555 &&
               org_id!=10387&&
               org_id!=10432 && 
-              org_id!=10445
+              org_id!=10445 && 
+              org_id!=10410
             "
           >
             <el-form-item label="超滤量(L)：" :prop="isName('超滤量')"
@@ -1523,6 +1552,12 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="isShow('滤前压')">
+            <el-form-item label="滤前压(mmHg):">
+              <el-input v-model="form.filter_pressure"></el-input>
+            </el-form-item>
+          </el-col>
+
           <!-- </el-row>
 
           <el-row :gutter="20"> -->
@@ -1737,6 +1772,7 @@ export default {
         blood_monitor: "",
         heparin_amount: "", //肝素量
         dehydration: "",
+        filter_pressure:"",
       },
 
       table_current_row: null,
@@ -1962,7 +1998,7 @@ export default {
       
         this.form.temperature = ""
 
-        this.form.pulse_frequency = ""; // this.last_monitor_record.pulse_frequency;
+        // this.last_monitor_record.pulse_frequency;
         // this.form.breathing_rated =  resp.monitor.breathing_rated ? resp.monitor.breathing_rated : '';
         this.form.systolic_bp = ""; // this.last_monitor_record.systolic_blood_pressure;
         this.form.diastolic_bp = ""; // this.last_monitor_record.diastolic_blood_pressure;
@@ -1970,12 +2006,18 @@ export default {
         // 静脉压
         if (this.org_id == 10060 || this.org_id == 10387) {
           this.form.venous_pressure = resp.monitor.venous_pressure;
-        }else if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 ){
+        }else if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 10469 ){
           this.form.venous_pressure = 80
         } else {
           this.form.venous_pressure = ""; // this.last_monitor_record.venous_pressure;
         }
 
+        if(this.org_id == 10440){
+           this.form.pulse_frequency = 80
+        }else{
+           this.form.pulse_frequency = ""
+        }
+
         this.form.venous_pressure_type = resp.monitor.venous_pressure_type? resp.monitor.venous_pressure_type: 1;
         if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 10387){
            this.form.arterial_pressure = resp.monitor.arterial_pressure? resp.monitor.arterial_pressure: "-100"; // this.last_monitor_record.arterial_pressure;
@@ -2019,7 +2061,7 @@ export default {
           ? resp.monitor.dialysate_temperature
           : "";
         
-         if(this.org_id == 9675 || this.org_id == 9671 || this.org_id == 10340){
+         if(this.org_id == 9675 || this.org_id == 9671 || this.org_id == 10340 || this.org_id == 10469){
             this.form.temperature = "36.5"
 
          }else{
@@ -2138,7 +2180,13 @@ export default {
         this.form.venous_pressure_type = 1;
         this.form.transmembrane_pressure = "";
         this.form.transmembrane_pressure_type = 1;
-        this.form.ultrafiltration_volume = "";
+        if(this.org_id == 9671 || this.org_id == 10440){
+           this.form.ultrafiltration_volume = 0
+        }
+        if(this.org_id != 9671 && this.org_id != 10440){
+          this.form.ultrafiltration_volume = "";
+        }
+       
         this.form.ultrafiltration_rate = "";
         this.form.arterial_pressure = "";
         this.form.arterial_pressure_type = 1;
@@ -2168,6 +2216,7 @@ export default {
         this.form.blood_monitor = "";
         this.form.dehydration = "";
         this.form.heparin_amount = "";
+        this.form.filter_pressure =""
       } else {
         (this.form.id = monitor.id),
           // this.form.operate_date = monitor.operate_date
@@ -2202,9 +2251,17 @@ export default {
           monitor.transmembrane_pressure_type
             ? monitor.transmembrane_pressure_type
             : "";
-        this.form.ultrafiltration_volume = monitor.ultrafiltration_volume
+        if(this.org_id == 9671 || this.org_id == 10440){
+          this.form.ultrafiltration_volume = monitor.ultrafiltration_volume
           ? monitor.ultrafiltration_volume
-          : "";
+          : "0";
+        }
+        if(this.org_id != 9671 && this.org_id !=10440){
+          this.form.ultrafiltration_volume = monitor.ultrafiltration_volume
+            ? monitor.ultrafiltration_volume
+            : "";
+        }
+        
         this.form.ultrafiltration_rate = monitor.ultrafiltration_rate
           ? monitor.ultrafiltration_rate
           : "";
@@ -2278,6 +2335,9 @@ export default {
         this.form.heparin_amount = monitor.heparin_amount
           ? monitor.heparin_amount
           : "";
+        this.form.filter_pressure = monitor.filter_pressure
+        ? monitor.filter_pressure
+        : "";  
         // 设置三个下拉框的值，直接调用事件偷懒
         this.symptomTextareaBlur();
         this.disposeTextareaBlur();
@@ -2421,6 +2481,7 @@ export default {
         parseFloat(this.form.dehydration) == NaN
           ? 0
           : parseFloat(this.form.dehydration);
+      this.form.filter_pressure = this.form.filter_pressure?this.form.filter_pressure:""
       let mode = "1";
       if (this.form.id > 0) {
         mode = "2";

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,10 +14,10 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || 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 == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && 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 !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && 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  && template_id != 60 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10387 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445"  width="76px"> 超滤量(L) </th>
-          <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  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <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 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || 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 == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && 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 !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && 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  && template_id != 60 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10387 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410"  width="76px"> 超滤量(L) </th>
+          <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  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410)" width="50px"> 超滤率 <br />(ml/h) </th>
+          <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 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410" 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 == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445) " width="92px" > 置换率(ml/min) </th>
@@ -43,6 +43,7 @@
           <th v-if="isShow('血压监测')" width="92px">血压监测</th>
           <th v-if="isShow('肝素量')" width="92px">肝素量(mg)</th>
           <th v-if="isShow('脱水')" width="92px">脱水(L)</th>
+          <th v-if="isShow('滤前压')" width="92px">滤前压(mmHg)</th>
           <th v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800)" width="92px">KT/V</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
 
@@ -59,7 +60,10 @@
 
           <td v-if="isShow('血流量')"> {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }} </td>
           <td v-if="isShow('跨膜压')"> {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }} </td>
-          <td v-if="isShow('超滤量')"> {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }} </td>
+          <td v-if="isShow('超滤量')"> 
+            <span v-if="org_id!=9671 && org_id!=10440">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}  </span> 
+            <span v-if="org_id ==9671 || org_id==10440">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "0" }}  </span> 
+          </td>
           <td v-if="isShow('超滤率')" >{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:''}}</td>
           <td v-if="isShow('钠浓度')"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }} </td>
           <td v-if="isShow('透析液温度')"> {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }} </td>
@@ -91,6 +95,7 @@
           <th v-if="isShow('血压监测')" width="92px">{{monitor.blood_monitor ? monitor.blood_monitor : ""}}</th>
           <th v-if="isShow('肝素量')" width="92px">{{monitor.heparin_amount ? monitor.heparin_amount : ""}}</th>
           <th v-if="isShow('脱水')" width="92px">{{monitor.dehydration ? monitor.dehydration : ""}}</th>
+          <th v-if="isShow('滤前压')" width="92px">{{monitor.filter_pressure ? monitor.filter_pressure : ""}}</th>
           <td v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800)">{{ monitor.ktv?monitor.ktv:""}}</td>
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}</td>
           <td v-if="isShow('处理')">{{ monitor.dispose }}</td>

src/xt_pages/dialysis/details/index.vue

@@ -31,6 +31,7 @@
           icon="el-icon-printer"
           >打印</el-button
         >
+      
       </div>
     </div>
 
@@ -1718,6 +1719,7 @@ export default {
       }
     },
     requestDialysisSchedules: function() {
+      console.log("时间人民站起来了呃")
       var ymd = parseTime(this.selected_date, '{y}-{m}-{d}')
       getDialysisSchedules(ymd).then(rs => {
         var resp = rs.data

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -14,8 +14,8 @@
       </template>
       <template
         v-if="
-          org_template_info.template_id == 2 ||
-          org_template_info.template_id == 0
+          org_template_info.template_id == 2
+       
         "
       >
         <div>
@@ -110,10 +110,13 @@
           org_template_info.template_id == 11 ||
           org_template_info.template_id == 50 ||
           org_template_info.template_id == 52 ||
-          org_template_info.template_id == 53
+          org_template_info.template_id == 53  ||
+          $store.getters.xt_user.org.id == 0
         "
       >
+      <div>
         <el-button
+          
           :loading="loading"
           size="small"
           icon="el-icon-printer"
@@ -121,6 +124,15 @@
           type="primary"
           >打印</el-button
         >
+        <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisTwoPage"
+            type="primary"
+            >打印医嘱单</el-button
+         >
+      </div>
       </template>
 
       <template v-if="org_template_info.template_id == 47">
@@ -186,8 +198,8 @@
       </template>
       <template
         v-if="
-          org_template_info.template_id == 14 ||
-          org_template_info.template_id == 0
+          org_template_info.template_id == 14
+         
         "
       >
         <div>
@@ -289,8 +301,8 @@
       </template> -->
       <template
         v-if="
-          org_template_info.template_id == 21 ||
-          org_template_info.template_id == 0
+          org_template_info.template_id == 21 
+         
         "
       >
         <div>
@@ -1181,6 +1193,9 @@
             v-if="org_template_info.template_id == 53"
           >
           </DialysisPrintOrderFiftyThree>
+
+         
+        
            <DialysisPrintOrderFiftyFour
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 54"
@@ -1577,8 +1592,8 @@ export default {
           scanStyles: false,
         });
       } else if (
-        this.org_template_info.template_id == 2 ||
-        this.org_template_info.template_id == 0
+        this.org_template_info.template_id == 2
+       
       ) {
         printJS({
           printable: "dialysis-print-box-1",
@@ -1616,7 +1631,8 @@ export default {
         // this.org_template_info.template_id == 51 ||
         this.org_template_info.template_id == 58 ||
         this.org_template_info.template_id == 60 ||
-        this.org_template_info.template_id == 61
+        this.org_template_info.template_id == 61  ||
+        this.org_template_info.template_id ==0
       ) {
         printJS({
           printable: "dialysis-print-box-1",
@@ -1978,7 +1994,6 @@ export default {
         });
       } else if (
         this.org_template_info.template_id == 2 ||
-        this.org_template_info.template_id == 0 ||
         this.org_template_info.template_id == 5 ||
         this.org_template_info.template_id == 22 ||
         this.org_template_info.template_id == 33
@@ -2027,7 +2042,9 @@ 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 =
         '@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: 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 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: 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 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;white-space:normal;height: fit-content;} .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;} ';
       if (this.org_template_info.template_id == 1) {
         printJS({
           printable: "dialysis-print-box",
@@ -2037,7 +2054,6 @@ export default {
         });
       } else if (
         this.org_template_info.template_id == 2 ||
-        this.org_template_info.template_id == 0 ||
         this.org_template_info.template_id == 5 ||
         this.org_template_info.template_id == 22 ||
         this.org_template_info.template_id == 33
@@ -2076,8 +2092,16 @@ export default {
           style: style,
           scanStyles: false,
         });
+      } else if (this.org_template_info.template_id == 53) {
+        printJS({
+          printable: "dialysis-print-box-1-2",
+          type: "html",
+          style: style12,
+          scanStyles: false,
+        });
       }
     },
+   
     getNumber() {
       if (this.dialysisOrder != null) {
         return (
@@ -2782,6 +2806,8 @@ export default {
     },
   },
   created() {
+    console.log("hhahahhahahahah=======",this.org_template_info.template_id)
+    console.log("this.$store.getters.xt_user.org.id",this.$store.getters.xt_user.org.id)
     var schedule_type_selected = this.$store.getters.schedule_type_selected;
     var zone_selected = this.$store.getters.zone_selected;
     var patient_state_selected = this.$store.getters.patient_state_selected;

src/xt_pages/dialysis/doctorNewAdviceStaticPrint.vue

@@ -27,9 +27,9 @@
                 <tr>
                   <td width="50">序号</td>
                   <td width="100">区域</td>
-                  <td width="100">责护</td>
+                  <!-- <td width="100">责护</td> -->
                   <td width="100">透析模式</td>
-                  <td  v-for="(item,index) in tabHead"  :key="index" :label="item.advice_name" width="150">
+                  <td  v-for="(item,index) in tabHead"  :key="index" :label="item.advice_name" width="200">
                      {{item.advice_name}}
                   </td>
                 </tr>
@@ -41,17 +41,25 @@
                     <span v-if="item.is_total ==0">总计</span>
                   </td>
                   <td>
-                    <span v-if="item.is_total == 1">{{getZoneName(item.child)}}</span> 
+                    <span v-if="item.is_total == 1">
+                      <!-- {{getZoneName(item.child)}} -->
+                      {{item.zone_name}}
+                    </span> 
                   </td>
-                  <td>
+                  <!-- <td>
                     <span v-if="item.is_total == 1"> {{getAdminUserName(item.execution_staff)}}</span>
-                  </td>
+                  </td> -->
                   <td>
                     <span v-if="item.is_total == 1"> {{getModeId(item.child)}}</span>
                   </td>
                   <td v-for="(it,i) in tabHead"  :key="i">
                     <span v-if="item.is_total == 1">
-                      <span v-if="item.child[i]!=null">{{getDrugCount(item.child,it.advice_name)}}</span>
+                      <span v-if="item.child[i]!=null">
+                        {{getDrugCount(item.child,it.advice_name)}}
+                      </span>
+                      <span v-if="it&&it.advice_name == '肝素钠注射剂'">
+                        {{getDrugAdviceCount(it.advice_name,item.zone_name)}}  
+                      </span>
                     </span>
                     <span v-if="item.is_total == 0">
                       {{getAllSumCount(it.advice_name)}}
@@ -113,6 +121,7 @@
           tabHead:[],
           tableDataList:[],
           adminUserList:[],
+          doctorMap:[],
         }
       },
       components: {
@@ -181,15 +190,18 @@
                 this.tabHead = arr
                 console.log("arr---------------------",this.tabHead)
               }
-
+              
+              this.doctorMap = []
               if(doctorList!=null && doctorList.length > 0){
-                
                 let dataInfo = {}
                   doctorList.forEach((item, index) => {
-                  let { execution_staff } = item
-                  if (!dataInfo[execution_staff])  {
-                    dataInfo[execution_staff] = {
-                      execution_staff:item.execution_staff,
+                  if(item.advice_name == "肝素钠注射剂"){
+                    this.doctorMap.push(item)
+                  } 
+                  let { zone_name } = item
+                  if (!dataInfo[zone_name])  {
+                    dataInfo[zone_name] = {
+                      zone_name:item.zone_name,
                       child: [],
                       count:0,
                       sort:item.sort,
@@ -200,7 +212,7 @@
                 if(newArr!=null && newArr.length >0){
                   for(let i=0;i<newArr.length;i++){
                     for(let j=0;j<doctorList.length;j++){
-                      if(newArr[i].execution_staff == doctorList[j].execution_staff){
+                      if(newArr[i].zone_name == doctorList[j].zone_name){
                          newArr[i].child.push(doctorList[j])
                       }
                     }
@@ -515,30 +527,66 @@
 
       getAllSumCount(advice_name){
        
-       var hisNewArr =[]
-      if(this.tabHead.length!=null && this.tabHead.length >0){
-        for(let i=0;i<this.tabHead.length;i++){
-          if(this.tabHead[i].advice_name == advice_name){
-            hisNewArr.push(this.tabHead[i])
+        var hisNewArr =[]
+        if(this.tabHead.length!=null && this.tabHead.length >0){
+          for(let i=0;i<this.tabHead.length;i++){
+            if(this.tabHead[i].advice_name == advice_name){
+              hisNewArr.push(this.tabHead[i])
+            }
           }
         }
-      }
-      
-      var total = 0
-      if(hisNewArr!=null && hisNewArr.length > 0){
-        for(let i=0;i<hisNewArr.length;i++){
-         for(let j=0;j<hisNewArr[i].child.length;j++){
-            total += parseInt(hisNewArr[i].child[j].prescribing_number)
-         }
+        
+        var total = 0
+        if(hisNewArr!=null && hisNewArr.length > 0){
+          for(let i=0;i<hisNewArr.length;i++){
+          for(let j=0;j<hisNewArr[i].child.length;j++){
+              total += parseInt(hisNewArr[i].child[j].prescribing_number)
+          }
+          }
+        }
+        if (total > 0) {
+          return total
+        }else{
+          return 0
         }
-      }
-      if (total > 0) {
-        return total
-      }else{
-        return 0
-      }
 
-     }
+     },
+     getDrugAdviceCount(advice_name,zone_name){
+        var str = ""
+        var arr =[]
+        var arrOne = []
+        if(this.doctorMap!=null && this.doctorMap.length>0){
+
+           for(let i=0;i<this.doctorMap.length;i++){
+            if(this.doctorMap[i].advice_name!="" || this.doctorMap[i].advice_name!=undefined){
+                this.doctorMap[i].advice_name = this.doctorMap[i].advice_name.replace(/\s/g,"")
+            }
+             if(this.doctorMap[i].advice_name == advice_name && this.doctorMap[i].zone_name == zone_name && this.doctorMap[i].delivery_way =="导管封管"){
+                arr.push(this.doctorMap[i])
+             }
+
+             if(this.doctorMap[i].advice_name == advice_name && this.doctorMap[i].zone_name == zone_name && this.doctorMap[i].delivery_way.indexOf("泵入")!=-1){
+                arrOne.push(this.doctorMap[i])
+             }
+           }
+        }
+
+        if(arr!=null && arr.length >0){
+            var total = 0
+           for(let i=0;i<arr.length;i++){
+              total +=arr[i].prescribing_number
+           }
+          str =  "封管" +"("+total+")"
+        }
+        if(arrOne!=null && arrOne.length >0){
+            var total_one = 0
+           for(let i=0;i<arrOne.length;i++){
+             total_one +=arrOne[i].prescribing_number
+           }
+          str = str + "泵入" +"("+total_one+")"
+        }
+        return str
+      },
      }
     }
   </script>

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -137,6 +137,22 @@
         </div>
       </div>
 
+      <div class="cell clearfix">
+        <label class="title"> <span class="name">执行频率</span> : </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.id == execution_frequency ? 'active' : ''"
+              @click="selectFrequencyWay(item.id)"
+              v-for="item in excutList"
+              :key="item.id"
+            >
+              {{ item.name }}
+            </li>
+          </ul>
+        </div>
+      </div>
+
        <div class="cell clearfix">
         <label class="title"> <span class="name">执行状态</span> : </label>
         <div class="time">
@@ -159,9 +175,9 @@
       </div> -->
 
       <div style="margin-top: 10px;margin-bottom:10px">
-        <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=9671 && org_id!=0 && org_id!=10340 ">统计</el-button>
+        <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=9671  && org_id!=10340 ">统计</el-button>
 
-        <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 9671 || org_id == 0 || org_id==10340">统计</el-button>
+        <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 9671 || org_id==10340">统计</el-button>
       </div>
 
 
@@ -523,7 +539,7 @@
             </el-option>
            </el-select>
            <label class="title"> <span class="name">病区选择</span> : </label>
-           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionType">
+           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionType" multiple >
             <el-option
               v-for="item in partitionArr"
               :key="item.id"
@@ -595,7 +611,7 @@
             </el-option>
            </el-select>
            <label class="title"> <span class="name">病区选择</span> : </label>
-           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionTypeOne">
+           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionTypeOne" multiple>
             <el-option
               v-for="item in partitionArr"
               :key="item.id"
@@ -638,11 +654,14 @@
           width="100"
         >
           <template slot-scope="scope" >
-            <span v-if="scope.row.is_total ==1">{{getZoneName(scope.row.child)}}</span>
+            <span v-if="scope.row.is_total ==1">
+              <!-- {{getZoneName(scope.row.child)}} -->
+              {{scope.row.zone_name }}
+           </span>
           </template>
 
         </el-table-column>
-       <el-table-column
+       <!-- <el-table-column
           align="center"
           prop="name"
           label="责护"
@@ -654,7 +673,7 @@
             </span>
           </template>
 
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column
           align="center"
@@ -680,6 +699,9 @@
           <template slot-scope="scope">
             <span v-if="scope.row.is_total ==1">
               <span v-if="scope.row.child[index]!=null">{{getDrugCount(scope.row.child,item.advice_name)}}</span>
+              <span v-if="item&&item.advice_name == '肝素钠注射剂'">
+                 {{getDrugAdviceCount(item.advice_name,scope.row.zone_name)}}
+              </span>
             </span>
             <span v-if="scope.row.is_total == 0">
                  {{getAllSumCount(item.advice_name)}}
@@ -794,6 +816,11 @@ export default {
       tabHead:[],
       tableDataList:[],
       adminUserList:[],
+      doctorMap:[],
+      excutList:[],
+      execution_frequency:"",
+      zoneIdList:[],
+      partion_str:"",
     };
   },
   created() {
@@ -829,7 +856,7 @@ export default {
       });
     },
     clickCurrent(val) {
-     // console.log(val);
+      //console.log(val);
       this.$router.push({
         path: "/dialysis/details",
         query: { patient_id: val.patient_id, date: val.sch_time_int,mode_id:val.mode_id }
@@ -856,6 +883,10 @@ export default {
        this.delivery_way = val
        this.requestSchedualDoctors(this.time)
     },
+    selectFrequencyWay(val){
+      this.execution_frequency = val
+      this.requestSchedualDoctors(this.time)
+    },
 
     selectExcutionWay(val){
        this.excution_way = val
@@ -874,11 +905,20 @@ export default {
           return false;
         } else {
           this.partitionArr = response.data.data.zone;
-          this.partitionArr.unshift({ id: 0, name: "全部" });
+          for(let i=0;i<this.partitionArr.length;i++){
+           this.zoneIdList.push(this.partitionArr[i].id)
+          }
+         
+          // this.partitionArr.unshift({ id: 0, name: "全部" });
           var dics  =  response.data.data.dics
           var obj = {id:0,name:"全部"}
           this.deliveryWay.push(obj)
           this.deliveryWay.push(...dics)
+          var objOne = {id:0,name:"全部"}
+           this.excutList.push(objOne)
+           var efs = response.data.data.efs
+           this.excutList.push(...efs)
+          console.log("执行瓶绿",this.excutList)
         }
       });
     },
@@ -893,13 +933,24 @@ export default {
         if(name == '全部'){
           name = ""
         }
+       
+        var nameOne = ""
+         for(let i=0;i<this.excutList.length;i++){
+            if(this.execution_frequency == this.excutList[i].id){
+              nameOne = this.excutList[i].name
+            }
+        }
+
+         if(nameOne == '全部'){
+          nameOne = ""
+        }
 
         let newTime =  moment(time).format('YYYY-MM-DD')
 
          var schedule_type = this.listQuery.schedul_type
          var partition_type = this.listQuery.partition_type
-
-        getNewSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id,excution_way:this.excution_way,cost_type:this.costType}).then(rs => {
+       
+        getNewSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id,excution_way:this.excution_way,cost_type:this.costType,execution_frequency:nameOne}).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
             this.admin_users = resp.data.adminUser
@@ -952,7 +1003,7 @@ export default {
                     })
                   }
                 })
-                console.log("hh3oo1o3o123o3oo312o132o312o31o132o",resp.data.hisAdvices)
+                console.log("中国人民名份反反复复方法 ",resp.data.hisAdvices)
               }
             }
 
@@ -1251,7 +1302,17 @@ export default {
         if(name == '全部'){
           name = ""
        }
-      this.$router.push({ path: "/dialysis/signPrint",query:{time: new Date(this.time).getTime(),delivery_way:name} });
+        var nameOne = ""
+         for(let i=0;i<this.excutList.length;i++){
+            if(this.execution_frequency == this.excutList[i].id){
+              nameOne = this.excutList[i].name
+            }
+        }
+
+         if(nameOne == '全部'){
+          nameOne = ""
+        }
+      this.$router.push({ path: "/dialysis/signPrint",query:{time: new Date(this.time).getTime(),delivery_way:name,execution_frequency:nameOne,patient_id:this.patient_id} });
 
     },
     batchPrintActionOne: function() {
@@ -1475,7 +1536,9 @@ export default {
         return searchArray
       },
      handleSelect(val) {
+       console.log("val323223232323232323",val)
        this.patient_id = val.id
+       this.listQuery.keyword = val.name
        this.requestSchedualDoctors(this.time)
       },
      toSeach(){
@@ -1667,12 +1730,22 @@ export default {
     },
 
      toStatic() {
+          var str = ""
+         if(this.partion_type==0){
+            str = this.zoneIdList.join(",")
+         }
+         if(this.partion_type!=0){
+            str = this.partion_type.join(",")
+         }
+         this.partion_str = ""
+         this.partion_str = str  
          this.tableList = []
           var params = {
             schedule_type:this.schedule_type,
-            partion_type:this.partion_type,
+            partion_type:str,
             selected_date: moment(this.time).format('YYYY-MM-DD'),
           }
+
          console.log("params2332232wo",params)
         getDialysisAdviceToday(params).then(response=>{
           if(response.data.state == 1){
@@ -1804,10 +1877,19 @@ export default {
 
       },
       toStaticOne() {
+         var str = ""
+         if(this.partion_type==0){
+            str = this.zoneIdList.join(",")
+         }
+         if(this.partion_type!=0){
+            str = this.partion_type.join(",")
+         }
+         this.partion_str = ""
+         this.partion_str = str  
          this.tableList = []
           var params = {
             schedule_type:this.schedule_type,
-            partion_type:this.partion_type,
+            partion_type:str,
             selected_date: moment(this.time).format('YYYY-MM-DD'),
           }
 
@@ -1865,14 +1947,17 @@ export default {
                 console.log("tabHead",this.tabHead)
               }
 
+              this.doctorMap = []
               if(doctorList!=null && doctorList.length > 0){
-
                 let dataInfoOne = {}
                   doctorList.forEach((item, index) => {
-                  let { execution_staff } = item
-                  if (!dataInfoOne[execution_staff])  {
-                    dataInfoOne[execution_staff] = {
-                      execution_staff:item.execution_staff,
+                    if(item.advice_name == "肝素钠注射剂"){
+                      this.doctorMap.push(item)
+                    }
+                  let { zone_name } = item
+                  if (!dataInfoOne[zone_name])  {
+                    dataInfoOne[zone_name] = {
+                      zone_name:item.zone_name,
                       child: [],
                       count:0,
                       sort:item.sort,
@@ -1883,7 +1968,7 @@ export default {
                 if(newArr!=null && newArr.length >0){
                   for(let i=0;i<newArr.length;i++){
                     for(let j=0;j<doctorList.length;j++){
-                      if(newArr[i].execution_staff == doctorList[j].execution_staff){
+                      if(newArr[i].zone_name == doctorList[j].zone_name){
                          newArr[i].child.push(doctorList[j])
                       }
                     }
@@ -1897,7 +1982,7 @@ export default {
                   }
                 }
 
-                var obj = {is_total:0,count:0,execution_staff:0,child:[]}
+                var obj = {is_total:0,count:0,execution_staff:0,child:[],zone_name:""}
                 newList.push(obj)
                 this.tableDataList = newList
                 console.log("999999999999999999-------",this.tableDataList)
@@ -1912,7 +1997,42 @@ export default {
         })
 
       },
+      getDrugAdviceCount(advice_name,zone_name){
+        var str = ""
+        var arr =[]
+        var arrOne = []
+        if(this.doctorMap!=null && this.doctorMap.length>0){
+
+           for(let i=0;i<this.doctorMap.length;i++){
+            if(this.doctorMap[i].advice_name!="" || this.doctorMap[i].advice_name!=undefined){
+                this.doctorMap[i].advice_name = this.doctorMap[i].advice_name.replace(/\s/g,"")
+            }
+             if(this.doctorMap[i].advice_name == advice_name && this.doctorMap[i].zone_name == zone_name && this.doctorMap[i].delivery_way =="导管封管"){
+                arr.push(this.doctorMap[i])
+             }
 
+             if(this.doctorMap[i].advice_name == advice_name && this.doctorMap[i].zone_name == zone_name && this.doctorMap[i].delivery_way.indexOf("泵入")!=-1){
+                arrOne.push(this.doctorMap[i])
+             }
+           }
+        }
+
+        if(arr!=null && arr.length >0){
+            var total = 0
+           for(let i=0;i<arr.length;i++){
+              total +=arr[i].prescribing_number
+           }
+          str =  "封管" +"("+total+")"
+        }
+        if(arrOne!=null && arrOne.length >0){
+            var total_one = 0
+           for(let i=0;i<arrOne.length;i++){
+             total_one +=arrOne[i].prescribing_number
+           }
+          str = str + "泵入" +"("+total_one+")"
+        }
+        return str
+      },
      getSpecification(id){
         var specification_name = ""
         for(let i=0;i<this.druglist.length;i++){
@@ -1962,11 +2082,11 @@ export default {
       },
       toPrintOne(){
          var schedule_date = moment(this.time).format('YYYY-MM-DD')
-        this.$router.push({path:"/dialysis/doctorAdviceStaticPrint?schedule_type="+this.schedule_type+"&partion_type="+this.partion_type+"&schedule_date="+schedule_date+"&is_open="+this.config.is_open})
+        this.$router.push({path:"/dialysis/doctorAdviceStaticPrint?schedule_type="+this.schedule_type+"&partion_type="+this.partion_str+"&schedule_date="+schedule_date+"&is_open="+this.config.is_open})
       },
       toPrintTwo(){
         var schedule_date = moment(this.time).format('YYYY-MM-DD')
-        this.$router.push({path:"/dialysis/doctorNewAdviceStaticPrint?schedule_type="+this.schedule_type+"&partion_type="+this.partion_type+"&schedule_date="+schedule_date+"&is_open="+this.config.is_open})
+        this.$router.push({path:"/dialysis/doctorNewAdviceStaticPrint?schedule_type="+this.schedule_type+"&partion_type="+this.partion_str+"&schedule_date="+schedule_date+"&is_open="+this.config.is_open})
       },
       toExportListOne(){
         import('@/vendor/Export2Excel').then(excel => {
@@ -2289,36 +2409,37 @@ export default {
       GetMobileScheduleList().then(response=>{
         if(response.data.state == 1){
           var schedule = response.data.data.schedule
-          console.log("schedule---------------",schedule)
-          var arr = []
-          for(let i=0;i<schedule.length;i++){
-            if(schedule[i].monitor_record.ultrafiltration_volume!=schedule[i].xt_assesment_after_dislysis.actual_ultrafiltration){
-              arr.push(schedule[i])
-            }
-          }
-
-
-          import('@/vendor/Export2Excel').then(excel => {
-
-         if(arr!=null && arr.length > 0){
-           for(let i=0;i<arr.length;i++){
-             arr[i].patient_name = arr[i].patient.name
-             arr[i].target_ultrafiltration = arr[i].dialysis_prescription.target_ultrafiltration
-             arr[i].ultrafiltration_volume = arr[i].monitor_record.ultrafiltration_volume
-             arr[i].actual_ultrafiltration = arr[i].xt_assesment_after_dislysis.actual_ultrafiltration
-             arr[i].start_time =  this.getTimeSix(arr[i].schedule_date)
-           }
-         }
-         const tHeader = ['序号','日期','患者姓名','目标超滤量','监测超滤量','实际超滤量']
-         const filterVal = ['index','start_time','patient_name','target_ultrafiltration','ultrafiltration_volume','actual_ultrafiltration']
-
-         const data = this.formatJson(filterVal, arr)
-         excel.export_json_to_excel({
-           header: tHeader,
-           data,
-           filename: '监测数据统计'
-          })
-         })
+          this.$message.success("保存成功!")
+        //   console.log("schedule---------------",schedule)
+        //   var arr = []
+        //   for(let i=0;i<schedule.length;i++){
+        //     if(schedule[i].monitor_record.ultrafiltration_volume!=schedule[i].xt_assesment_after_dislysis.actual_ultrafiltration){
+        //       arr.push(schedule[i])
+        //     }
+        //   }
+
+
+        //   import('@/vendor/Export2Excel').then(excel => {
+
+        //  if(arr!=null && arr.length > 0){
+        //    for(let i=0;i<arr.length;i++){
+        //      arr[i].patient_name = arr[i].patient.name
+        //      arr[i].target_ultrafiltration = arr[i].dialysis_prescription.target_ultrafiltration
+        //      arr[i].ultrafiltration_volume = arr[i].monitor_record.ultrafiltration_volume
+        //      arr[i].actual_ultrafiltration = arr[i].xt_assesment_after_dislysis.actual_ultrafiltration
+        //      arr[i].start_time =  this.getTimeSix(arr[i].schedule_date)
+        //    }
+        //  }
+        //  const tHeader = ['序号','日期','患者姓名','目标超滤量','监测超滤量','实际超滤量']
+        //  const filterVal = ['index','start_time','patient_name','target_ultrafiltration','ultrafiltration_volume','actual_ultrafiltration']
+
+        //  const data = this.formatJson(filterVal, arr)
+        //  excel.export_json_to_excel({
+        //    header: tHeader,
+        //    data,
+        //    filename: '监测数据统计'
+        //   })
+        //  })
         }
       })
     }

src/xt_pages/dialysis/signPrint.vue

@@ -14,9 +14,18 @@
                     <div class="signPrint" v-for="it in item.doctor_advice" style="page-break-after: always;">
                         <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
                         <div>姓名:{{item.patient.name}}</div>  
-                        <div>医嘱内容:{{ it.advice_name }}</div>  
-                        <div>给药途径:{{it.execution_frequency}}</div>  
-                        <div>执行频率:{{it.delivery_way}}</div>  
+                        <div>医嘱内容:{{ it.advice_name }} 
+                           <span v-if="it.prescribing_number>0 && org_id !=0 && org_id!=10440">
+                            {{it.prescribing_number}}{{ it.prescribing_number_unit }}
+                          </span> 
+                        </div>  
+                        <div v-if="org_id ==0 || org_id == 10138 || org_id == 10278">
+                          规格:{{getSpecialName(it.drug_id)}} 
+                         
+                        </div>  
+                        <div v-if=" org_id ==0 || org_id==10440">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
+                        <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>  
+                        <div>给药途径:{{it.delivery_way}}</div>  
                         <div>打印时间:{{time}}</div>   
                     </div>  
                 </div>
@@ -29,9 +38,16 @@
                     <div class="signPrint" v-for="it in item.doctor_advice" style="page-break-after: always;">
                         <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
                         <div>姓名:{{item.patient.name}}</div>  
-                        <div>医嘱内容:{{getAdvice(item.doctor_advice)}}</div>  
+                        <div>医嘱内容:{{getAdvice(item.doctor_advice)}} 
+                           <span v-if="it.prescribing_number >0&& org_id !=0 && org_id!=10440"> {{it.prescribing_number}}{{ it.prescribing_number_unit }}</span>
+                        </div>  
+                        <div v-if="org_id ==0 || org_id == 10138 || org_id == 10278">
+                          规格:{{getSpecialName(it.drug_id)}} 
+                         
+                        </div>  
+                        <div v-if=" org_id ==0 || org_id==10440">单次用量:{{it.single_dose}}&nbsp;{{it.single_dose_unit }}</div>
                         <div>给药途径:{{item.doctor_advice[0].execution_frequency}}</div>  
-                        <div>执行频率:{{item.doctor_advice[0].delivery_way}}</div>  
+                        <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{item.doctor_advice[0].delivery_way}}</div>  
                         <div>打印时间:{{time}}</div>   
                     </div>  
                   
@@ -68,7 +84,10 @@ export default {
             show:true,
             showOne:false,
             delivery_way:"",
-            list:[]
+            list:[],
+            execution_frequency:"",
+            org_id:0,
+            drugList:[],
         }
     },
     methods:{
@@ -90,6 +109,8 @@ export default {
             patient_type: 0,
             advice_type: 2,
             delivery_way:this.delivery_way,
+            execution_frequency:this.execution_frequency,
+            patient_id:this.$route.query.patient_id,
             }).then(rs => {
                 var resp = rs.data
                 if (resp.state == 1) {
@@ -254,6 +275,7 @@ export default {
                
                  if(config.is_open == 1){
                    var schedulesArr = resp.data.hisAdvices
+                   this.drugList = resp.data.drug
                    let schedules = []
                    var ids = this.$store.getters.temp_params.advice_ids
                    console.log('ids',ids)
@@ -516,6 +538,15 @@ export default {
         return ""
       }
     },
+    getSpecialName(drug_id){
+        var name = ""
+        for(let i=0;i<this.drugList.length;i++){
+            if(drug_id == this.drugList[i].id){
+            name = this.drugList[i].dose + this.drugList[i].dose_unit + "*" + this.drugList[i].min_number + this.drugList[i].min_unit +"/"+this.drugList[i].max_unit
+            }
+        }
+        return name
+     }
     },
     computed: {
     filtedScheduals: function () {
@@ -628,13 +659,18 @@ export default {
         console.log("222222",scheduleMap)
         return scheduleMap
         },
+
+      
     
     },
     created(){
       var time = this.$route.query.time
       var delivery_way = this.$route.query.delivery_way
+      this.org_id = this.$store.getters.xt_user.org.id
       console.log("delivery_Way",delivery_way)
       this.delivery_way = delivery_way
+      var execution_frequency = this.$route.query.execution_frequency
+      this.execution_frequency = execution_frequency
       this.time = moment(time).format('YYYY-MM-DD')
       console.log(11,this.$route.query)
       this.requestSchedualDoctors(time)

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -289,6 +289,18 @@
                                 }}
                               </div>
                             </div>
+                          
+                          </div>
+
+                          <div
+                            class="row"
+                            style="
+                              padding: 2px 0;
+                              line-height: 23px;
+                              display: flex;
+                            "
+                          >
+                          
                             <div class="inline_block" style="flex: 1">
                               透前症状：
                               <div
@@ -1148,7 +1160,7 @@
                               <span v-if="prescription.anticoagulant == 4"
                                 >mg</span
                               >
-                              <span v-if="prescription.anticoagulant == 3"
+                              <span v-if="prescription.anticoagulant == 3 || prescription.anticoagulant == 6 || prescription.anticoagulant == 7"
                                 >iu</span
                               >
                               <span v-if="prescription.anticoagulant == 2"
@@ -2582,7 +2594,7 @@
                                 />
                               </div>
                             </div>
-                            <div class="inline_block" style="flex: 1">
+                            <!-- <div class="inline_block" style="flex: 1">
                               下机护士：
                               <div
                                 class="under_line"
@@ -2620,6 +2632,21 @@
                                   v-else
                                 />
                               </div>
+                            </div> -->
+                            <div class="inline_block" style="flex: 1">
+                              患者签名：
+                              <div
+                                class="under_line"
+                                style="width: 80px; text-align: center"
+                              >
+                               
+                                <img
+                                  style="height: 30px"
+                                  :src="dialysisOrder == null? 0: dialysisOrder.url"
+                                  alt=""
+                                  srcset=""
+                                />
+                              </div>
                             </div>
                             <div class="inline_block" style="flex: 1">
                               治疗医生：
@@ -3496,8 +3523,8 @@ export default {
         }
 
         this.totollength = this.doctor_advices.length + this.monitors.length;
-        if (this.totollength > 18) {
-          var temp_advice_length = 17 - this.monitors.length;
+        if (this.totollength > 32) {
+          var temp_advice_length = 31 - this.monitors.length;
           var doctor_advices_1 = [];
           var doctor_advices_2 = [];
           for (let index = 0; index < this.doctor_advices.length; index++) {

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -374,14 +374,14 @@
                       医师签名：
                       <span
                         style="height: 20px"
-                        v-if="setAdminUserES(prescription.modifier) == ''"
+                        v-if="setAdminUserES(advices[0].advice_doctor) == ''"
                       >
-                        {{ getAdminUser(prescription.modifier) }}
+                        {{ getAdminUser(advices[0].advice_doctor) }}
                       </span>
                       <img
                         class="es-img"
                         style="height: 25px"
-                        :src="setAdminUserES(prescription.modifier)"
+                        :src="setAdminUserES(advices[0].advice_doctor)"
                         alt
                         srcset
                         v-else
@@ -795,7 +795,7 @@
               </table>
             </td>
           </tr>
-          <tr style="transform: translateY(4px)">
+          <tr style="transform: translateY(4px)" v-if="org_id!=10346 && org_id!=0">
             <td>
               <table class="print-table" border="1" style="text-align: center">
                 <tr>
@@ -805,7 +805,7 @@
                   <td
                     style="height: 20px"
                     width="90"
-                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
+                    v-if="org_id == 10346 || org_id == 9675"
                   >
                     <p style="height: 20px; line-height: 20px">开嘱医生</p>
                   </td>
@@ -815,10 +815,11 @@
                   <td
                     style="height: 20px"
                     width="70"
-                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
+                    v-if="org_id == 10346 || org_id == 9675"
                   >
                     <p style="height: 20px; line-height: 20px">执行时间</p>
                   </td>
+             
                   <td style="height: 20px" width="90">
                     <p style="height: 20px; line-height: 20px">执行</p>
                   </td>
@@ -841,6 +842,7 @@
               </table>
             </td>
           </tr>
+          <div v-if="org_id!=10346 && org_id!=0">
           <tr
             v-for="(advice, advice_index) in advices"
             :key="advice_index"
@@ -855,7 +857,7 @@
                   <td
                     style="line-height: 30px"
                     width="90"
-                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
+                    v-if="org_id == 10346 || org_id == 9675"
                   >
                     <span v-if="setAdminUserES(advice.advice_doctor) == ''">
                       {{ getAdminUser(advice.advice_doctor) }}
@@ -894,12 +896,27 @@
                   <td
                     style="line-height: 10px"
                     width="70"
-                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
+                    v-if="org_id == 10346 || org_id == 9675"
                   >
                     <span v-if="advice.execution_time">{{
                       getTime(advice.execution_time, "{h}:{i}")
                     }}</span>
                   </td>
+                  <!-- <td
+                    style="line-height: 30px"
+                    width="90"
+                    v-if="org_id == 10249 || 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="line-height: 10px" width="90">
                     <span v-if="setAdminUserES(advice.execution_staff) == ''">{{
                       getAdminUser(advice.execution_staff)
@@ -1008,6 +1025,7 @@
               </table>
             </td>
           </tr>
+          </div>
 
           <tr style="transform: translateY(1px)">
             <td>
@@ -1043,20 +1061,20 @@
                       <span
                         v-if="
                           setAdminUserES(
-                            prescription == null
+                            advices == null
                               ? 0
-                              : prescription.prescription_doctor
-                              ? prescription.prescription_doctor
+                              : advices[0].advice_doctor
+                              ? advices[0].advice_doctor
                               : ''
                           ) == ''
                         "
                       >
                         {{
                           getAdminUser(
-                            prescription == null
+                            advices == null
                               ? 0
-                              : prescription.prescription_doctor
-                              ? prescription.prescription_doctor
+                              : advices[0].advice_doctor
+                              ? advices[0].advice_doctor
                               : ""
                           )
                         }}
@@ -1125,6 +1143,270 @@
         </tbody>
       </table>
     </div>
+
+
+    <div id="dialysis-print-box-1-2" class="dialysis-print-order print-template-two print_page_main_content" style="position: relative;" v-if="org_id == 10346">
+     
+      <div class="dialysis-print-order">
+      <table class="print-table">
+        <thead style="transform: translateY(2px)">
+          <tr>
+            <td>
+              <div class="order-yy-name">{{ orgname }}</div>
+              <div class="order-title">血液净化科医嘱及执行单</div>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <table class="print-table" border="1">
+                <tr>
+                  <td width="80" colspan="11" style="text-align: center">
+                    治 疗 日 期:&nbsp;<span>{{ queryParams.xtdate }}</span>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="11" style="padding-left: 10px">
+                    <div class="list_table">
+                      <div>姓 名:&nbsp;{{ patientInfo.name }}</div>
+                      <div>
+                        性别：{{ patientInfo_gender_1 == true ? "男" : "女" }}
+                      </div>
+                      <div>年龄：{{ getoldAge() }}</div>
+                      <div>透析机号:&nbsp;{{ getNumber() }}</div>
+                    </div>
+                  </td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+        </thead>
+        <tbody>
+        
+       
+          <tr style="transform: translateY(4px)">
+            <td>
+              <table class="print-table" border="1" style="text-align: center">
+                <tr>
+                  <td style="height: 20px" width="60">
+                    <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="344">
+                    <p style="height: 20px; line-height: 20px">医嘱执行记录</p>
+                  </td>
+                  <td
+                    style="height: 20px"
+                    width="70"
+                  
+                  >
+                    <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="90">
+                    <p style="height: 20px; line-height: 20px">核对</p>
+                  </td>
+                  <td style="height: 20px" width="144">
+                    <p style="height: 20px; line-height: 20px">上次透后体重</p>
+                  </td>
+                  <td style="height: 20px" width="60">
+                    {{
+                      patientInfo.total_dialysis +
+                        patientInfo.user_sys_before_count >
+                      0
+                        ? assessmentafter.weight_after
+                        : "/"
+                    }}kg
+                  </td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+          <div>
+          <tr
+            v-for="(advice, advice_index) in advices"
+            :key="advice_index"
+            style="transform: translateY(3px)"
+          >
+            <td>
+              <table class="print-table" border="1">
+                <tr>
+                  <td width="60">
+                    {{ getTime(advice.start_time, "{h}:{i}") }}
+                  </td>
+                  <td
+                    style="line-height: 30px"
+                    width="90"
+                  >
+                    <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"
+                      >({{ 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.parent_id == 0">{{
+                      advice.execution_frequency
+                    }}</span>
+                    <span>{{ advice.remark }}</span>
+                  </td>
+                  <td
+                    style="line-height: 10px"
+                    width="70"
+                  >
+                    <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>
+                    <img
+                      style="height: 30px"
+                      :src="setAdminUserES(advice.execution_staff)"
+                      alt=""
+                      srcset=""
+                    />
+                  </td>
+                  <td style="line-height: 30px" width="90">
+                    <span v-if="setAdminUserES(advice.checker) == ''">{{
+                      getAdminUser(advice.checker)
+                    }}</span>
+                    <img
+                      style="height: 30px"
+                      :src="setAdminUserES(advice.checker)"
+                      alt=""
+                      srcset=""
+                      v-else
+                    />
+                  </td>
+
+                  <td v-if="advice_index === 0" width="145">透前体重:</td>
+                  <td v-if="advice_index === 0" width="60">
+                    {{
+                      patientInfo.total_dialysis +
+                        patientInfo.user_sys_before_count >
+                      0
+                        ? predialysis.weight_before
+                        : "/"
+                    }}kg
+                  </td>
+                  <td v-if="advice_index === 1" width="145">体重增加量:</td>
+                  <td v-if="advice_index === 1" width="60">
+                    {{
+                      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" width="60">
+                    {{
+                      patientInfo.total_dialysis +
+                        patientInfo.user_sys_before_count >
+                      0
+                        ? predialysis.dry_weight
+                        : "/"
+                    }}kg
+                  </td>
+                  <td v-if="advice_index === 3" width="145">较干体重增加量:</td>
+                  <td v-if="advice_index === 3" width="60">
+                    {{
+                      patientInfo.total_dialysis +
+                        patientInfo.user_sys_before_count >
+                        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" width="60">
+                    {{
+                      patientInfo.total_dialysis +
+                        patientInfo.user_sys_before_count >
+                      0
+                        ? afterdialysis.actual_ultrafiltration
+                        : "/"
+                    }}ml
+                  </td>
+                  <td v-if="advice_index === 5" width="145">透后体重:</td>
+                  <td v-if="advice_index === 5" width="60">
+                    {{
+                      patientInfo.total_dialysis +
+                        patientInfo.user_sys_before_count >
+                      0
+                        ? afterdialysis.weight_after
+                        : "/"
+                    }}kg
+                  </td>
+                  <td v-if="advice_index === 6" width="145">
+                    本次透析体重下降量:
+                  </td>
+                  <td v-if="advice_index === 6" width="60">
+                    {{
+                      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" width="60"></td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+          </div>
+
+         
+        </tbody>
+      </table>
+    </div>
+     
+
+   
+  </div>
   </div>
 </template>
 

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -19,6 +19,7 @@
             {{ orgname }}
           </div>
           <div
+            v-if="org_id!=0 && org_id!=10449 && org_id!=3877 && org_id!=9671"
             class="order-title"
             style="
               letter-spacing: 0;
@@ -29,6 +30,20 @@
           >
             血液净化治疗记录单
           </div>
+
+          <div
+            v-if="org_id ==0 || org_id ==10449 || org_id ==3877 || org_id ==9671"
+            class="order-title"
+            style="
+              letter-spacing: 0;
+              font-weight: 600;
+              font-size: 22px;
+              display: inline-block;
+            "
+          >
+           <span v-if="prescription.mode_id!=13">血液净化治疗记录单</span>
+           <span v-if="prescription.mode_id==13">连续性肾脏替代治疗（CRRT）记录单</span>
+          </div>
         </div>
         <div class="row">
           <div class="inline_block">
@@ -892,10 +907,10 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 ">{{
+                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 ">{{
                           lastafterdialysis.weight_after
                         }}</span>
-                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956">{{
+                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id != 10440">{{
                           predialysis.weight_after_last_transparency
                             ? predialysis.weight_after_last_transparency
                             : "未称重"
@@ -944,8 +959,8 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440">ml</span> 
-                      <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440">L</span>
+                      <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469">ml</span> 
+                      <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469">L</span>
                     </div>
                     <div class="inline_block" style="flex: 1">
                       干体重：
@@ -1052,14 +1067,14 @@
                         }}
                       </div>
                      
-                     <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440">
+                     <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469">
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">iu</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
                     </span>
 
-                    <span v-if="org_id==9675 || org_id==10447 || org_id==9829 || org_id!=10440">
+                    <span v-if="org_id==9675 || org_id==10447 || org_id==9829 || org_id==10440 || org_id==10469">
                       <span v-if="prescription.anticoagulant == 4">iu</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">mg</span>
@@ -1098,7 +1113,7 @@
                             : "0"
                         }}
                       </div>
-                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440">
+                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469">
 
                         <span v-if="prescription.anticoagulant == 5">ml/h</span>
                           <span v-if="prescription.anticoagulant == 4">mg/h</span>
@@ -1106,7 +1121,7 @@
                           <span v-if="prescription.anticoagulant == 2">iu/h</span>
                           <span v-if="prescription.anticoagulant == 1">mg/h</span>
                       </span>
-                      <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440">
+                      <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469">
                         <span v-if="prescription.anticoagulant == 2">mg/h</span>
                           <span v-if="prescription.anticoagulant == 3">iu/h</span>
                           <span v-if="prescription.anticoagulant == 4">ml</span>
@@ -1171,13 +1186,13 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440">
+                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469">
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">iu</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
                      </span>
-                    <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440">
+                    <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469">
                        <span v-if="prescription.anticoagulant == 2">mg</span>
                        <span v-if="prescription.anticoagulant == 3">iu</span>
                        <span v-if="prescription.anticoagulant == 4">ml</span>
@@ -1207,6 +1222,99 @@
                       </div>
                     </div>
                   </div>
+
+
+                  <div class="row" style="padding: 2px 0; line-height: 23px" v-if="org_id ==0 || org_id == 3877 || org_id ==10449 || org_id == 9671">
+                    <div
+                      class="inline_block"
+                      style="margin-left: 20px"
+                      v-if="prescription.anticoagulant != 5"
+                    >
+                      置换速度：
+                      <div
+                        class="under_line"
+                        style="width: 50px; text-align: center"
+                      >
+                        {{
+                          prescription.displace_speed
+                            ? prescription.displace_speed
+                            : ""
+                        }}
+                      </div>
+                      <span>ml/h</span>
+                   
+                  
+                    </div>
+                    <div
+                      class="inline_block"
+                      style="margin-left: 20px"
+                      v-if="prescription.anticoagulant != 5"
+                    >
+                    透析液流速：
+                      <div
+                        class="under_line"
+                        style="width: 50px; text-align: center"
+                      >
+                        {{
+                          prescription.dialysis_fluid_flow
+                            ? prescription.dialysis_fluid_flow
+                            : ""
+                        }}
+                      </div>
+                      <span>ml/h</span>
+                   
+                  
+                    </div>
+                    <div class="inline_block" style="margin-left: 20px">
+                      碳酸氢钠流速：
+                      <div
+                        class="under_line"
+                        style="width: 50px; text-align: center"
+                      >
+                        {{
+                          prescription.sodium_bicarbonate_flow
+                            ? prescription.sodium_bicarbonate_flow
+                            : ""
+                        }}
+                      </div>
+                     
+                     
+                    </div>
+                    <span>ml/h</span>
+                   
+              
+                  
+                  </div>
+
+                   <div class="row" style="padding: 2px 0; line-height: 23px" v-if="org_id ==10469 || org_id == 9671">
+                    <div
+                      class="inline_block"
+                      style="margin-left: 20px"
+                    >
+                      透析机型号：
+                      <div
+                        class="under_line"
+                        style="width: 50px; text-align: center"
+                      >
+                       {{predialysis.machine_type ? predialysis.machine_type : ""}}
+                      </div>
+                    
+                    </div>
+                    <div
+                      class="inline_block"
+                      style="margin-left: 20px"
+                    >
+                    跌倒风险评估评分：
+                      <div
+                        class="under_line"
+                        style="width: 50px; text-align: center"
+                      >
+                        {{ receiverTreatmentAccess.score }}
+                      </div>
+                    </div>
+                  </div>
+
+
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
@@ -1288,7 +1396,8 @@
                         <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671">透析液温度(°C)</td>
                         <td width="50" v-if="org_id != 10121">电导度<br />(ms/cm)</td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
-                        <td width="50">超滤量<br />(ml)</td>
+                        <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 0">超滤量<br />(ml)</td>
+                        <td width="50" v-if="org_id ==3877 || org_id == 10449 || org_id ==0">累计超滤量<br />(ml)</td>
                         <td
                           v-if="
                             prescription.mode_id == 2 ||
@@ -1299,6 +1408,7 @@
                         >
                           置换量<br />(ml)
                         </td>
+                        <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">滤前压(mmHg)</td>
                         <td width="50" v-if="org_id == 9538">KT/V</td>
                         <td width="50" v-if="org_id == 9919">在线尿素监测</td>  
                         <td width="50" v-if="org_id == 9671">在线尿素监测</td>  
@@ -1383,7 +1493,8 @@
                       
 
                         <td>
-                          {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}
+                          <span v-if="org_id!=9671 && org_id!=10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
+                          <span v-if="org_id==9671 || org_id==10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
                         </td>
                         <!-- <td style="width:50px">
                           <span v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && (dialysisOrder && monitor.operate_time >= dialysisOrder.start_time))">
@@ -1409,6 +1520,7 @@
                             }}
                           </span>
                         </td>
+                        <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">{{ monitor.filter_pressure?monitor.filter_pressure:""}}</td>
                         <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671">
                           {{ monitor.ktv }}
                         </td>
@@ -1675,7 +1787,12 @@
                 display: inline-block;
               "
             >
-              血液净化治疗记录单
+             <span v-if="org_id!=3877 && org_id!=0 && org_id!=10449">血液净化治疗记录单</span>
+             <span v-if="org_id == 3877 || org_id == 0 || org_id == 10449">
+              <span v-if="prescription.mode_id!=13">血液净化治疗记录单</span>
+              <span v-if="prescription.mode_id==13">连续性肾脏替代治疗（CRRT）记录单</span>
+             </span>
+            
             </div>
           </div>
           <div class="row">
@@ -2450,6 +2567,53 @@
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
+                   <div v-if="org_id == 0 || org_id == 10440">
+                    
+                  
+
+                    <div class="inline_block" style="flex: 1">
+                      上机护士：
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+                  
+                  
+                  </div>
+                  <div v-if="org_id!=0 && org_id!=10440">
                     <div class="inline_block" style="flex: 1">
                       穿刺护士：
                       <div
@@ -2489,6 +2653,58 @@
                         />
                       </div>
                     </div>
+                  </div>
+                   
+                  <div v-if="org_id==0||org_id==10440">
+                    
+                    <div class="inline_block" style="flex: 1">                 
+                     <div>
+                      <span>责任护士：</span> 
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                       
+                      >
+                    
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+
+                    </div>
+
+                  </div>
+
+                  <div v-if="org_id!=0&&org_id!=10440">
                     <div class="inline_block" style="flex: 1">
                       <span v-if="org_id==10414">责任护士：</span> 
                       <span v-else>治疗护士：</span> 
@@ -2530,6 +2746,10 @@
                         />
                       </div>
                     </div>
+                  </div>
+                  
+
+
                     <div class="inline_block" style="flex: 1">
                       <span v-if="org_id==10387" >核对护士：</span> 
                       <span v-else >核对人员：</span> 
@@ -2642,7 +2862,7 @@
                       </div>
                     </div>
                     <div class="inline_block" style="flex: 1">
-                      下机护士：
+                       下机护士：
                       <div
                         class="under_line"
                         style="width: 80px; text-align: center"
@@ -3479,7 +3699,7 @@ export default {
         for (let index = 0; index < this.doctor_advices.length; index++) {
           this.doctor_advices[index]["isShow"] = 2;
         }
-
+       console.log("total--------------------------",this.doctor_advices)
         // if (this.doctor_advices.length > 0) {
         //   var group = this.newAdviceGroupObject()
         //   var initGroupBlock = function(group, advice) {
@@ -3575,6 +3795,7 @@ export default {
         }
 
         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 = [];

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue

@@ -201,13 +201,9 @@
             </td>
           </tr>
           <tr>
-            <td style="text-align: left" colspan="1">
-              <span style="display: inline-block; margin-left: 15px">
-                透前体重:{{
-                  predialysis.weight_before ? predialysis.weight_before : "/"
-                }}kg
-              </span>
-            </td>
+            <!-- <td style="text-align: left" colspan="1">
+             
+            </td> -->
             <td style="text-align: left" colspan="1">
               <span style="display: inline-block; margin-left: 15px">
                 设定脱水量:{{
@@ -225,7 +221,7 @@
                 ></label-box>
               </span>
             </td>
-            <td style="text-align: left" colspan="2">
+            <td style="text-align: left" colspan="3">
               <span style="display: inline-block; margin-left: 15px">
                 <span v-if="prescription.anticoagulant == 2">普通肝素首剂:</span>
                 <span v-if="prescription.anticoagulant == 3"
@@ -294,7 +290,7 @@
               <span v-if="prescription.anticoagulant == 2">mg/h</span>
               <span v-if="prescription.anticoagulant == 1">mg/h</span>
             </td>
-            <td style="text-align: left" colspan="2">
+            <td style="text-align: left" colspan="1">
               <span style="display: inline-block; ">
                 总量:
                 {{
@@ -315,6 +311,52 @@
               <span v-if="prescription.anticoagulant == 1">mg</span>
             </td>
           </tr>
+          <tr>
+            <td style="text-align: left" colspan="1">
+               <span style="display: inline-block; margin-left: 15px">
+                透前体重:{{
+                  predialysis.weight_before ? predialysis.weight_before : "/"
+                }}kg
+              </span>
+            </td>
+            <td style="text-align: left" colspan="1">
+              <span style="display: inline-block; margin-left: 15px">
+                透析器型号:
+                <span v-if="prescription.dialysis_dialyszers!=''">{{
+                  prescription.dialysis_dialyszers
+                    ? prescription.dialysis_dialyszers
+                    : "/"
+                }}
+                </span>
+              </span>
+            </td> 
+            <td style="text-align: left" colspan="2">
+              <span style="display: inline-block; margin-left: 15px">
+                灌流器型号:
+                <span v-if="prescription.dialysis_irrigation!=''">
+                 &nbsp;&nbsp;{{
+                  prescription.dialysis_irrigation
+                    ? prescription.dialysis_irrigation
+                    : "/"
+                }}
+               </span>
+              </span>
+            </td> 
+
+            <td style="text-align: left" colspan="2">
+              <span style="display: inline-block; margin-left: 15px">
+                滤过器型号:
+                <span v-if="prescription.dialysis_strainer!=''">
+                &nbsp;&nbsp;{{
+                    prescription.dialysis_strainer
+                      ? prescription.dialysis_strainer
+                      : "/"
+                  }}
+               </span>
+              </span>
+            </td> 
+           
+          </tr>
           <tr>
             <td style="text-align: left" colspan="1">
               <span style="display: inline-block; margin-left: 15px">
@@ -352,45 +394,35 @@
                 }}分钟
               </span>
             </td>
-            <td style="text-align: left" colspan="1">
-              <span style="display: inline-block; margin-left: 15px">
-                透析/灌流器型号:{{
-                  prescription.dialysis_dialyszers
-                    ? prescription.dialysis_dialyszers
-                    : "/"
-                }}&nbsp;&nbsp;{{
-                  prescription.dialysis_irrigation
-                    ? prescription.dialysis_irrigation
-                    : "/"
-                }}
-              </span>
-            </td>
-            <td style="text-align: left" colspan="2">
+         
+            <td style="text-align: left" colspan="3">
               <span style="display: inline-block; margin-left: 15px">
                 置换方式:
                 <label-box
                   :isChecked="
-                    prescription.displace_liqui_part == 1 ? true : false
+                    prescription.displace_liqui_part == 1 && prescription.mode_id != 2 && prescription.mode_id != 5 && prescription.mode_id != 12? true : false
                   "
                   showValue="前"
                 ></label-box
                 >&nbsp;
                 <label-box
                   :isChecked="
-                    prescription.displace_liqui_part == 2 ? true : false
+                    prescription.displace_liqui_part == 2 && prescription.mode_id != 2 && prescription.mode_id != 5 && prescription.mode_id != 12? true : false
                   "
                   showValue="后"
                 ></label-box>
-                &nbsp; (总量：{{
+                &nbsp; (总量：
+                <span v-if="prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12">{{
                   prescription.displace_liqui_value
                     ? prescription.displace_liqui_value
                     : "/"
                 }}L)
+                </span>
               </span>
             </td>
           </tr>
           <tr>
-            <!-- <td style="text-align: left" colspan="1">
+            <td style="text-align: left" colspan="1">
               <span style="display: inline-block; margin-left: 15px">
                 责任护士:
                 <span
@@ -401,7 +433,7 @@
                   <img style="height:30px;" :src="setAdminUserES(dialysisOrder.quality_nurse_id)" alt srcset />
                 </span>
               </span>
-            </td> -->
+            </td>
             <td style="text-align: left" colspan="1">
               <span style="display: inline-block; margin-left: 15px">
                 <span
@@ -431,22 +463,25 @@
                 </span>
               </span>
 
-              <span style="display: inline-block; margin-left: 15px">
-                核对护士：<span
-                  style="height: 30px; display: inline-block"
-                  v-if="setAdminUserES(check == null ? 0 : check.creater) == ''"
-                >
-                  {{ getAdminUser(check == null ? 0 : check.creater) }}
-                </span>
-                <img
-                  style="height: 30px"
-                  :src="setAdminUserES(check == null ? 0 : check.creater)"
-                  alt=""
-                  srcset=""
-                  v-else
-                />
-              </span>
+             
             </td>
+            <td style="text-align: left" colspan="1">
+                <span style="display: inline-block; margin-left: 15px">
+                  核对护士：<span
+                    style="height: 30px; display: inline-block"
+                    v-if="setAdminUserES(check == null ? 0 : check.creater) == ''"
+                  >
+                    {{ getAdminUser(check == null ? 0 : check.creater) }}
+                  </span>
+                  <img
+                    style="height: 30px"
+                    :src="setAdminUserES(check == null ? 0 : check.creater)"
+                    alt=""
+                    srcset=""
+                    v-else
+                  />
+                </span>
+              </td>
             <td style="text-align: left" colspan="3">
               <span style="display: inline-block; margin-left: 15px">
                 <span
@@ -957,10 +992,10 @@
               超滤率
               <br />ml/h
             </td>
-            <td style="min-width: 60px">
+            <!-- <td style="min-width: 60px">
               超滤量
               <br />ml
-            </td>
+            </td> -->
             <td style="min-width: 60px">
               电导度
               <br />
@@ -993,7 +1028,7 @@
             </td>
             <td>{{ monitor.transmembrane_pressure }}</td>
             <td>{{ monitor.ultrafiltration_rate }}</td>
-            <td>{{ monitor.ultrafiltration_volume }}</td>
+            <!-- <td>{{ monitor.ultrafiltration_volume }}</td> -->
             <td>{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
             <td>
               <span style="line-height: 18px; display: block">
@@ -1241,9 +1276,9 @@
                 &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.single_dose != 0"> 
+               <span v-if="advice.single_dose >0">单次用量 </span>  
+                {{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
               <span v-if="advice.parent_id == 0">{{
                 advice.delivery_way
               }}</span>

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -1856,20 +1856,42 @@ export default {
       }
       return "";
     },
+    // getAge: function(val) {
+    //   if (
+    //     this.org_template_info.template_id == 2 ||
+    //     this.org_template_info.template_id == 0
+    //   ) {
+    //     if (val.age == 0) {
+    //       return jsGetAge(val.birth, "-");
+    //     } else {
+    //       return val.age;
+    //     }
+    //   } else {
+    //     return jsGetAge(val.birth, "-");
+    //   }
+    // },
     getAge: function(val) {
-      if (
-        this.org_template_info.template_id == 2 ||
-        this.org_template_info.template_id == 0
-      ) {
-        if (val.age == 0) {
-          return jsGetAge(val.birth, "-");
-        } else {
-          return val.age;
-        }
-      } else {
-        return jsGetAge(val.birth, "-");
-      }
-    },
+     
+     if (val.id_card_no) {
+       var thisLen = val.id_card_no.length
+
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + val.id_card_no.substr(6, 6)
+       } else {
+         birth = val.id_card_no.substr(6, 8)
+       }
+       var birthtwo =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+
+       var age = jsGetAge(birthtwo, '-')
+       return age
+     }
+   },
     newAdviceGroupObject: function() {
       return Object.assign(
         {},

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -536,10 +536,14 @@
                     <tr>
                       <td width="90" style="border:none;padding-left:5px">透析器凝血:</td>
                       <td width="220" style="text-align:left;border:none;">
-                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器0') > -1 ? true : false) :false" showValue="0"></label-box>
+                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor == '透析器0' ? true : false) :false" showValue="0"></label-box>
+                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor == '透析器+' ? true : false) :false" showValue="+"></label-box>
+                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor == '透析器++' ? true : false) :false" showValue="+ +"></label-box>
+                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor == '透析器+++' ? true : false) :false" showValue="+ + +"></label-box>
+                        <!-- <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器0') > -1 ? true : false) :false" showValue="0"></label-box>
                         <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器+') > -1 ? true : false) :false" showValue="+"></label-box>
-                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器++') > -1 ? true : false) :false" showValue="+ +"></label-box>
-                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器+++') > -1 ? true : false) :false" showValue="+ + +"></label-box>
+                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器++')> -1 ? true : false) :false" showValue="+ +"></label-box>
+                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器+++')> -1 ? true : false) :false" showValue="+ + +"></label-box> -->
                       </td>
                       <td width="90" style="border:none;padding-left:5px">静脉管道:</td>
                       <td width="220" style="text-align:left;border:none;">

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFive.vue

@@ -1806,11 +1806,33 @@ export default {
         }
         return ''
       },
+      // getAge: function(val) {
+      //   if (val.birthday != 0) {
+      //     return jsGetAge(val.birth, '-')
+      //   }
+      //   return ''
+      // },
       getAge: function(val) {
-        if (val.birthday != 0) {
-          return jsGetAge(val.birth, '-')
+     
+      if (val.id_card_no) {
+        var thisLen = val.id_card_no.length
+
+        var birth = ''
+        if (thisLen == 15) {
+          birth = '19' + val.id_card_no.substr(6, 6)
+        } else {
+          birth = val.id_card_no.substr(6, 8)
         }
-        return ''
+        var birthtwo =
+          birth.substr(0, 4) +
+          '-' +
+          birth.substr(4, 2) +
+          '-' +
+          birth.substr(6, 2)
+
+        var age = jsGetAge(birthtwo, '-')
+        return age
+       }
       },
       newAdviceGroupObject: function() {
         return Object.assign(

src/xt_pages/hospitalStation/summary.vue

@@ -215,6 +215,32 @@
             >
               上传结算清单
             </el-button>
+            <el-button
+              size="mini"
+              type="primary"
+              @click="confirmUploadInfo(scope.row)"
+              v-if="$store.getters.xt_user.org_id == 10265"
+            >
+              确认结算清单
+            </el-button>
+            <el-button
+              size="mini"
+              type="primary"
+              @click="cancelUploadTwo(scope.row)"
+              v-if="$store.getters.xt_user.org_id == 10265"
+            >
+              取消结算清单
+            </el-button>
+
+            <el-button
+              size="mini"
+              type="primary"
+              @click="queryData(scope.row)"
+              v-if="$store.getters.xt_user.org_id == 10265"
+            >
+              查询结算清单
+            </el-button>
+
             <el-button
               size="mini"
               type="primary"
@@ -452,6 +478,121 @@ export default {
   },
 
   methods: {
+    confirmUploadInfo(row){
+      var that = this;
+      axios
+        .get("http://127.0.0.1:9532/api/4102", {
+          params: {
+            order_id: row.id,
+            admin_user_id: this.$store.getters.xt_user.user.id,
+            stas_type: 1
+          },
+        })
+        .then(function (response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.msg);
+            return false;
+          } else {
+            if (response.data.data.failed_code == -10) {
+              that
+                .$confirm(response.data.data.msg, "医保错误信息", {
+                  confirmButtonText: "确 定",
+                  type: "warning",
+                })
+                .then(() => {
+                })
+                .catch(() => {
+                });
+            } else {
+              that.$message.success("确认成功");
+              row.result.id = response.data.data.result.id;
+            }
+          }
+        })
+        .catch(function (error) {
+        });
+
+
+    },
+    cancelUploadTwo(row){
+      if(this.$store.getters.xt_user.org_id == 10265){
+        var that = this;
+        axios
+          .get("http://127.0.0.1:9532/api/4102", {
+            params: {
+              order_id: row.id,
+              admin_user_id: this.$store.getters.xt_user.user.id,
+              stas_type: 0
+            },
+          })
+          .then(function (response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg);
+              return false;
+            } else {
+              if (response.data.data.failed_code == -10) {
+                // that.$message.error(response.data.data.msg)
+                that
+                  .$confirm(response.data.data.msg, "医保错误信息", {
+                    confirmButtonText: "确 定",
+                    type: "warning",
+                  })
+                  .then(() => {
+                  })
+                  .catch(() => {
+                  });
+              } else {
+                that.$message.success("撤销成功");
+                row.result.id = 0;
+              }
+            }
+          })
+          .catch(function (error) {
+          });
+      }
+    },
+    queryData(row){
+      var that = this;
+      axios
+        .get("http://127.0.0.1:9532/api/4103", {
+          params: {
+            order_id: row.id,
+            admin_user_id: this.$store.getters.xt_user.user.id,
+          },
+        })
+        .then(function (response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.msg);
+            return false;
+          } else {
+            if (response.data.data.failed_code == -10) {
+              that
+                .$confirm(response.data.data.msg, "医保错误信息", {
+                  confirmButtonText: "确 定",
+                  type: "warning",
+                })
+                .then(() => {
+                })
+                .catch(() => {
+                });
+            } else {
+              that
+                .$confirm(response.data.data.msg, "医保信息", {
+                  confirmButtonText: "确 定",
+                })
+                .then(() => {
+                })
+                .catch(() => {
+                });
+            }
+          }
+        })
+        .catch(function (error) {
+        });
+
+
+    },
+
     setStorage() {
       this.$store.commit("SET_PAGEDATA", {
         page: this.page,
@@ -1123,7 +1264,7 @@ export default {
         setl_time: obj.setl_time,
       };
       this.invoiceParams = paramsObj;
-      
+
       const loading = this.$loading({
           lock: true,
           text: '正在加载中...',

src/xt_pages/index.html

@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta name="renderer" content="webkit" />
+    <!--<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">-->
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
+    />
+    <title>酷医云-透析管理平台</title>
+    <!-- <link
+      rel="stylesheet"
+      href="//at.alicdn.com/t/font_1480998_l66fq6mc0y.css"
+    /> -->
+
+  </head>
+
+  <body>
+    <script src="https://images.shengws.com/reconnecting-websocket.min.js"></script>
+    <script src="https://images.shengws.com/jquery.min.js"></script>
+    <script src="<%= htmlWebpackPlugin.options.path %>/tinymce4.7.5/tinymce.min.js"></script>
+    <script src="<%= htmlWebpackPlugin.options.path %>/neditor/neditor.config.js"></script>
+    <script src="<%= htmlWebpackPlugin.options.path %>/neditor/neditor.all.min.js"></script>
+    <script src="<%= htmlWebpackPlugin.options.path %>/neditor/neditor.service.js"></script>
+    <script src="<%= htmlWebpackPlugin.options.path %>/neditor/i18n/zh-cn/zh-cn.js"></script>
+    <script src="<%= htmlWebpackPlugin.options.path %>/neditor/neditor.parse.min.js"></script>
+
+    <div id="app"></div>
+    <!-- built files will be auto injected -->
+    <link
+      rel="stylesheet"
+      href="//at.alicdn.com/t/font_795029_9ftx46rzd47.css"
+    />
+
+  </body>
+</html>

src/xt_pages/management/components/QualityForm.vue

@@ -2907,7 +2907,7 @@ export default {
             }
           }
           this.tableFour = devicePh
-          console.log("deviceph",devicePh)
+        
          
 
         }
@@ -2966,6 +2966,7 @@ export default {
       }
     },
     changeTable(val) {
+      
       if (val === 1) {
         this.showOne = false;
         this.showTwo = false;
@@ -3649,10 +3650,11 @@ export default {
               dialyste[index].sampling_locationb = "反渗水末端取样口";
             }
           }
+
           this.table = dialyste;
 
           var ions = response.data.data.ions;
-          console.log("ions",ions)
+         
           this.tableDatas = ions;
           var oxygenates =  response.data.data.oxygenates
           for (let index = 0; index < oxygenates.length; index++) {

src/xt_pages/management/home.vue

@@ -1772,6 +1772,11 @@
 
 
 
+                           
+                            <el-divider></el-divider>
+                         </div>     
+                             
+                        
                             <span style="margin-bottom: 20px;display: block;">有毒化合物检测</span>
                             <el-form ref="qualityFormFour" :model="qualityFormFour" :rules="diaRules">
                               <el-row>
@@ -1895,10 +1900,6 @@
                               </el-row>
                             </el-form>
                             <el-divider></el-divider>
-                         </div>     
-                             
-
-                             
 
 
 
@@ -2031,127 +2032,127 @@
 
 
                                <span style="margin-bottom: 20px;display: block;">水游离氯检测</span>
-                            <el-form ref="qualityFormSix" :model="qualityFormSix" :rules="diaRules">
-                              <el-row>
+                              <el-form ref="qualityFormSix" :model="qualityFormSix" :rules="diaRules">
+                                <el-row>
+                                    <el-col :span="8">
+                                      <el-form-item label="取样日期:">
+                                          <el-date-picker
+                                            v-model="qualityFormSix.sampling_date"
+                                            prefix-icon="none"
+                                            type="date"
+                                            placeholder="请选择"
+                                            format="yyyy-MM-dd"
+                                            value-format="yyyy-MM-dd"
+                                            style="width:150px">
+                                          </el-date-picker>
+                                      </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="取样标本:">
+                                            <el-select style="width:150px"  v-model="qualityFormSix.specimenb" @change="changeSpecimen">
+                                              <el-option v-for="item in samplingSpecimen" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                                            </el-select>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                      <el-form-item label="A浓缩液批号:">
+                                        <el-input style="width:150px" v-model="qualityFormSix.concentrate_noc" :disabled="disable"></el-input>
+                                      </el-form-item>
+                                    </el-col>
+
+                                </el-row>
+                                <el-row>
                                   <el-col :span="8">
-                                     <el-form-item label="取样日期:">
-                                        <el-date-picker
-                                          v-model="qualityFormSix.sampling_date"
-                                          prefix-icon="none"
-                                          type="date"
-                                          placeholder="请选择"
-                                          format="yyyy-MM-dd"
-                                          value-format="yyyy-MM-dd"
-                                          style="width:150px">
-                                        </el-date-picker>
-                                     </el-form-item>
+                                        <el-form-item label="B浓缩液批号:">
+                                            <el-input style="width:150px" v-model ="qualityFormSix.concentrateb_nod" :disabled="diableTwo"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                    <el-form-item label="采样部位:">
+                                      <el-select style="width:150px"  v-model="qualityFormSix.sampling_locationb">
+                                        <el-option v-for="item in samplingLocation" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                                      </el-select>
+                                    </el-form-item>
                                   </el-col>
                                   <el-col :span="8">
-                                       <el-form-item label="取样标本:">
-                                          <el-select style="width:150px"  v-model="qualityFormSix.specimenb" @change="changeSpecimen">
-                                             <el-option v-for="item in samplingSpecimen" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                                          </el-select>
-                                       </el-form-item>
+                                    <el-form-item label="检测单位:" required prop="detection_unit">
+                                        <el-input style="width:150px" v-model ="qualityFormSix.detection_unit"></el-input>
+                                    </el-form-item>
                                   </el-col>
+                                </el-row>
+                                <el-row>
                                   <el-col :span="8">
-                                     <el-form-item label="A浓缩液批号:">
-                                       <el-input style="width:150px" v-model="qualityFormSix.concentrate_noc" :disabled="disable"></el-input>
-                                     </el-form-item>
-                                  </el-col>
-
-                              </el-row>
-                              <el-row>
-                                 <el-col :span="8">
-                                      <el-form-item label="B浓缩液批号:">
-                                          <el-input style="width:150px" v-model ="qualityFormSix.concentrateb_nod" :disabled="diableTwo"></el-input>
-                                      </el-form-item>
+                                    <el-form-item label="取样者:" required prop="samplerb">
+                                        <el-select style="width:150px"  v-model="qualityFormSix.samplerb">
+                                          <el-option v-for="item in sampling" :key="item.addmin_user_id" :label="item.user_name" :value="item.admin_user_id"></el-option>
+                                        </el-select>
+                                    </el-form-item>
                                   </el-col>
-                                   <el-col :span="8">
-                                  <el-form-item label="采样部位:">
-                                    <el-select style="width:150px"  v-model="qualityFormSix.sampling_locationb">
-                                       <el-option v-for="item in samplingLocation" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                                    </el-select>
-                                   </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                   <el-form-item label="检测单位:" required prop="detection_unit">
-                                      <el-input style="width:150px" v-model ="qualityFormSix.detection_unit"></el-input>
-                                   </el-form-item>
-                                </el-col>
-                              </el-row>
-                              <el-row>
-                                <el-col :span="8">
-                                   <el-form-item label="取样者:" required prop="samplerb">
-                                      <el-select style="width:150px"  v-model="qualityFormSix.samplerb">
-                                        <el-option v-for="item in sampling" :key="item.addmin_user_id" :label="item.user_name" :value="item.admin_user_id"></el-option>
-                                      </el-select>
-                                   </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                  <el-form-item label="出报告日期:" required prop="reporting_dateb">
-                                     <el-date-picker
-                                       v-model="qualityFormSix.reporting_dateb"
-                                       prefix-icon="none"
-                                       type="date"
-                                       placeholder="请选择"
-                                       format="yyyy-MM-dd"
-                                       value-format="yyyy-MM-dd"
-                                       style="width:150px">
-                                    </el-date-picker>
-                                  </el-form-item>
-                                </el-col>
-                               
-                                <el-col :span="8">
-                                  <el-form-item label="顺序号:" required prop="sort">
-                                     <el-input style="width:150px" v-model="qualityFormSix.sort" ></el-input>
-                                  </el-form-item>
-                                </el-col>
-                              </el-row>
-                              <el-row>
                                   <el-col :span="8">
-                                      <el-form-item label="检测合格:" required prop="pass_examination">
-                                        <el-radio v-model="qualityFormSix.pass_examination" label="1">是</el-radio>
-                                        <el-radio v-model="qualityFormSix.pass_examination" label="2">否</el-radio>
-                                      </el-form-item>
+                                    <el-form-item label="出报告日期:" required prop="reporting_dateb">
+                                      <el-date-picker
+                                        v-model="qualityFormSix.reporting_dateb"
+                                        prefix-icon="none"
+                                        type="date"
+                                        placeholder="请选择"
+                                        format="yyyy-MM-dd"
+                                        value-format="yyyy-MM-dd"
+                                        style="width:150px">
+                                      </el-date-picker>
+                                    </el-form-item>
                                   </el-col>
+                                
                                   <el-col :span="8">
-                                      <el-form-item label="修改标志:" required prop="modifications">
-                                        <el-select style="width:150px"  v-model="qualityFormSix.modifications">
-                                          <el-option v-for="item in modifications" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                                        </el-select>
-                                      </el-form-item>
+                                    <el-form-item label="顺序号:" required prop="sort">
+                                      <el-input style="width:150px" v-model="qualityFormSix.sort" ></el-input>
+                                    </el-form-item>
                                   </el-col>
-                             </el-row>
-                              <el-row>
-                                <el-col :span="24">
-                                 <el-form-item label="检测结果:(EU/ml)" label-width="100px">
-                                     <el-input
-                                        type="textarea"
-                                        :rows="2"
-                                         placeholder="请输入内容"
-                                         style="width:600px"
-                                         v-model="qualityFormSix.detection_resultb"
-                                         >
-                                      </el-input>
-                                  </el-form-item>
-                                </el-col>
+                                </el-row>
+                                <el-row>
+                                    <el-col :span="8">
+                                        <el-form-item label="检测合格:" required prop="pass_examination">
+                                          <el-radio v-model="qualityFormSix.pass_examination" label="1">是</el-radio>
+                                          <el-radio v-model="qualityFormSix.pass_examination" label="2">否</el-radio>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="修改标志:" required prop="modifications">
+                                          <el-select style="width:150px"  v-model="qualityFormSix.modifications">
+                                            <el-option v-for="item in modifications" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                                          </el-select>
+                                        </el-form-item>
+                                    </el-col>
                               </el-row>
-                              <!-- <el-row>
+                                <el-row>
                                   <el-col :span="24">
-                                    <span style="color:#FF9900">注:水游离氯检测应至少每3个月1次,每台透析机每年至少检测一次</span>
-                                   </el-col>
-                              </el-row> -->
-                              <el-row>
-                                <div class="clearn">
-                                  <el-col :span="4">
-                                    <el-button @click="cleanLincomycin">取消</el-button>
-                                  </el-col>
-                                   <el-col :span="4">
-                                    <el-button type="primary" @click="saveWater('qualityFormSix')">保存</el-button>
+                                  <el-form-item label="检测结果:(EU/ml)" label-width="100px">
+                                      <el-input
+                                          type="textarea"
+                                          :rows="2"
+                                          placeholder="请输入内容"
+                                          style="width:600px"
+                                          v-model="qualityFormSix.detection_resultb"
+                                          >
+                                        </el-input>
+                                    </el-form-item>
                                   </el-col>
-                                </div>
-                              </el-row>
-                            </el-form>
+                                </el-row>
+                                <!-- <el-row>
+                                    <el-col :span="24">
+                                      <span style="color:#FF9900">注:水游离氯检测应至少每3个月1次,每台透析机每年至少检测一次</span>
+                                    </el-col>
+                                </el-row> -->
+                                <el-row>
+                                  <div class="clearn">
+                                    <el-col :span="4">
+                                      <el-button @click="cleanLincomycin">取消</el-button>
+                                    </el-col>
+                                    <el-col :span="4">
+                                      <el-button type="primary" @click="saveWater('qualityFormSix')">保存</el-button>
+                                    </el-col>
+                                  </div>
+                                </el-row>
+                              </el-form>
                             <el-divider></el-divider>
 
                            
@@ -3355,7 +3356,8 @@ export default {
         this.tabIndex = index
       },
       handleCurrentChange(val) {
-        console.log("Val222222222",val)
+        console.log("val-------------------------",val)
+        // 通过设备型号区分质量控制
         this.device_type = val.device_type
         this.unitType = val.unit_type
         this.currentRow = val

src/xt_pages/management/index.vue

@@ -126,7 +126,7 @@
           <template slot-scope="scope">{{ scope.row.machine_status }}</template>
         </el-table-column>
 
-        <el-table-column label="使用次数" align="center">
+        <el-table-column label="使用次数" align="center" v-if="org_id!=0&&org_id!=10440">
           <template slot-scope="scope">{{getTotal(scope.row.bed_id,scope.row.user_total) }}</template>
         </el-table-column>
 
@@ -214,6 +214,7 @@ export default {
       },
       total: 0,
       count:[],
+      org_id:0,
     };
   },
   methods: {
@@ -403,6 +404,7 @@ export default {
     this.getAllSubregion();
     this.getAllMachineInfo();
     this.getUserMachTotalCount()
+    this.org_id = this.$store.getters.xt_user.template_info.org_id
   }
 };
 </script>

src/xt_pages/outpatientCharges/summary.vue

@@ -110,7 +110,7 @@
           >
           <el-button v-if="$store.getters.xt_user.org_id == 10106 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten">报表下载2</el-button>
           <el-button v-if="$store.getters.xt_user.org_id == 10318 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten_two">报表下载3</el-button>
-          <el-button  size="small" type="primary" @click="export_detail_ten_three">报表下载4</el-button>
+<!--          <el-button  size="small" type="primary" @click="export_detail_ten_three">报表下载4</el-button>-->
 
 
           <!--          <el-button size="small" type="primary" @click="export_detail_two"-->
@@ -118,7 +118,7 @@
           <!--          </el-button-->
           <!--          >-->
 
-                              <el-button size="small" type="primary" @click="export_detail_three">报表下载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>-->
@@ -529,7 +529,8 @@ export default {
           return "普通住院";
           break;
       }
-    },cancelUploadTwo(row){
+    },
+    cancelUploadTwo(row){
       if(this.$store.getters.xt_user.org_id == 10265){
         var that = this;
         axios
@@ -634,7 +635,8 @@ export default {
           })
           .catch(function (error) {
           });
-    },queryData(row){
+    },
+    queryData(row){
       var that = this;
       axios
         .get("http://127.0.0.1:9532/api/4103", {
@@ -1010,7 +1012,87 @@ export default {
           });
         }
       });
+    },getItemTypeName(order_infos,id,type){
+      console.log(type )
+
+      var  name = ""
+      for(let i = 0; i < order_infos.length;i++){
+        if(type == 1){
+          if(order_infos[i].advice_id == id){
+
+            name =   this.getItemName(order_infos[i].med_chrgitm_type)
+          }
+        }else{
+          if(order_infos[i].project_id == id){
+
+            name =   this.getItemName(order_infos[i].med_chrgitm_type)
+          }
+        }
+
+      }
+      return name
+    },       getItemName(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_three() {
       let params = {};
       getHisDataThree(params).then((response) => {
@@ -1028,12 +1110,13 @@ export default {
                 name: order.patient.name,
                 id_card_no: order.patient.id_card_no,
                 year: "2023",
-                month: "1",
+                month: "2",
                 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_type_name:this.getItemTypeName(order.order_info, data[b].id,data[b].type)
 
               }
               if (order.insutype == "310") {
@@ -1055,7 +1138,9 @@ export default {
                 "医保类型": list[i].insutype,
                 "年": list[i].year,
                 "月": list[i].month,
+
                 "药品编码": list[i].code,
+                "费用类型": list[i].item_type_name,
                 "名称": list[i].item_name,
                 "单位": list[i].unit,
                 "数量": list[i].count,
@@ -1073,6 +1158,7 @@ export default {
               "年",
               "月",
               "药品编码",
+              "费用类型",
               "名称",
               "单位",
               "数量",
@@ -1086,6 +1172,7 @@ export default {
               "年",
               "月",
               "药品编码",
+              "费用类型",
               "名称",
               "单位",
               "数量",
@@ -2298,47 +2385,40 @@ export default {
 
             } else if (order.his_patient.insuplc_admdvs == "440704"){
 
-              insuplc_admdvs_name = "蓬江区"
+              insuplc_admdvs_name = "江海区"
 
 
             } else if (order.his_patient.insuplc_admdvs == "440705"){
 
-              insuplc_admdvs_name = "蓬江区"
+              insuplc_admdvs_name = "新会区"
 
 
             }else if (order.his_patient.insuplc_admdvs == "440781"){
 
-              insuplc_admdvs_name = "蓬江区"
-
+              insuplc_admdvs_name = "台山市"
 
             }else if (order.his_patient.insuplc_admdvs == "440783"){
-
-              insuplc_admdvs_name = "蓬江区"
-
+              insuplc_admdvs_name = "开平市"
 
             }else if (order.his_patient.insuplc_admdvs == "440784"){
-
-
+              insuplc_admdvs_name = "鹤山市"
 
             }else if (order.his_patient.insuplc_admdvs == "440785"){
-
-
+              insuplc_admdvs_name = "恩平市"
 
             }else if (order.his_patient.insuplc_admdvs == "440799"){
-
-
-
+              insuplc_admdvs_name = "市直"
             }
 
 
-
             let obj = {
               就诊号: order.mdtrt_id,
               患者姓名: name,
               开处时间: time,
               险种类型: insutypeName,
               参保所属医保区划: order.his_patient.insuplc_admdvs,
-              属地名称: order.his_patient.insuplc_admdvs,
+              参保号:order.his_patient.id_card_no,
+              属地名称: insuplc_admdvs_name,
               应收金额: order.medfee_sumamt,
               实收金额: order.medfee_sumamt,
               医保统筹金额: order.hifp_pay,
@@ -2372,6 +2452,9 @@ export default {
               "患者姓名",
               "开处时间",
               "险种类型",
+              "参保所属医保区划",
+              "参保号",
+              "属地名称",
               "应收金额",
               "实收金额",
               "医保统筹金额",
@@ -2401,6 +2484,9 @@ export default {
               "患者姓名",
               "开处时间",
               "险种类型",
+              "参保所属医保区划",
+              "参保号",
+              "属地名称",
               "应收金额",
               "实收金额",
               "医保统筹金额",
@@ -2502,6 +2588,7 @@ export default {
               price: month_prescriptions[i].project[a].price
 
             }
+
             project_ids.push(obj)
             project_month_prescriptions.project.push(month_prescriptions[i].project[a])
           }
@@ -2523,6 +2610,10 @@ export default {
             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)
+            obj['id'] = drug_month_prescriptions.advices[a].id
+            obj['type'] = 1
+
+
             count = count + drug_month_prescriptions.advices[a].prescribing_number
           }
         }
@@ -2541,17 +2632,20 @@ export default {
               obj['code'] = project_month_prescriptions.project[a].id
               obj['unit'] = project_month_prescriptions.project[a].project.unit
               obj['type'] = 2
+              obj['id'] = project_month_prescriptions.project[a].id
+
 
             } 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['unit'] = project_month_prescriptions.project[a].good_info.packing_unit
               obj['type'] = 3
+              obj['id'] = project_month_prescriptions.project[a].id
 
             }
             count = count + parseFloat(project_month_prescriptions.project[a].count)
             obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
-            obj['type'] = 1
+            obj['type'] = 2
 
           }
         }

src/xt_pages/outpatientDoctorStation/batch_print_treatTemplate/treatBatchPrint.vue

@@ -7,7 +7,9 @@
       class="prescription-print"
       v-for="(item,index) in i.prescriptions"
       :key="index"
+
     >
+
       <span v-if="org_id == 10138">
         <img
           src="https://kuyi.shengws.com/bailin/bltotle.jpg"
@@ -158,7 +160,7 @@
                   <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
               </div> -->
         <div class="drugsBox" v-for="(it, index) in item.project" :key="index">
-          <div class="drugsOne">
+          <div class="drugsOne" v-if="(item.type == 2 && item.project.cost_classify != 3) || item.type ==3">
             <span style="font-weight: bold">{{ index + 1 + "." }}</span
             >{{
               it.type == 2 ? it.project.project_name : it.good_info.good_name
@@ -209,6 +211,7 @@
         alt=""
       /></span>
       <div style="page-break-after: always"></div>
+
     </div>
 
     <!-- <div id='prescriptionPrint'>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2616,7 +2616,7 @@
                           newProjectArr[i].out_count += parseInt(newProjectArr[i].child[j].total)
                         }
                       }
-                      console.log("河滨232332newArr",newProjectArr)
+                      
                       for(let i=0;i<newProjectArr.length;i++){
                         if(newProjectArr[i].out_count > newProjectArr[i].sum_count){
                               this.$message.error(newProjectArr[i].str + "库存不足,保存失败!")
@@ -2628,7 +2628,7 @@
 
                     }
                }
-
+               console.log("params23332232323232323------",data)
                 createHisPrescription(data, params).then(response => {
                   if (response.data.state == 1) {
                     this.$emit('change', this.patientInfo.id)

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -429,11 +429,49 @@ export default {
 
           let new_patients = []
           if (type != 3) {
-            Arr.forEach((i) => {
-              if (i.prescriptions.length != 0) {
-                new_patients.push(i)
-              }
-            })
+
+            if (type == 1){
+              Arr.forEach((i) => {
+                if (i.prescriptions.length != 0) {
+                  new_patients.push(i)
+                }
+              })
+
+            }else {
+              Arr.forEach((i) => {
+                if (i.prescriptions.length != 0) {
+                  for(let b = 0; b < i.prescriptions.length;b++) {
+                    for (let c = 0; c < i.prescriptions[b].project.length; c++) {
+                      if(b == 1) {
+                        console.log(i.prescriptions[b].project.length)
+                        console.log(i.prescriptions[b].project[c].project.cost_classify)
+                        console.log(i.prescriptions[b].project[c].type)
+                      }
+                      if(i.prescriptions[b].project[c].type == 2 && i.prescriptions[b].project[c].project.cost_classify == 3){
+                        i.prescriptions[b].project.splice(c,1)
+                        c--
+                      }
+                    }
+                  }
+                  new_patients.push(i)
+                }
+              })
+              let new_patients_two = []
+
+              new_patients.forEach((i) => {
+                if (i.prescriptions.length != 0) {
+                  for(let b = 0; b < i.prescriptions.length;b++) {
+                    if(i.prescriptions[b].project.length == 0){
+                      i.prescriptions.splice(b,1)
+                      b--
+                    }
+                  }
+                  new_patients_two.push(i)
+                }
+              })
+              new_patients = new_patients_two
+            }
+
           } else {
             Arr.forEach((el) => {
               el.new_prescriptions.forEach((o) => {

src/xt_pages/outpatientTool/detailPrint.vue

@@ -18,6 +18,9 @@
           <tr>
             <td>患者姓名：{{ patient.name }}</td>
             <td>性别：{{ patient.gender == 1 ? "男" : "女" }}</td>
+            <td>性别：{{patient.id_card_no}}</td>
+
+            <TD>年龄：{{ getAge(patient.id_card_no)?getAge(patient.id_card_no)+'岁':''}}</TD>
             <td>结算类别：
             <span v-if="his_patient!=null&&his_patient.balance_accounts_type >0"> {{ getType(his_patient.balance_accounts_type) }} </span>
             <span v-if="his_record_patient!=null&&his_record_patient.balance_accounts_type >0">{{getType(his_record_patient.balance_accounts_type)}}</span></td>
@@ -164,7 +167,7 @@
 
 <script>
 import print from "print-js";
-import { uParseTime } from "@/utils/tools";
+import {jsGetAge, uParseTime } from "@/utils/tools";
 import { getHisSummaryDetailList } from "@/api/his/his_tools";
 export default {
   data() {
@@ -190,6 +193,24 @@ export default {
     };
   },
   methods: {
+    getAge(val){
+      console.log(val)
+      var thisLen = val.length;
+      var birth = "";
+      if (thisLen == 15) {
+        birth = "19" + val.substr(6, 6);
+      } else {
+        birth = val.substr(6, 8);
+      }
+      var birthTwo =
+        birth.substr(0, 4) +
+        "-" +
+        birth.substr(4, 2) +
+        "-" +
+        birth.substr(6, 2);
+      var age = jsGetAge(birthTwo, "-");
+      return age;
+    },
     printtpage() {
       const style =
         '@media print {.list-print{width:960px;margin:0 auto} .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: 25px;font-size: 14px;border-color: #000;text-align: left;} .listTable tr td {padding: 0 5px;}.tableBottom {font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne {margin-right: 40px;}';
@@ -237,6 +258,7 @@ export default {
 
           this.list = list;
           this.patient = response.data.data.patient;
+          console.log(this.patient)
 
           this.his_patient = response.data.data.his_patient;
 

src/xt_pages/package.json

@@ -0,0 +1,144 @@
+{
+  "name": "vue-element-admin",
+  "version": "3.7.3",
+  "description": "A magical vue admin. Typical templates for enterprise applications. Newest development stack of vue. Lots of awesome features",
+  "author": "Pan <panfree23@gmail.com>",
+  "license": "MIT",
+  "scripts": {
+    "dev": "cross-env BABEL_ENV=development webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
+    "build:prod": "cross-env NODE_ENV=production env_config=prod node build/build.js",
+    "build:sit": "cross-env NODE_ENV=production env_config=sit node build/build.js && npm run fixfont && npm run fiximg",
+    "build-cdn": "node build/build-cdn.js",
+    "lint": "eslint --ext .js,.vue src",
+    "test": "npm run lint",
+    "precommit": "lint-staged",
+    "build": "cross-env NODE_ENV=production env_config=sit node build/build.js && npm run fixfont && npm run fiximg",
+    "fixfont": "xcopy %cd%\\dist\\static\\fonts %cd%\\dist\\static\\css\\static\\fonts /s /y /d /e /i",
+    "fiximg": "xcopy %cd%\\dist\\static\\img %cd%\\dist\\static\\css\\static\\img /s /y /d /e /i"
+  },
+  "lint-staged": {
+    "src/**/*.{js,vue}": [
+      "eslint --fix",
+      "git add"
+    ]
+  },
+  "keywords": [
+    "vue",
+    "element-ui",
+    "admin",
+    "management-system",
+    "admin-template"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/PanJiaChen/vue-element-admin.git"
+  },
+  "bugs": {
+    "url": "https://github.com/PanJiaChen/vue-element-admin/issues"
+  },
+  "dependencies": {
+    "@types/moment": "^2.13.0",
+    "ajv": "^6.5.3",
+    "axios": "0.17.1",
+    "clipboard": "^1.7.1",
+    "codemirror": "5.32.0",
+    "connect": "3.6.6",
+    "default-passive-events": "^2.0.0",
+    "driver.js": "0.5.2",
+    "dropzone": "5.2.0",
+    "echarts": "3.8.5",
+    "element-ui": "^2.13.2",
+    "file-saver": "^1.3.8",
+    "font-awesome": "4.7.0",
+    "js-cookie": "2.2.0",
+    "jsbarcode": "^3.11.5",
+    "jsonlint": "1.6.3",
+    "jszip": "3.1.5",
+    "mockjs": "1.0.1-beta3",
+    "moment": "^2.24.0",
+    "node-sass": "4.14.1",
+    "normalize.css": "7.0.0",
+    "nprogress": "0.2.0",
+    "print-js": "^1.0.50",
+    "qrcodejs2": "0.0.2",
+    "screenfull": "4.2.0",
+    "serve-static": "1.13.2",
+    "showdown": "1.8.5",
+    "simplemde": "1.11.2",
+    "sortablejs": "1.7.0",
+    "v-fit-columns": "^0.2.0",
+    "vue": "2.5.16",
+    "vue-clipboard": "0.0.1",
+    "vue-clipboard2": "^0.3.1",
+    "vue-count-to": "1.0.13",
+    "vue-i18n": "7.3.2",
+    "vue-multiselect": "2.0.8",
+    "vue-router": "3.0.1",
+    "vue-splitpane": "1.0.2",
+    "vuedraggable": "^2.16.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.11.19"
+  },
+  "devDependencies": {
+    "autoprefixer": "7.2.3",
+    "babel-core": "6.26.0",
+    "babel-eslint": "8.0.3",
+    "babel-helper-vue-jsx-merge-props": "2.0.3",
+    "babel-loader": "7.1.2",
+    "babel-plugin-dynamic-import-node": "^1.2.0",
+    "babel-plugin-syntax-jsx": "6.18.0",
+    "babel-plugin-transform-runtime": "6.23.0",
+    "babel-plugin-transform-vue-jsx": "3.5.0",
+    "babel-preset-env": "1.6.1",
+    "babel-preset-stage-2": "6.24.1",
+    "chalk": "2.3.0",
+    "copy-webpack-plugin": "4.3.0",
+    "cross-env": "^7.0.3",
+    "crypto-js": "^4.1.1",
+    "css-loader": "0.28.7",
+    "eslint": "4.13.1",
+    "eslint-friendly-formatter": "3.0.0",
+    "eslint-loader": "1.9.0",
+    "eslint-plugin-html": "4.0.1",
+    "extract-text-webpack-plugin": "3.0.2",
+    "file-loader": "1.1.5",
+    "friendly-errors-webpack-plugin": "1.6.1",
+    "html-webpack-plugin": "2.30.1",
+    "lint-staged": "7.2.0",
+    "node-notifier": "5.1.2",
+    "node-sass": "^4.14.1",
+    "optimize-css-assets-webpack-plugin": "3.2.0",
+    "ora": "1.3.0",
+    "portfinder": "1.0.13",
+    "postcss-import": "11.0.0",
+    "postcss-loader": "2.0.9",
+    "postcss-url": "7.3.0",
+    "qiniu-webpack-plugin": "^0.4.2",
+    "rimraf": "2.6.2",
+    "sass-loader": "^6.0.7",
+    "sass-resources-loader": "^1.3.4",
+    "script-loader": "^0.7.2",
+    "semver": "5.4.1",
+    "shelljs": "0.7.8",
+    "svg-sprite-loader": "3.5.2",
+    "uglifyjs-webpack-plugin": "1.1.3",
+    "url-loader": "0.6.2",
+    "vue-loader": "13.7.2",
+    "vue-style-loader": "3.0.3",
+    "vue-template-compiler": "2.5.16",
+    "webpack": "3.10.0",
+    "webpack-bundle-analyzer": "2.9.1",
+    "webpack-dev-server": "^2.9.7",
+    "webpack-merge": "4.1.1",
+    "write-json": "^3.0.1"
+  },
+  "engines": {
+    "node": ">= 4.0.0",
+    "npm": ">= 3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 8"
+  ]
+}

src/xt_pages/qcd/indicatorControlAnalysis/weight.vue

@@ -626,6 +626,7 @@
           this.tableData[i].assessment_date = this.getTime(this.tableData[i].assessment_date,'{y}-{m}-{d}')
           this.tableData[i].name = this.tableData[i].patient.name
           this.tableData[i].over_pluse =  this.tableData[i].weight_before -  this.tableData[i].last_after_weight
+          this.tableData[i].weight_after = this.tableData[i].after.weight_after
         }
        
         const tHeader = ['日期', '姓名', '干体重','前次透后体重','透前体重','透后体重','体重增加']

src/xt_pages/sign/lineUp.vue

@@ -43,9 +43,9 @@
                 <div class="lineUpMain">
                     <div class="lineUpMainLeft">
                         <div class="lineUpMainLeftTitle">
-                            <p style="width:12%">排队号</p>
+                            <p style="width:12%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id !=10440">排队号</p>
                             <p style="width:14%">姓名</p>
-                            <p style="width:14%">病例号</p>
+                            <p style="width:14%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id !=10440">病例号</p>
                             <p style="width:14%">床位号</p>
                             <p style="width:14%">治疗状态</p>
                             <p style="width:14%">上机时间</p>
@@ -53,14 +53,14 @@
                         </div>
                         <div class="lineUpList">
                             <div class="lineUpListOne" v-for="(item,index) in lineUpList" :key="index">
-                                <p style="width:12%">
+                                <p style="width:12%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id!=10440">
                                     <span v-if="item.schedule_type == 1">上午</span>
                                     <span v-if="item.schedule_type == 2">下午</span>
                                     <span v-if="item.schedule_type == 3">晚上</span>
                                     {{ item.queue_no }}号
                                 </p>
                                 <p style="width:14%">{{ item.patient_name }}</p>
-                                <p style="width:14%">{{ item.dialysis_no }}</p>
+                                <p style="width:14%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id !=10440">{{ item.dialysis_no }}</p>
                                 <p style="width:14%">{{ item.partition_name + item.bed_name }}</p>
                                 <p style="width:14%">
                                     <span v-if="item.status == 1">待接诊</span>
@@ -220,9 +220,9 @@
                 <div class="lineUpMain">
                     <div class="lineUpMainLeft">
                         <div class="lineUpMainLeftTitle">
-                            <p style="width:12%">排队号</p>
+                            <p style="width:12%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id !=10440">排队号</p>
                             <p style="width:14%">姓名</p>
-                            <p style="width:14%">病例号</p>
+                            <p style="width:14%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id !=10440">病例号</p>
                             <p style="width:14%">床位号</p>
                             <p style="width:14%">治疗状态</p>
                             <p style="width:14%">上机时间</p>
@@ -230,14 +230,14 @@
                         </div>
                         <div class="lineUpList">
                             <div class="lineUpListOne" v-for="(item,index) in lineUpList" :key="index">
-                                <p style="width:12%">
+                                <p style="width:12%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id !=10440">
                                     <span v-if="item.schedule_type == 1">上午</span>
                                     <span v-if="item.schedule_type == 2">下午</span>
                                     <span v-if="item.schedule_type == 3">晚上</span>
                                     {{ item.queue_no }}号
                                 </p>
                                 <p style="width:14%">{{ item.patient_name }}</p>
-                                <p style="width:14%">{{ item.dialysis_no }}</p>
+                                <p style="width:14%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id !=10440">{{ item.dialysis_no }}</p>
                                 <p style="width:14%">{{ item.partition_name + item.bed_name }}</p>
                                 <p style="width:14%">
                                     <span v-if="item.status == 1">待接诊</span>

src/xt_pages/stock/Dialog/goodTypeDialog.vue

@@ -17,6 +17,7 @@
                   <el-radio label="1">无</el-radio>
                   <el-radio label="2">透析器</el-radio>
                   <el-radio label="3">灌流器</el-radio>
+                  <el-radio label="4">滤过器</el-radio>
               </el-radio-group>
           </el-form-item>
         </el-col>

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -149,8 +149,13 @@
         </el-table-column>
         <el-table-column label="数量" align="center">
           <template slot-scope="scope">
-            <span v-if="orgId!=9583">{{ scope.row.count }}</span>
-            <span v-if="orgId ==9583">{{getStockCount(scope.row.good_id) }}</span>
+            <span v-if="scope.row.is_total == 0">
+              <span v-if="orgId!=9583">{{ scope.row.count }}</span>
+              <span v-if="orgId ==9583">{{getStockCount(scope.row.good_id) }}</span>
+            </span> 
+            <span v-if="scope.row.is_total == 1">
+              {{scope.row.count}}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="总价" align="center">
@@ -341,7 +346,15 @@ export default {
           this.wareOutList =  response.data.data.list
           console.log("党的20大长长",this.wareOutList)
           var total = 0
-
+          var objOne = {
+            warehouse_out_order_number: "合计",
+            is_total: 1,
+            total:total.toFixed(2),
+            WarehouseOut: {
+              warehouse_out_time: 0
+            },
+            count:0
+          }
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.tableData.push(response.data.data.list[i])
 
@@ -349,16 +362,10 @@ export default {
             total += response.data.data.list[i].price * response.data.data.list[i].count
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
-
+            objOne.count += response.data.data.list[i].count
           }
-          this.cancelStockDate.push({
-            warehouse_out_order_number: "合计",
-            is_total: 1,
-            total:total.toFixed(2),
-            WarehouseOut: {
-              warehouse_out_time: 0
-            }
-          });
+       
+          this.cancelStockDate.push(objOne);
 
         }
       });
@@ -399,6 +406,15 @@ export default {
           this.wareOutList =  response.data.data.list
           console.log("党的20大长长",this.wareOutList)
           var total = 0
+          var objOne = {
+            warehouse_out_order_number: "合计",
+            is_total: 1,
+            total: total.toFixed(2),
+            WarehouseOut: {
+              warehouse_out_time: 0
+            },
+            count:0,
+          }
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.tableData.push(response.data.data.list[i])
             var obj = response.data.data.list[i];
@@ -408,21 +424,15 @@ export default {
             if(response.data.data.list[i].price == 0){
                total += response.data.data.list[i].GoodInfo.packing_price * response.data.data.list[i].count
             }
-
+            objOne.count +=response.data.data.list[i].count
             obj["is_total"] = 0;
+            
             this.cancelStockDate.push(obj);
           }
 
           this.tableDataList = response.data.data.list
 
-          this.cancelStockDate.push({
-            warehouse_out_order_number: "合计",
-            is_total: 1,
-            total: total.toFixed(2),
-            WarehouseOut: {
-              warehouse_out_time: 0
-            }
-          });
+          this.cancelStockDate.push(objOne);
 
         }
       });

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

@@ -356,6 +356,7 @@ export default {
      goodList:[
       {id:1,name:"全部药品"},
       {id:2,name:"库存预警"},
+      {id:3,name:"库存为零"},
      ],
      houseList:[],
      storehouse_id:0,

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -131,6 +131,21 @@
               {{getTime(scope.row.expire_date,"{y}-{h}-{d}")}}
             
            </template>
+        </el-table-column>
+         <!-- <el-table-column prop="drug_name" label="剩余库存" align="center">
+           <template slot-scope="scope">
+             {{scope.row.over_count}}
+           </template>
+        </el-table-column> -->
+        <el-table-column prop="drug_name" label="使用人" align="center">
+           <template slot-scope="scope">
+             <span > {{getPatientName(scope.row.patient_id)}}</span>
+           </template>
+        </el-table-column>
+        <el-table-column prop="drug_name" label="剩余库存" align="center">
+           <template slot-scope="scope">
+             <span > {{getDrugCount(scope.row.over_count,scope.row.BaseDrugLib.max_unit,scope.row.BaseDrugLib.min_unit,scope.row.BaseDrugLib.min_number)}}</span>
+           </template>
         </el-table-column>
         <!-- <el-table-column prop="drug_name" label="批号" align="center">
            <template slot-scope="scope">
@@ -257,6 +272,7 @@
         total:0,
         drug:{},
         houseList:[],
+        patientList:[],
       }
     },
     methods:{
@@ -509,6 +525,7 @@
             var drug = response.data.data.drug
            
             this.drug = drug
+            this.patientList = response.data.data.patientList
 
             this.houseList = response.data.data.houseList
           }
@@ -552,6 +569,35 @@
       }
       return storehouse_name
      },
+     getPatientName(id){
+       var name = ""
+       for(let i=0;i<this.patientList.length;i++){
+          if(id == this.patientList[i].id){
+              name = this.patientList[i].name
+          }
+       }
+       return name
+     },
+     getDrugCount(total,max_unit,min_unit,min_number){
+        var max_str = "";
+        var min_str = "";
+        if (total < min_number) {
+        min_str = total + min_unit;
+      }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number) + max_unit;
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number) + min_unit;
+        }
+      }
+      return max_str + min_str;
+     }
     }
   }
 </script>

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -252,39 +252,48 @@
       >
         <el-table-column label="药品名称" align="center">
           <template slot-scope="scope">
-            {{ scope.row.drug.drug_name }}
+            <span v-if="scope.row.is_total == 0">
+              {{ scope.row.drug.drug_name }}
+            </span> 
           </template>
         </el-table-column>
         <el-table-column label="药品类型" align="center">
           <template slot-scope="scope">
-            {{ getDrugType(scope.row.drug.drug_type) }}
+            <span v-if="scope.row.is_total == 0"> {{ getDrugType(scope.row.drug.drug_type) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="规格&单位" align="center">
           <template slot-scope="scope">
-            {{ scope.row.drug.dose }}&nbsp;{{ scope.row.drug.dose_unit }}*{{
+            <span v-if="scope.row.is_total ==0">{{ scope.row.drug.dose }}&nbsp;{{ scope.row.drug.dose_unit }}*{{
               scope.row.drug.min_number
             }}{{ scope.row.drug.min_unit }}/{{ scope.row.drug.max_unit }}
+            </span> 
           </template>
         </el-table-column>
         <el-table-column label="国家编码" align="center">
           <template slot-scope="scope">
-            {{ scope.row.drug.medical_insurance_number }}
+            <span v-if="scope.row.is_total == 0">
+               {{ scope.row.drug.medical_insurance_number }}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="批号" align="center">
           <template slot-scope="scope">
-            {{ scope.row.batch_number }}
+            <span v-if="scope.row.is_total == 0"> {{ scope.row.batch_number }}</span>
           </template>
         </el-table-column>
         <el-table-column label="仓库名称" align="center">
           <template slot-scope="scope">
-            {{ getHouseName(scope.row.storehouse_id) }}
+            <span v-if="scope.row.is_total == 0">
+               {{ getHouseName(scope.row.storehouse_id) }}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="入库数量" align="center">
           <template slot-scope="scope">
-            {{ scope.row.warehousing_count }}{{ scope.row.max_unit }}
+            <span v-if="scope.row.is_total == 0">
+               {{ scope.row.warehousing_count }}{{ scope.row.max_unit }}
+            </span>
           </template>
         </el-table-column>
         <!-- <el-table-column label="拆零零售价" align="center">
@@ -294,43 +303,56 @@
         </el-table-column> -->
         <el-table-column label="进货价" align="center">
           <template slot-scope="scope">
-            {{ scope.row.price }}
+            <span v-if="scope.row.is_total == 0">{{ scope.row.price }}</span> 
           </template>
         </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
             <!-- {{scope.row.total_price}} -->
-            {{ (scope.row.warehousing_count * scope.row.price).toFixed(2) }}
+            <span v-if="scope.row.is_total == 0">{{ (scope.row.warehousing_count * scope.row.price).toFixed(2) }}</span> 
+            <span v-if="scope.row.is_total == 1">
+              {{(scope.row.total_count).toFixed(2)}}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="生产厂家" align="center">
           <template slot-scope="scope">
-            {{ getManufacturer(scope.row.manufacturer) }}
+            <span v-if="scope.row.is_total== 0">
+               {{ getManufacturer(scope.row.manufacturer) }}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="生产日期" align="center">
           <template slot-scope="scope">
-            {{ getTime(scope.row.product_date) }}
+           <span v-if="scope.row.is_total ==0">{{ getTime(scope.row.product_date) }} </span>  
           </template>
         </el-table-column>
         <el-table-column label="有效日期" align="center">
           <template slot-scope="scope">
+           <span v-if="scope.row.is_total == 0">
             {{ getTime(scope.row.expiry_date) }}
+            </span> 
           </template>
         </el-table-column>
         <el-table-column label="经销商" align="center">
           <template slot-scope="scope">
-            {{ getDealer(scope.row.dealer) }}
+            <span v-if="scope.row.is_total == 0">
+               {{ getDealer(scope.row.dealer) }}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="批准文号" align="center">
           <template slot-scope="scope">
-            {{ scope.row.number }}
+            <span v-if="scope.row.is_total == 0">
+               {{ scope.row.number }}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
-            {{ scope.row.remark }}
+           <span v-if="scope.row.is_total == 0">
+             {{ scope.row.remark }}
+           </span>
           </template>
         </el-table-column>
       </el-table>
@@ -774,12 +796,17 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
+          var obj = {total_count:0,is_total:1}
           for (let i = 0; i < response.data.data.info.length; i++) {
+            response.data.data.info[i].is_total = 0
             this.showOne = true;
             this.WarehouseInfo.warehouseInfoDate.push(
               response.data.data.info[i]
             );
+            obj.total_count += (response.data.data.info[i].warehousing_count *response.data.data.info[i].price)
           }
+          this.WarehouseInfo.warehouseInfoDate.push(obj)
+        
           this.WarehouseInfo.warehouse = response.data.data.warehousing;
           this.getAllDrugList();
         }

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -51,7 +51,7 @@
                    <span>{{ item.warehousing_count }}</span>
               </td>
               <td style="line-height: 18px">
-                <span>{{item.max_unit}}</span>
+                <span>{{item.limax_unit}}</span>
               </td>
               <td style="line-height:18px">
                   <span>{{(item.warehousing_count * item.price).toFixed(2)}}</span>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -304,7 +304,7 @@
                   <td style="border-right: none; border-inline-end:none;text-align: center">
                     <span v-if="is_sys==1 || is_sys == 5">{{getOutCountSix(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)}}</span>
                     <span v-if="is_sys == 12">{{getOutCountTen(item.count,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
-                    <span v-if="is_sys == 0"> {{getOutCountOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
+                    <span v-if="is_sys == 0"> {{getOutCountOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)}} </span>
                   </td>
                </tr>
             </template>
@@ -1222,9 +1222,10 @@ export default {
           this.dealerList = response.data.data.dealerList;
           var drugFlowList = response.data.data.drugFlowList;
           var drugList = response.data.data.drugList
-        
+         
           this.tabList = drugList
           var drugListOne = response.data.data.drugListFlow
+          console.log("drugListOne----------",drugListOne)
           //按批号分组
           var drugListTwo=  response.data.data.drugListOne
           console.log("drugListTwo9922wo",drugListTwo)
@@ -1247,6 +1248,9 @@ export default {
                        drugFlowList[i].childOne.push(drugListOne[j])
                    }
                 }
+                if(drugFlowList[i].drug_id == 1154){
+                    console.log("drugflowlist------",drugFlowList[i].count)
+                }
               }
             }
           
@@ -1311,6 +1315,7 @@ export default {
                } 
             }
           }
+          console.log("list表格---------",list)
           this.tableList = list;
         }
         if(is_sys == 12){
@@ -1821,14 +1826,16 @@ export default {
       }
       return max_str + min_str;
     },
-    getOutCountOne(batch_number,max_unit,min_unit,min_number){
-     
+    getOutCountOne(batch_number,max_unit,min_unit,min_number,drug_id){
+      console.log("drug_id-----",drug_id)
       var arr = []
       var total = 0
       var max_str = ""
       var min_str = ""
+      console.log("tablelost----",this.tabList)
       for(let j=0;j<this.tabList.length;j++){
-        if(batch_number == this.tabList[j].batch_number){
+      
+        if(batch_number == this.tabList[j].batch_number && drug_id == this.tabList[j].drug_id){
            arr.push(this.tabList[j])
         }
       }

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -915,6 +915,7 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
+          this.recordInfo.recordData = []
           var manulist = response.data.data.manulist;
           this.manufacturerList = manulist;
           this.dealerList = response.data.data.dealerList;

src/xt_pages/stock/query/goodNewQuery.vue

@@ -320,6 +320,7 @@ export default {
      goodList:[
       {id:1,name:"全部耗材"},
       {id:2,name:"库存预警"},
+      {id:3,name:"库存为零"},
      ],
      houseList:[],
      storehouse_id:0,

src/xt_pages/stock/stockFlow.vue

@@ -131,6 +131,16 @@
              <span > {{getManufacturer(scope.row.manufacturer)}}</span>
            </template>
         </el-table-column>
+        <el-table-column prop="drug_name" label="使用人" align="center">
+           <template slot-scope="scope">
+             <span > {{getPatientName(scope.row.patient_id)}}</span>
+           </template>
+        </el-table-column>
+        <el-table-column prop="drug_name" label="剩余库存" align="center">
+           <template slot-scope="scope">
+             <span > {{scope.row.over_count}}</span>
+           </template>
+        </el-table-column>
        </el-table>
        
       <el-pagination
@@ -236,6 +246,7 @@
         cancelCountList:[],
         good:{},
         houseList:[],
+        patientList:[]
       }
     },
     methods:{
@@ -443,6 +454,7 @@
            var manufacturerList = response.data.data.manufacturerList
            this.manufacturerList = manufacturerList
            this.houseList = response.data.data.houseList
+           this.patientList = response.data.data.patients
           }
        })
      },
@@ -469,6 +481,15 @@
          specification_name = this.good.specification_name
        }
        return specification_name
+     },
+     getPatientName(id){
+       var name = ""
+       for(let i=0;i<this.patientList.length;i++){
+          if(id == this.patientList[i].id){
+              name = this.patientList[i].name
+          }
+       }
+       return name
      }
     }
   }

src/xt_pages/stock/stockInOrder.vue

@@ -239,38 +239,50 @@
         >
         <el-table-column label="耗材名称" align="center">
           <template slot-scope="scope">
+           <span v-if="scope.row.is_total == 0">
             {{ scope.row.GoodInfo.good_name }}
+            </span> 
           </template>
         </el-table-column>
         <el-table-column label="耗材类型" align="center">
           <template slot-scope="scope">
-            {{  getTypeName(scope.row.GoodInfo.good_type_id)}}
+            <span v-if="scope.row.is_total ==0">
+              {{ getTypeName(scope.row.GoodInfo.good_type_id)}}
+            </span> 
           </template>
         </el-table-column>
         <el-table-column label="规格&单位" align="center">
           <template slot-scope="scope">
-            {{ scope.row.GoodInfo.specification_name}} / {{scope.row.GoodInfo.packing_unit}}
+            <span v-if="scope.row.is_total == 0">
+               {{ scope.row.GoodInfo.specification_name}} / {{scope.row.GoodInfo.packing_unit}}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="国家编码" align="center">
           <template slot-scope="scope">
-            {{ scope.row.GoodInfo.social_security_directory_code}}
+            <span v-if="scope.row.is_total == 0">
+              {{ scope.row.GoodInfo.social_security_directory_code}}
+            </span> 
           </template>
         </el-table-column>
         <el-table-column label="批号" align="center">
           <template slot-scope="scope">
-            {{ scope.row.number}}
+            <span v-if="scope.row.is_total== 0">
+               {{ scope.row.number}}
+            </span>
           </template>
         </el-table-column>
          <el-table-column label="仓库名称" align="center">
           <template slot-scope="scope">
-            {{getHouseName(scope.row.storehouse_id)}}
+            <span v-if="scope.row.is_total == 0">
+              {{getHouseName(scope.row.storehouse_id)}}
+            </span> 
           </template>
         </el-table-column>
 
         <el-table-column label="入库数量" align="center">
           <template slot-scope="scope">
-            {{ scope.row.warehousing_count}}{{scope.row.GoodInfo.packing_unit}}
+           <span v-if="scope.row.is_total == 0">{{ scope.row.warehousing_count}}{{scope.row.GoodInfo.packing_unit}} </span> 
           </template>
         </el-table-column>
          <!-- <el-table-column label="零售价" align="center">
@@ -280,47 +292,66 @@
         </el-table-column> -->
         <el-table-column label="进货价" align="center">
           <template slot-scope="scope">
-            {{ scope.row.price}}
+            <span v-if="scope.row.is_total == 0">
+              {{ scope.row.price}}
+            </span> 
           </template>
         </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
-            {{ (scope.row.warehousing_count * scope.row.price).toFixed(2)}}
+            <span v-if="scope.row.is_total==0">
+               {{ (scope.row.warehousing_count * scope.row.price).toFixed(2)}}
+            </span>
+            <span v-if="scope.row.is_total== 1">
+              {{(scope.row.total_count).toFixed(2)}}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="生产厂家" align="center">
           <template slot-scope="scope">
-            {{ getManufactuerName(scope.row.manufacturer)}}
+            <span v-if="scope.row.is_total == 0">
+              {{ getManufactuerName(scope.row.manufacturer)}}
+             </span> 
           </template>
         </el-table-column>
         <el-table-column label="生产日期" align="center">
           <template slot-scope="scope">
-            {{ getTime(scope.row.product_date,"{y}-{m}-{d}")}}
+           <span v-if="scope.row.is_total == 0">
+             {{ getTime(scope.row.product_date,"{y}-{m}-{d}")}}
+            </span> 
           </template>
         </el-table-column>
         <el-table-column label="有效期" align="center">
           <template slot-scope="scope">
-            {{ getTime(scope.row.expiry_date,"{y}-{m}-{d}")}}
+            <span v-if="scope.row.is_total == 0">
+               {{ getTime(scope.row.expiry_date,"{y}-{m}-{d}")}}
+            </span>
           </template>
         </el-table-column>
        <el-table-column label="经销商" align="center">
           <template slot-scope="scope">
-            {{ getDealerName(scope.row.dealer)}}
+          <span v-if="scope.row.is_total == 0">
+             {{ getDealerName(scope.row.dealer)}}
+            </span>  
           </template>
         </el-table-column>
        <el-table-column label="批准文号" align="center">
           <template slot-scope="scope">
-            {{ scope.row.license_number}}
+           <span v-if="scope.row.is_total ==0"> {{ scope.row.license_number}}</span>
           </template>
         </el-table-column>
         <el-table-column label="注册编码" align="center">
           <template slot-scope="scope">
-            {{ scope.row.register_number}}
+            <span v-if="scope.row.is_total == 0">
+               {{ scope.row.register_number}}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
-            {{ scope.row.remark }}
+            <span v-if="scope.row.is_total == 0">
+               {{ scope.row.remark }}
+            </span>
           </template>
         </el-table-column>
         </el-table>
@@ -423,6 +454,7 @@
           <el-table-column label="总价" min-width="20" align="center">
             <template slot-scope="scope">
               {{ calculate(scope.row.price * scope.row.warehousing_count) }}
+             
             </template>
           </el-table-column>
 
@@ -1325,14 +1357,20 @@ export default {
           return false;
         } else {
           this.tableShow = true
+          var  obj = {name:"总计",total_count:0,is_total:1}
           for (let i = 0; i < response.data.data.info.length; i++) {
             this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
             response.data.data.info[i].price = response.data.data.info[i].price.toString();
             response.data.data.info[i].warehousing_count = response.data.data.info[i].warehousing_count.toString();
-
+           
             this.recordInfo.recordData.push(response.data.data.info[i]);
+            console.log("tablelist+++==+",this.tableList)
+            response.data.data.info[i].total_count = (response.data.data.info[i].warehousing_count * response.data.data.info[i].price).toFixed(2)
+            response.data.data.info[i].is_total = 0
+            obj.total_count += (response.data.data.info[i].warehousing_count * response.data.data.info[i].price)
             this.tableList.push(response.data.data.info[i])
           }
+           this.tableList.push(obj)
            this.warehouse = response.data.data.warehousing;
            this.warehousing_time = this.getTime(this.warehouse.warehousing_time,"{y}-{m}-{d}");
 

src/xt_pages/user/components/PatientForm.vue

@@ -255,7 +255,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
-                <el-form-item label="家属电话 : " prop="homeTelephone">
+                <el-form-item label="家属电话 : " prop="homeTelephone"  class="is-required">
                   <el-input
                     v-model="form.homeTelephone"
                     maxlength="20"
@@ -441,7 +441,7 @@
               </el-col>
 
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
-                <el-form-item label="家庭住址 : " prop="homeAddress">
+                <el-form-item label="家庭住址 : " prop="homeAddress"  class="is-required">
                   <el-input v-model="form.homeAddress"></el-input>
                 </el-form-item>
               </el-col>
@@ -1336,10 +1336,10 @@ export default {
         age: [{ required: true, message: "请填写年龄", trigger: "blur" }],
         firstDialysisDate: [
           { required: true, message: "请选择日期", trigger: "blur" }
-        ]
-
-        // homeTelephone: [{ validator: checkFamilyPhone, trigger: "blur" }],
-        // homeAddress: [{ required: true, message: "请填写住址", trigger: "blur" }],
+        ],
+      
+        homeTelephone: [{ validator: checkFamilyPhone, trigger: "blur" }],
+        homeAddress: [{ required: true, message: "请填写住址", trigger: "blur" }],
       },
       adminUserOptions:[],
     };

src/xt_pages/user/components/PatientSidebar.vue

@@ -121,6 +121,10 @@ export default {
             {
               name: '1-5',
               label: '抢救记录'
+            },
+            {
+              name: '1-11',
+              label: '首次病程记录'
             }
           ]
         },
@@ -195,6 +199,8 @@ export default {
         this.$router.push({path:'/patient/patient/'+this.id+'/templateSummary'})
       }else if(name == '1-10'){
         this.$router.push({path:'/patient/patient/'+this.id+'/hospitalSummary'})
+      }else if(name == '1-11'){
+        this.$router.push({path:'/patient/patient/'+this.id+'/firstDisease'})
       }
     },
     changePatient(value) {
@@ -320,6 +326,10 @@ export default {
         this.$router.push({
           path: '/patients/patient/' + this.id + '/dryWeight'
         })
+      }else if(patientKey == '1-11'){
+       this.$router.push({
+          path: '/patients/patient/' + this.id + '/firstDisease'
+        })
       }
        else if (patientKey == '1-5') {
         this.$router.push({ path: '/patients/rescue?id=' + this.id })

src/xt_pages/user/coursePrint.vue

@@ -60,7 +60,19 @@
 
               </div>
             </div>
+
+            <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;float:right" v-if="org_id == 0||org_id ==9671 || org_id == 10440">
+             医生签名：
+             <span v-if="setAdminUserES(item.recorder?item.recorder:item.recorder) == ''">
+                  {{getName(item.recorder)}}
+             </span>
+              <span v-else>
+                <img style="height:30px;" :src="setAdminUserES(item.recorder?item.recorder:item.recorder)" alt="" srcset="">
+              </span>
+            </div>
           </div>
+
+        
         </div>
       </div>
     </div>
@@ -91,6 +103,9 @@
         record:[],
         patient: {},
         org_id:0,
+        adminUserList:[],
+        operators:[],
+        operatorMaps: {},
       }
     },
     created() {
@@ -114,12 +129,22 @@
         if (resp.state == 1) {
           this.record = resp.data.record
 
-          // for(let i=0;i<this.record.length;i++){
-          //   this.record[i].content = this.record[i].content.replace(new RegExp('<p>','g'),"<div>").replace(new RegExp('</p>','g'),"</div>")
-          // }
-
           this.patient = resp.data.patient
-
+         
+          this.adminUserList = resp.data.adminUser
+          this.operators = resp.data.operators
+           console.log("GetCoursePrintData",this.operators)
+           if (this.operators.length > 0) {
+            var operatorsLen = this.operators.length
+            for (var index = 0; index < operatorsLen; index++) {
+              this.$set(
+                this.operatorMaps,
+                this.operators[index].creator,
+                this.operators[index]
+              )
+            }
+          }
+          console.log("operatorMaps",this.operatorMaps)
           this.loading = false
         } else {
           this.loading = false
@@ -131,20 +156,45 @@
     },
     methods: {
       printAction: function() {
-        const style = '@media print {.printP div{margin-bottom:5px;} .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: 20px;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: 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-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:1000px;}.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;}'
-        printJS({
-          printable: 'print_content',
-          type: 'html',
-          documentTitle: '  ',
-          style: style,
-          scanStyles: false
-        })
-      }, getTime(value, temp) {
+      const style = '@media print {.printP div{margin-bottom:5px;} .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: 20px;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: 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-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:1000px;}.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;}'
+      printJS({
+        printable: 'print_content',
+        type: 'html',
+        documentTitle: '  ',
+        style: style,
+        scanStyles: false
+      })
+    },
+      getTime(value, temp) {
         if (value != undefined) {
           return uParseTime(value, temp)
         }
         return ''
-      }
+      },
+      getName(admin_user_id){
+        var name = ""
+        for(let i=0;i<this.adminUserList.length;i++){
+          if(this.adminUserList[i].id == admin_user_id){
+            name = this.adminUserList[i].name
+          }
+        }
+        return name
+      },
+       setAdminUserES(id) {
+        console.log("id2323233232232333322==-",id)
+        console.log("operatorMaps----",this.operatorMaps)
+        if (id === 0) {
+          return ''
+        }
+        if (id in this.operatorMaps) {
+           console.log("----------",this.operatorMaps[id].url)
+          return this.operatorMaps[id].url
+         
+        } else {
+          return ''
+        }
+        
+       },
     }
   }
 </script>

src/xt_pages/user/dialysisSolution.vue

@@ -226,6 +226,7 @@
         <el-row :gutter="20">
           <el-col :span="6"  v-if="isShows('置换液') && (current_solution.mode_id == 2 || current_solution.mode_id == 5 || current_solution.mode_id == 12)"><div class="grid-content bg-purple">置换液:{{getDisplaceLiqui(current_solution.displace_liqui_part)}}</div></el-col>
           <el-col :span="6"  v-if="isShows('置换液总量') && (current_solution.mode_id == 2 || current_solution.mode_id == 5 || current_solution.mode_id == 12)"><div class="grid-content bg-purple">置换液总量:{{current_solution.displace_liqui_value}}</div></el-col>
+           <el-col :span="6"  v-if="isShows('滤过器')"><div class="grid-content bg-purple">滤过器:{{current_solution.dialysis_strainer}}</div></el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6"  v-if="isShows('吸氧')"><div class="grid-content bg-purple">吸氧:
@@ -512,12 +513,20 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShows('灌流器') && (addPlan.mode == 2 || addPlan.mode == 3 || addPlan.mode == 12 || addPlan.mode == 5)">
+          <el-col :span="8" v-if="isShows('灌流器')">
             <el-form-item label="灌流器:">
               <el-input v-model="dialysis_irrigation" @focus="showInnerDialog('7')"></el-input>
             </el-form-item>
           </el-col>
 
+
+
+          <el-col :span="8" v-if="isShows('滤过器')">
+            <el-form-item label="滤过器:">
+              <el-input v-model="dialysis_strainer" @focus="showInnerDialog('11')"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8" v-if="isShows('碳酸氢盐')">
             <el-form-item label="碳酸氢盐（mmol/L）: " prop="bicarbonate">
               <el-input v-model="addPlan.bicarbonate"></el-input>
@@ -1074,6 +1083,7 @@
           epo_count:"",
           max_ultrafiltration_rate:"",
           amylaceum:"",
+          dialysis_strainer:"",
         },
         childPlan: {
           mode: '',
@@ -1190,7 +1200,8 @@
           anticoagulant_weichi: '',
           anticoagulant_zongliang: '',
           anticoagulant_gaimingcheng: '',
-          anticoagulant_gaijiliang: ''
+          anticoagulant_gaijiliang: '',
+          dialysis_strainer:"",
         },
         queryParams: {
           page: 1,
@@ -1202,6 +1213,8 @@
         dialyzers:[],
         dialysis_dialyszers:'',
         dialysis_irrigation:"",
+        dialysis_strainer:"",
+        dialysisStrainerList:[],
         plasmaSeparatorList:[],
         bilirubinAdsorptionColumn:[],
         oxygenList:[
@@ -1333,6 +1346,17 @@
             this.InnerDialogProps.selected = this.addPlan.puncture_needle
             this.InnerDialogProps.isShowTextArea = false
 
+            break
+           case '11':
+            for(let i=0;i<this.dialysisStrainerList.length;i++){
+              this.dialysisStrainerList[i].name = this.dialysisStrainerList[i].specification_name
+            }
+            this.InnerDialogProps.values = this.dialysisStrainerList
+            this.InnerDialogProps.titles = '滤过器'
+            this.InnerDialogProps.type = 'dialysis_strainer'
+            this.InnerDialogProps.selected = this.dialysis_strainer
+            this.InnerDialogProps.isShowTextArea = false
+
             break
         }
       },
@@ -1358,6 +1382,9 @@
           case 'puncture_needle':
             this.addPlan.puncture_needle = val.value.join(',')
             break
+          case 'dialysis_strainer':
+             this.dialysis_strainer = val.value.join(',')
+            break
         }
       },
       innerDialogCancle: function() {
@@ -1661,6 +1688,7 @@
             }
             this.addPlan.dialysis_dialyszers = this.dialysis_dialyszers
             this.addPlan.dialysis_irrigation = this.dialysis_irrigation
+            this.addPlan.dialysis_strainer = this.dialysis_strainer
             this.addPlan.mode_id = parseInt(this.addPlan.mode_id)
             if(this.addPlan.mode!=2 && this.addPlan.mode!=5&&this.addPlan.mode!=12){
               this.addPlan.displace_liqui_part = 0
@@ -1727,6 +1755,7 @@
                 this.current_solution.epo_count = response.data.data.solution.epo_count
                 this.current_solution.max_ultrafiltration_rate = response.data.data.solution.max_ultrafiltration_rate
                 this.current_solution.remark = response.data.data.solution.remark
+                this.current_solution.dialysis_strainer = response.data.data.dialysis_strainer
                 this.FindePatientDialysisLongSolutions()
                 return false
               }
@@ -1745,6 +1774,7 @@
             const mode = '1'
             this.addPlan.dialysis_dialyszers = this.dialysis_dialyszers
             this.addPlan.dialysis_irrigation = this.dialysis_irrigation
+            this.addPlan.dialysis_strainer = this.dialysis_strainer
             this.addPlan.mode_id = parseInt(this.addPlan.mode_id)
             console.log("add",this.addPlan)
             createPatientDialysisSolution(
@@ -1796,7 +1826,7 @@
         this.getDialysisSolutionDetailList()
       },
       openEdit(index, row) {
-
+        console.log("row-------",row)
         this.current_index = index
         this.addPlan.id = row.id
         this.addPlan.mode = row.mode_id
@@ -1924,10 +1954,13 @@
         this.addPlan.dialysis_dialyszers = row.dialysis_dialyszers
         this.dialysis_irrigation = row.dialysis_irrigation
         this.dialysis_dialyszers = row.dialysis_dialyszers
+        this.dialysis_strainer = row.dialysis_strainer
+        this.addPlan.dialysis_strainer = row.dialysis_strainer
         this.addPlan.oxygen_uptake = row.oxygen_uptake
         this.addPlan.max_ultrafiltration_rate = row.max_ultrafiltration_rate
         this.addPlan.oxygen_flow = row.oxygen_flow
         this.addPlan.oxygen_time = row.oxygen_time
+       
         if(row.oxygen_uptake == 1){
           this.oxygenShow = true
         }
@@ -2112,6 +2145,7 @@
             if(this.stockType.length >0 ){
               var arr = []
               var arrTwo = []
+              var arrThree = []
               for(let i=0;i<this.stockType.length;i++){
                 if(this.stockType[i].stock_attribute == 2){
                   arr.push(this.stockType[i])
@@ -2119,9 +2153,13 @@
                 if(this.stockType[i].stock_attribute == 3){
                   arrTwo.push(this.stockType[i])
                 }
+                 if(this.stockType[i].stock_attribute == 4){
+                  arrThree.push(this.stockType[i])
+                }
               }
               var dialyzator = []
               var irrigation = []
+              var dialysisStrainer = []
               for(let i=0;i<arr.length;i++){
                 for(let j=0;j<arr[i].GoodInfo.length;j++){
                   dialyzator.push(arr[i].GoodInfo[j])
@@ -2129,7 +2167,12 @@
               }
               console.log("透析器",dialyzator)
               this.dialyzers = dialyzator
-
+              for(let i=0;i<arrThree.length;i++){
+                for(let j=0;j<arrThree[i].GoodInfo.length;j++){
+                  dialysisStrainer.push(arrThree[i].GoodInfo[j])
+                }
+              }
+              this.dialysisStrainerList = dialysisStrainer
               for(let i=0;i<arrTwo.length;i++){
                 for(let j=0;j<arrTwo[i].GoodInfo.length;j++){
                   irrigation.push(arrTwo[i].GoodInfo[j])

src/xt_pages/user/doctorAdvice.vue

@@ -69,7 +69,20 @@
               v-for="item in adviceTypeArr"
               :key="item.value"
             >
+            <span v-if="item.value == 1">
+             <span v-if="(org_id == 9671 || org_id == 10440)">
+                长期医嘱模版
+             </span>
+
+             <span v-if="(org_id != 9671 && org_id != 10440)">
+                {{ item.label }}
+             </span>
+            </span>
+            <span v-if="item.value != 1">
               {{ item.label }}
+            </span>
+            
+            
             </li>
           </ul>
         </div>
@@ -153,7 +166,10 @@
           fixed
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.advice_type == 1">长嘱</span>
+            <span v-if="scope.row.advice_type == 1">
+              <span v-if="org_id != 9671 && org_id != 10440">长嘱</span> 
+              <span v-if="org_id == 9671 || org_id == 10440">长期医嘱模版</span> 
+            </span>
             <span v-else-if="scope.row.advice_type == 3 || scope.row.advice_type == 2">临嘱</span>
             <span v-else-if="scope.row.advice_type == 4">普通医嘱</span>
             <span v-else></span>
@@ -560,6 +576,7 @@
                     v-for="item in adviceTypeOptions"
                   ></el-option>
                 </el-select>
+               
               </el-form-item>
             </el-col>
 

src/xt_pages/user/firstDisease.vue

@@ -0,0 +1,871 @@
+<template>
+  <div class="patient-container">
+    <patient-sidebar :id="patient_id" defaultActive="1-11"></patient-sidebar>
+    <div v-loading="loading">
+      <div class="patient-app-container advice-container app-container">
+
+        <div>
+                    <span style="margin-left: 10px;float:right;">
+                        <el-button type="primary" icon="el-icon-circle-plus-outline" size="small"
+                                   @click="addAction">新增</el-button>
+
+                        <el-button type="primary" icon="el-icon-edit-outline" size="small"
+                                   @click="toEdit">修改</el-button>
+                      <el-button type="primary" icon="el-icon-printer" size="small"
+                                 @click="print">打印</el-button>
+                      <el-button size="small"  type="danger" @click="deleteAction">删除</el-button>
+                    </span>
+        </div>
+      
+        <div class="cell clearfix">
+          <label class="title"><span class="name">日期查询</span> : </label>
+          <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                          type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+          <span class="">-</span>
+          <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                          type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+        </div>
+        <div class="record">
+          <el-row :gutter="15">
+            <el-col :span="10">
+              <el-table :header-cell-style="{
+                  backgroundColor: 'rgb(245, 247, 250)',
+                  color: '#606266'
+                }"
+                :row-style="{ color: '#303133' }" ref="monthlyPlanTable" :data="tableData"
+                        border highlight-current-row @current-change="changeCurrentRecordTwo"
+                        @selection-change="selectSummary"
+                        :row-class-name="tableRow"
+              >
+                <el-table-column type="selection" width="60" align="center"></el-table-column>
+                <el-table-column label="标题" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.title}}
+                  </template>
+                </el-table-column>
+                <el-table-column label="记录日期" align="center">
+                  <template slot-scope="scope">
+                    {{getTimeOne(scope.row.record_date)}}
+                  </template>
+                </el-table-column>
+                <el-table-column label="记录医师" align="center">
+                  <template slot-scope="scope">
+                    {{getDoctor(scope.row.doctor)}}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-col>
+            <el-col :span="14">
+              <div class="record_content_panel">
+                <div style="background-color:rgb(245, 247, 250)" class="title">出院小结内容</div>
+                <div style="padding:10px;border-bottom:1px solid #DCDFE6;">标题:
+                   {{hosDetail.title}}
+                </div>
+            
+                
+                <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">记录医师:
+                   {{getDoctor(hosDetail.doctor)}}
+                </div>
+                
+                 
+                
+                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">主诉内容:
+                   <span v-html="hosDetail.main_content"></span> 
+                 </div>
+                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">病例特点:
+                   <span v-html="hosDetail.patient_case"></span> 
+                 </div>
+                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">初步诊断:
+                    <span v-html="hosDetail.tentative_diagnosis"></span>
+                 </div>
+                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">诊断依据:
+                    <span v-html="hosDetail.diagnostic_basis"></span>
+                 </div>
+                   <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">鉴别诊断:
+                    <span v-html="hosDetail.differential_diagnosis"></span>
+                 </div>
+                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">诊疗计划:
+                    <span v-html="hosDetail.treatment_plan"></span>
+                 </div>
+               
+              </div>
+            </el-col>
+          </el-row>
+        </div>
+      </div>
+
+  
+     
+      <el-dialog title="新增首次病程记录" width="60%" top="5vh" :visible.sync="show_dialog">
+        <div>
+          <div class="new_record_form">
+            <div class="cell clearfix">
+              <label class="title"><span class="name">标题</span> : </label>
+               <el-input v-model="form.title" style="width:200px"></el-input>
+
+              <label class="title"><span class="name">记录医师</span>:</label>
+               <el-select v-model="form.doctor" placeholder="请选择">
+                  <el-option
+                  v-for="item in doctorList"
+                  :key="item.admin_user_id"
+                  :label="item.user_name"
+                  :value="item.admin_user_id">
+                  </el-option>
+              </el-select>
+            
+              <label class="title"><span class="name">记录日期</span> : </label>
+              <el-date-picker v-model="form.record_date"
+                    prefix-icon="el-icon-date" 
+                    style="width: 200px;"
+                    type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm"
+                    value-format="yyyy-MM-dd HH:mm">
+              </el-date-picker>   
+            </div>
+           
+        
+      
+            <div class="cell clearfix" style="margin-top:10px">
+              <label class="title"><span class="name">主诉内容</span> : </label>
+                <el-select v-model="form.main_content_id" placeholder="可选择病程模板" @change="changeMainContent">
+                  <el-option v-for="(option, index) in mainContentList" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+                
+                 <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editor"
+                              id="editor"
+                              style="width: 800px"
+                              v-bind:r_content="form.main_content">
+                      </editor>
+                    </keep-alive>
+                </div>
+
+                <label class="title"><span class="name">病例特点</span> : </label>
+                <el-select v-model="form.patient_case_id" placeholder="可选择病程模板" @change="changePatientCase">
+                  <el-option v-for="(option, index) in patientCaseList" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+                
+                 <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorOne"
+                              id="editorOne"
+                              style="width: 800px"
+                              v-bind:r_content="form.patient_case">
+                      </editor>
+                    </keep-alive>
+                </div>
+
+                 <label class="title"><span class="name">初步诊断</span> : </label>
+                <el-select v-model="form.tentative_diagnosis_id" placeholder="可选择病程模板" @change="changeTentativeDiagnosis">
+                  <el-option v-for="(option, index) in tentativeDiagnosisList" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+                
+                 <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorTwo"
+                              id="editorTwo"
+                              style="width: 800px"
+                              v-bind:r_content="form.tentative_diagnosis">
+                      </editor>
+                    </keep-alive>
+                </div>
+
+                <label class="title"><span class="name">诊断依据</span> : </label>
+                <el-select v-model="form.diagnostic_basis_id" placeholder="可选择病程模板" @change="changeDiagnosticBasis">
+                  <el-option v-for="(option, index) in diagnosticBasisList" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+                
+                 <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorThree"
+                              id="editorThree"
+                              style="width: 800px"
+                              v-bind:r_content="form.diagnostic_basis">
+                      </editor>
+                    </keep-alive>
+                </div>
+
+                <label class="title"><span class="name">鉴别诊断</span> : </label>
+                <el-select v-model="form.differential_diagnosis_id" placeholder="可选择病程模板" @change="changeDifferentialDiagnosis">
+                  <el-option v-for="(option, index) in differentialDiagnosisList" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+                
+                 <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorFour"
+                              id="editorFour"
+                              style="width: 800px"
+                              v-bind:r_content="form.differential_diagnosis">
+                      </editor>
+                    </keep-alive>
+                </div>
+
+                <label class="title"><span class="name">诊疗计划</span> : </label>
+                <el-select v-model="form.treatment_plan_id" placeholder="可选择病程模板" @change="changeTreateMentContent">
+                  <el-option v-for="(option, index) in treateMentList" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+                
+                 <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorFive"
+                              id="editorFive"
+                              style="width: 800px"
+                              v-bind:r_content="form.treatment_plan">
+                      </editor>
+                    </keep-alive>
+                </div>
+            </div>
+
+    
+            <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
+              <el-button @click="show_dialog = false">取消</el-button>
+              <el-button type="primary"
+                         @click="createAction" :loading="uploading_new_record">保存
+              </el-button>
+            </div>
+          </div>
+        </div>
+      </el-dialog>
+      
+      <el-dialog title="编辑首次病程记录" width="60%" top="5vh" :visible.sync="edit_show_dialog">
+        <div>
+          <div class="new_record_form">
+            <div class="cell clearfix">
+              <label class="title"><span class="name">标题</span> : </label>
+               <el-input v-model="form.title" style="width:200px"></el-input>
+
+              <label class="title"><span class="name">记录医师</span>:</label>
+               <el-select v-model="form.doctor" placeholder="请选择">
+                  <el-option
+                  v-for="item in doctorList"
+                  :key="item.admin_user_id"
+                  :label="item.user_name"
+                  :value="item.admin_user_id">
+                  </el-option>
+              </el-select>
+            
+              <label class="title"><span class="name">记录日期</span> : </label>
+              <el-date-picker v-model="form.record_date"
+                    prefix-icon="el-icon-date" 
+                    style="width: 200px;"
+                    type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm"
+                    value-format="yyyy-MM-dd HH:mm">
+              </el-date-picker>   
+
+              
+            </div>
+
+             <div class="cell clearfix" style="margin-top:10px">
+              <label class="title"><span class="name">主诉内容</span> : </label>
+                <el-select v-model="form.main_content_id" placeholder="可选择病程模板" @change="changeMainContent">
+                  <el-option v-for="(option, index) in mainContentList" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+                
+                 <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorTen"
+                              id="editorTen"
+                              style="width: 800px"
+                              v-bind:r_content="form.main_content">
+                      </editor>
+                    </keep-alive>
+                </div>
+
+                <label class="title"><span class="name">病例特点</span> : </label>
+                <el-select v-model="form.patient_case_id" placeholder="可选择病程模板" @change="changePatientCase">
+                  <el-option v-for="(option, index) in patientCaseList" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+                
+                 <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorTenOne"
+                              id="editorTenOne"
+                              style="width: 800px"
+                              v-bind:r_content="form.patient_case">
+                      </editor>
+                    </keep-alive>
+                </div>
+
+                 <label class="title"><span class="name">初步诊断</span> : </label>
+                <el-select v-model="form.tentative_diagnosis_id" placeholder="可选择病程模板" @change="changeTentativeDiagnosis">
+                  <el-option v-for="(option, index) in tentativeDiagnosisList" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+                
+                 <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorTenTwo"
+                              id="editorTenTwo"
+                              style="width: 800px"
+                              v-bind:r_content="form.tentative_diagnosis">
+                      </editor>
+                    </keep-alive>
+                </div>
+
+                <label class="title"><span class="name">诊断依据</span> : </label>
+                <el-select v-model="form.diagnostic_basis_id" placeholder="可选择病程模板" @change="changeDiagnosticBasis">
+                  <el-option v-for="(option, index) in diagnosticBasisList" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+                
+                 <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorTenThree"
+                              id="editorTenThree"
+                              style="width: 800px"
+                              v-bind:r_content="form.diagnostic_basis">
+                      </editor>
+                    </keep-alive>
+                </div>
+
+                <label class="title"><span class="name">鉴别诊断</span> : </label>
+                <el-select v-model="form.differential_diagnosis_id" placeholder="可选择病程模板" @change="changeDifferentialDiagnosis">
+                  <el-option v-for="(option, index) in differentialDiagnosisList" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+                
+                 <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorTenFour"
+                              id="editorTenFour"
+                              style="width: 800px"
+                              v-bind:r_content="form.differential_diagnosis">
+                      </editor>
+                    </keep-alive>
+                </div>
+
+                <label class="title"><span class="name">诊疗计划</span> : </label>
+                <el-select v-model="form.treatment_plan_id" placeholder="可选择病程模板" @change="changeTreateMentContent">
+                  <el-option v-for="(option, index) in treateMentList" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+                
+                 <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorTenFive"
+                              id="editorTenFive"
+                              style="width: 800px"
+                              v-bind:r_content="form.treatment_plan">
+                      </editor>
+                    </keep-alive>
+                </div>
+            </div>
+
+             <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
+              <el-button @click="edit_show_dialog = false">取消</el-button>
+              <el-button type="primary"
+                         @click="updateAction" :loading="uploading_new_record">保存
+              </el-button>
+            </div>
+          </div>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+  import PatientSidebar from './components/PatientSidebar'
+  import Editor from '@/components/Editor'
+
+  import { createFirstDisease,getFirstDiseaseList,getFirstDetail,updateFirstDisease,deleteFirstDisease} from '@/api/patient'
+  import { parseTime } from '@/utils'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { uParseTime } from '@/utils/tools'
+  import { getDataConfig } from '@/utils/data'
+  import multiSelectBox from '../dialysis/details/dialog/MultiSelectBox'
+ import MsgTip from '../dialysis/details/dialog/MsgTip'
+  import { getAllDoctorList } from "@/api/device"
+  const moment = require('moment')
+  export default {
+    name: 'hospitalSummary',
+    components: {
+      PatientSidebar,
+      BreadCrumb,
+      Editor,
+      MsgTip,
+      multiSelectBox,
+    },
+    data() {
+      return {
+        InnerDialogProps: {
+          values: [],
+          visibility: false,
+          isShowTextArea: true,
+          customContent: '',
+          titles: '',
+          type: '' // 不同弹框类型，用来匹配数据
+        },
+        loading: false,
+        title: '',
+        patient_id: 0,
+        date: [],
+        start_time: '',
+        end_time: '',
+        course_of_disease_time: '',
+        records: [],
+        doctors: [],
+        current_select_record: null,
+        show_dialog: false,
+        show_edit_dialog: false,
+        uploading_new_record: false,
+        edit_show_dialog:false,
+        mainContentList: this.$store.getters.configlist.main_content,
+        patientCaseList:this.$store.getters.configlist.patient_case,
+        tentativeDiagnosisList:this.$store.getters.configlist.tentative_diagnosis,
+        diagnosticBasisList:this.$store.getters.configlist.diagnostic_basis,
+        differentialDiagnosisList:this.$store.getters.configlist.differential_diagnosis,
+        treateMentList:this.$store.getters.configlist.treatment_plan,
+        select_template: '',
+        new_content: '',
+        edit_new_content: '',
+        edit_course_of_disease_time: '',
+        selectingRows: [],
+        table_current_index: -1,
+        edit_current_id: 0,
+        edit_title: '',
+        value:'',
+        form:{
+          id:0,
+          title:"",
+          doctor:this.$store.getters.xt_user.user.id,
+          record_date:this.getTimeOne(new Date()),
+          pathology:"",
+          record_time:"",
+          main_content_id:"",
+          main_content:"",
+          patient_case_id:"",
+          patient_case:"",
+          tentative_diagnosis_id:"",
+          tentative_diagnosis:"",
+          diagnostic_basis_id:"",
+          diagnostic_basis:"",
+          differential_diagnosis_id:"",
+          differential_diagnosis:"",
+          treatment_plan_id:"",
+          treatment_plan:""
+        },
+       tableData:[],
+       docList:[],
+       doctorList:[],
+       hosDetail:{},
+       ids:"",
+       patient:{},
+      }
+    },
+    created() {
+     
+      this.patient_id = this.$route.params && this.$route.params.id
+     
+     
+      var now = new Date()
+      this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
+
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+
+      var nowDay = nowDate.getDate()
+      this.end_time =
+        nowYear +
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      nowDate.setMonth(nowDate.getMonth() - 1)
+      nowYear = nowDate.getFullYear()
+      nowMonth = nowDate.getMonth() + 1
+      nowDay = nowDate.getDate()
+      this.start_time =
+        nowYear +
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      this.other_start_time = nowYear +'-' +(nowMonth < 10 ? '0' + nowMonth : nowMonth) +'-' + (nowDay < 10 ? '0' + nowDay : nowDay)
+      
+     this.getAllDoctorList()
+     this.getlist()
+    
+    },
+    methods: {
+      getTime(val) {
+       if(val == "" || val == undefined){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
+
+      getTimeOne(val) {
+       if(val == "" || val == undefined){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
+         }
+      },
+
+      startTimeChange(val){
+       
+       this.start_time = val
+       this.getlist()
+      },
+      endTimeChange(val){
+       this.end_time = val
+       this.getlist()
+      },
+      print(){
+        this.$router.push({path:"/patient/patient/firstDisease/print?id="+this.form.id+"&patient_id="+this.patient_id})
+      },
+      tableRow(){
+
+       },
+      changeCurrentRecordTwo(row){
+       
+        this.form.id = 0
+        if(row!=null){
+          this.form.id = row.id 
+          this.getFirstDetail(row.id)
+        }
+      },
+      selectSummary(row){
+        var arr = []
+        for(let i=0;i<row.length;i++){
+          arr.push(row[i].id)
+        }
+       var ids = arr.join(",")
+       this.ids = ids
+      },
+     
+      changeMainContent(content){
+       this.form.main_content = content
+      },
+      changePatientCase(content){
+       this.form.patient_case = content
+      },
+      changeTentativeDiagnosis(content){
+      this.form.tentative_diagnosis = content
+      },
+      changeDiagnosticBasis(content){
+       this.form.diagnostic_basis =content
+      },
+      changeDifferentialDiagnosis(content){
+        this.form.differential_diagnosis = content
+      },
+      changeTreateMentContent(content){
+        this.form.treatment_plan = content
+      },
+      
+      createAction(){
+       
+         if(this.form.doctor == ""){
+            this.form.doctor = 0
+         }
+         var params = {
+          patient_id:parseInt(this.patient_id),
+          title:this.form.title,
+          main_content:this.$refs.editor.content,
+          patient_case:this.$refs.editorOne.content,
+          tentative_diagnosis:this.$refs.editorTwo.content,
+          diagnostic_basis:this.$refs.editorThree.content,
+          differential_diagnosis:this.$refs.editorFour.content,
+          treatment_plan:this.$refs.editorFive.content,
+          record_date:this.form.record_date,
+          doctor:this.form.doctor,
+         }
+         console.log("params",params)
+        
+         createFirstDisease(params).then(response=>{
+            if(response.data.state == 1){
+              var list = response.data.data.firstDisease
+             
+              this.$message.success("保存成功!")
+              this.show_dialog = false
+              this.getlist()
+            }
+         })
+      },
+      getAllDoctorList(){
+       getAllDoctorList().then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+
+            this.doctorList = list
+          }
+       })
+      },
+      getTime(val) {
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
+
+      getlist(){
+          var params = {
+            start_time:this.start_time,
+            end_time:this.end_time,
+            patient_id:parseInt(this.patient_id),
+          }
+        getFirstDiseaseList(params).then(response=>{
+           if(response.data.state ==1){
+             var list =  response.data.data.list
+             this.tableData = list
+           }
+        })
+      },
+      getDoctor(id){
+        var name = ""
+        for(let i=0;i<this.doctorList.length;i++){
+          if(id == this.doctorList[i].admin_user_id){
+             name = this.doctorList[i].user_name
+          }
+        }
+        return name
+      },
+      getFirstDetail(id){
+        getFirstDetail(id).then(response=>{
+           if(response.data.state == 1){
+             var detail = response.data.data.detail
+            
+             this.hosDetail = detail
+           }
+        })
+      },
+      getHospitalSummaryDetailOne(id){
+        getFirstDetail(id).then(response=>{
+           if(response.data.state == 1){
+             var detail = response.data.data.detail
+             console.log("detial------",detail)
+             if(detail.doctor == 0){
+               this.form.doctor = ""
+             }
+             this.form.id = detail.id
+             this.form.title = detail.title
+             this.form.record_date = this.getTimeOne(detail.record_date)
+             this.form.doctor = detail.doctor
+             this.form.main_content = detail.main_content
+             this.form.patient_case = detail.patient_case
+             this.form.tentative_diagnosis = detail.tentative_diagnosis
+             this.form.diagnostic_basis = detail.diagnostic_basis
+             this.form.differential_diagnosis = detail.differential_diagnosis
+             this.form.treatment_plan =detail.treatment_plan
+             this.edit_show_dialog = true
+           }
+        })
+      },
+      toEdit(){
+        this.getHospitalSummaryDetailOne(this.form.id)
+      },
+      updateAction(){
+    
+        if(this.form.doctor == ""){
+            this.form.doctor = 0
+         }
+         if(this.form.dean == ""){
+           this.form.dean = 0
+         }
+
+         var main_content = ""
+         var patient_case = ""
+         var tentative_diagnosis = ""
+         var diagnostic_basis = ""
+         var differential_diagnosis = ""
+         var treatment_plan = ""
+         if(this.$refs.editorTen.content == ""){
+            main_content = this.hosDetail.main_content
+         }else{
+           main_content = this.$refs.editorTen.content
+         }
+
+         if(this.$refs.editorTenOne.content == ""){
+            patient_case = this.hosDetail.patient_case
+         }else{
+            patient_case = this.$refs.editorTenOne.content
+         }
+
+         if(this.$refs.editorTenTwo.content == ""){
+            tentative_diagnosis = this.hosDetail.tentative_diagnosis
+         }else{
+            tentative_diagnosis = this.$refs.editorTenTwo.content 
+         }
+
+         if(this.$refs.editorTenThree.content == ""){
+             diagnostic_basis = this.hosDetail.diagnostic_basis
+         }else{
+            diagnostic_basis = this.$refs.editorTenThree.content
+         }
+
+         if(this.$refs.editorTenFour.content == ""){
+            differential_diagnosis = this.hosDetail.differential_diagnosis
+         }else{
+            differential_diagnosis = this.$refs.editorTenFour.content
+         }
+
+         if(this.$refs.editorTenFive.content == ""){
+            treatment_plan = this.hosDetail.treatment_plan
+         }else{
+             treatment_plan = this.$refs.editorTenFive.content
+         }
+      
+         var params = {
+          id:this.form.id,
+          patient_id:parseInt(this.patient_id),
+          title:this.form.title,
+          doctor:this.form.doctor,
+          record_date:this.form.record_date,
+          main_content:main_content,
+          patient_case:patient_case,
+          tentative_diagnosis:tentative_diagnosis,
+          diagnostic_basis:diagnostic_basis,
+          differential_diagnosis:differential_diagnosis,
+          treatment_plan:treatment_plan,
+         }
+         console.log("poarams2323322323",params)
+        updateFirstDisease(params).then(response=>{
+          if(response.data.state == 1){
+            var detail = response.data.data.detail
+            this.edit_show_dialog = false
+            // this.$refs.monthlyPlanTable.setCurrentRow(detail)
+            this.getlist()
+          }
+        }) 
+      },
+      deleteAction(){
+          if(this.ids.length == 0){
+            this.$message.error("请勾选需要删除的数据")
+            return false
+          }
+          this.$confirm('确认删除吗?', '删除', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+         }).then(() => {
+            var params = {
+              ids:this.ids,
+            }
+            deleteFirstDisease(params).then(response => {
+              if (response.data.state == 1) {
+                  var msg = response.data.data.msg
+                  this.getlist()
+                  this.$message.success("删除成功")
+              } else {
+                  this.$message.error("删除失败")
+              }
+            })
+          }).catch(() => {
+          }) 
+      },
+      addAction(){
+        this.form.title = ""
+        this.form.main_content = ""
+        this.form.patient_case = ""
+        this.form.tentative_diagnosis = ""
+        this.form.diagnostic_basis = ""
+        this.form.differential_diagnosis = ""
+        this.form.treatment_plan = ""
+        
+        this.show_dialog = true
+      },
+     
+    },
+    watch: {
+      tableData: function() {
+        this.$nextTick(function() {
+          this.$refs.monthlyPlanTable.setCurrentRow(this.tableData[0])
+        })
+      }
+    },
+  
+    
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .borderBox{
+    border: 1px solid #DCDFE6;
+    padding: 10px;
+    margin-top: 10px;
+    border-radius: 4px;
+    p{
+      font-weight: bold;
+      font-size: 20px;
+      margin: 10px 0;
+    }
+  }
+  .container {
+    margin-left: 180px;
+    padding: 20px;
+    background: #fff;
+    min-height: calc(100vh - 173px);
+    margin-bottom: 15px;
+
+  .record {
+    padding-top: 20px;
+  }
+
+  }
+  .record_content_panel {
+    border-width: 1px;
+    border-style: solid;
+    border-color: #ebeef5;
+    min-height: 200px;
+
+  .title {
+    font-size: 14px;
+    font-weight: 500;
+    color: #909399;
+    line-height: 44px;
+    height: 44px;
+    text-align: center;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+    border-bottom-color: #ebeef5;
+  }
+
+  .content {
+    padding: 12px 15px;
+    font-size: 15px;
+    color: gray;
+    line-height: 22px;
+  }
+
+  }
+
+  .new_record_form {
+
+  /*/ / padding: 10 px, 25 px;*/
+
+  .textarea_panel {
+    margin-top: 10px;
+  }
+
+  }
+</style>
+<style>
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+.el-select-dropdown {
+  max-width: 1000px !important;
+}
+</style>

src/xt_pages/user/firstDiseasePrint.vue

@@ -0,0 +1,413 @@
+<template>
+  <div class="main-contain">
+
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button size="small" icon="el-icon-printer" @click="printAction" type="primary">打印
+      </el-button>
+    </div>
+    <div class="app-container">
+      <div id="print_content">
+        <div class="print_page_main_content">
+           <div class="order-yy-name"></div>
+          <!-- <div class="order_title" style="padding-top:12px;text-align:center;">首次病程记录</div>
+        -->
+          <h1 style="text-align:center;">首次病程记录</h1>
+          <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;">
+            <div class="inline_block;">
+              <div style="font-size:20px">{{getTime(hosDetail.record_date)}}</div>
+            </div>
+            <div class="inline_block" style="margin-left: 30px">
+                   <div v-html="hosDetail.main_content"> </div>
+            </div>
+
+            <div class="inline_block" style="width:100%;">
+               <span style="font-size:20px">病例特点：</span>
+                <div v-html="hosDetail.patient_case" class="printP" style="text-indent:20px">
+
+              </div>
+            </div>
+
+             <div class="inline_block" style="width:100%;">
+              <span style="font-size:20px">初步诊断：</span>
+              <div v-html="hosDetail.tentative_diagnosis" class="printP" style="text-indent:20px">
+
+              </div>
+             </div>
+
+             <div class="inline_block" style="width:100%;">
+              <span style="font-size:20px"> 诊断依据：</span>
+              <div v-html="hosDetail.diagnostic_basis" class="printP" style="text-indent:20px">
+
+              </div>
+             </div>
+
+             <div class="inline_block" style="width:100%;">
+                <span  style="font-size:20px">鉴别诊断：</span> 
+                <div v-html="hosDetail.differential_diagnosis" class="printP" style="text-indent:20px">
+
+                </div>
+              </div>
+
+              <div class="inline_block" style="width:100%;">
+                 <span style="font-size:20px">诊疗计划：</span>
+                <div v-html="hosDetail.treatment_plan" class="printP" style="text-indent:20px">
+
+                </div>
+              </div>
+
+             <div class="inline_block" style="float:right;margin-right:50px">
+               <span style="font-size:20px">医生签名：</span>
+                <span v-if="setAdminUserES(hosDetail==null?0:(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor)) == ''">
+                  {{getDoctor(hosDetail==null?0:(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor))}}
+                  </span>
+                  <span v-else>
+                    <img style="height:30px;" :src="setAdminUserES(hosDetail==null?0:(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor))" alt="" srcset="">
+                  </span>
+              </div>
+          </div>
+
+        
+        </div>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<script>
+import { jsGetAge, uParseTime } from '@/utils/tools'
+import LabelBox from '../dialysis/printItem/LabelBox'
+import CheckBox from '../dialysis/batch_print/option_check_box'
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import {getFirstDetail,getPatientInfo} from "@/api/patient"
+import { getAllDoctorList } from "@/api/device"
+import { getDataConfig } from "@/utils/data";
+export default {
+  name: 'dialysisPrintOrderOne',
+  components: {
+    LabelBox,
+    BreadCrumb,
+    CheckBox
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: '透析管理' },
+        { path: false, name: '打印单' }
+      ],
+     hosDetail:{},
+     patient:{},
+     doctorList:[],
+    educationOptions:[],
+    operators:[],
+    operatorMaps: {},
+    }
+  },
+  methods: {
+    getDatge(value) {
+      var times = Date.parse(value) / 1000
+      var timestr = uParseTime(times, '{y}年{m}月{d}日')
+      return timestr
+    },
+    getTime(val) {
+       if(val == "" || val == undefined){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
+         }
+    },
+    printThisPage() {
+        var ptime = Math.round(new Date().getTime() / 1000)
+        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
+        const style ='@media print {.dialysis-print-order{width:960px;margin:0 auto;letter-spacing:5px} .dialysis-print-order p{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;font-weight: bold;margin: 10px 0;}'
+        printJS({
+            printable: 'dialysis-print-box',
+            type: 'html',
+            style: style,
+            scanStyles: false
+        })
+      
+    },
+  
+    getAge: function(val) {
+      if (val.birthday != 0) {
+        return jsGetAge(val.birth, '-')
+      } else {
+        return ''
+      }
+    },
+  
+    getNewAge(UUserCard) {
+      if (UUserCard != null && UUserCard != '') {
+        // 获取年龄
+        var myDate = new Date()
+        var month = myDate.getMonth() + 1
+        var day = myDate.getDate()
+        var age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1
+        if (UUserCard.substring(10, 12) < month || UUserCard.substring(10, 12) == month && UUserCard.substring(12, 14) <= day) {
+          age++
+        }
+        return age
+      }
+    },
+    getFirstDetail(id){
+       getFirstDetail(id).then(response=>{
+        if(response.data.state == 1){
+            var detail = response.data.data.detail
+        
+            this.hosDetail = detail
+        }
+     })
+    },
+    getlist(){
+       var params = {
+         patient_id:parseInt(this.$route.query.patient_id),
+       }
+       console.log("param223322322323",params)
+      getPatientInfo(params).then(response=>{
+         if(response.data.state == 1){
+           var patient = response.data.data.patient
+           this.patient = patient
+         }
+      })
+    },
+    getAllDoctorList(){
+      getAllDoctorList().then(response=>{
+        if(response.data.state == 1){
+        var list = response.data.data.list
+         this.doctorList = list
+         this.operators = response.data.data.operators
+           if (this.operators.length > 0) {
+            var operatorsLen = this.operators.length
+            for (var index = 0; index < operatorsLen; index++) {
+              this.$set(
+                this.operatorMaps,
+                this.operators[index].creator,
+                this.operators[index]
+              )
+            }
+          }
+        }
+       })
+     },
+     getDoctor(id){
+        var name = ""
+        for(let i=0;i<this.doctorList.length;i++){
+          if(id == this.doctorList[i].admin_user_id){
+             name = this.doctorList[i].user_name
+          }
+        }
+        return name
+    },
+    getProfession(id){
+      var name = ""
+      for(let i=0;i<this.educationOptions.length;i++){
+          if(id == this.educationOptions[i].id){
+           name = this.educationOptions[i].name
+          }
+      }
+      return name
+    },
+    getTimeDay(start,end){
+      var count = ""
+      count = (end-start)/86400
+      return count + 1
+    },
+    printAction: function() {
+      const style = '@media print {.printP div{margin-bottom:5px;} .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: 20px;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: 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-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:1000px;}.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;}'
+      printJS({
+        printable: 'print_content',
+        type: 'html',
+        documentTitle: '  ',
+        style: style,
+        scanStyles: false
+      })
+    },
+    getDoctor(id){
+      var name = ""
+      for(let i=0;i<this.doctorList.length;i++){
+          if(id == this.doctorList[i].admin_user_id){
+             name = this.doctorList[i].user_name
+          }
+        }
+       return name
+     },
+    setAdminUserES(id) {
+      if (id === 0) {
+        return ''
+      }
+      if (id in this.operatorMaps) {
+        return this.operatorMaps[id].url
+      } else {
+        return ''
+      }
+    },
+  },
+ 
+  created() {
+    this.educationOptions = getDataConfig("patient", "profession_options");
+    var xtuser = this.$store.getters.xt_user
+    this.orgname = xtuser.org.org_name
+    var id = this.$route.query.id
+    this.getlist()
+    this.getFirstDetail(id)
+    this.getAllDoctorList()
+    
+  }
+}
+</script>
+
+<style>
+.borderBox  p{
+  font-weight: bold;
+  margin: 10px 0;
+}
+.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: 40px;
+  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;
+}
+.parent {
+  text-align: left;
+  padding-left: 20px !important;
+}
+</style>

src/xt_pages/user/hospitalSummaryPrint.vue

@@ -65,7 +65,17 @@
               </span>
             </td>
           </tr>
-
+          <tr>
+            <td style="text-align:center;width:100px" colspan="1">
+              身份证:
+            </td>   
+            <td style="text-align:left;width:500px" colspan="12">
+            
+              <span style="display:inline-block;margin-left:10px;">
+                {{patient.id_card_no}}
+              </span>
+            </td>   
+          </tr>
           <tr>
             <td style="text-align:center;width:100px" colspan="1">
               住址:

src/xt_pages/user/vascularAccess.vue

@@ -9,7 +9,7 @@
       <el-table class="oictable" :data="tableData" border style="width:100%">
       <el-table-column prop="start_time" label="建立日期" width="100" align="center">
           <template slot-scope="scope">
-            <span>{{ getTime(scope.row.start_time, "{y}-{m}-{d}")}}</span>
+            <span>{{ getTime(scope.row.start_time)}}</span>
           </template>
      </el-table-column>
       <el-table-column prop="blood_access_part_opera_id" label="血管通路" align="center" width="120">
@@ -34,13 +34,13 @@
       </el-table-column>
       <el-table-column prop="date" label="首次启用日期" width="120" align="center">
           <template slot-scope="scope">
-            <span>{{ getTime(scope.row.first_start_time, "{y}-{m}-{d}")}}</span>
+            <span>{{ getTime(scope.row.first_start_time)}}</span>
           </template>
       </el-table-column>
      
        <el-table-column prop="date" label="停用日期" align="center" width="100">
           <template slot-scope="scope">
-            <span v-if="scope.row.stop_time>0">{{ getTime(scope.row.stop_time, "{y}-{m}-{d}")}}</span>
+            <span v-if="scope.row.stop_time>0">{{ getTime(scope.row.stop_time)}}</span>
              <span v-if="scope.row.stop_time<0"></span>
           </template>
       </el-table-column>
@@ -673,12 +673,24 @@
            }  
         })   
       },
-     getTime(value, temp) {
-        if (value != undefined) {
-            return uParseTime(value, temp);
-        }
-        return "";
-     },
+   //   getTime(value, temp) {
+        
+   //      if (value != undefined) {
+   //          return uParseTime(value, temp);
+   //      }
+
+   //      return "";
+   //   },
+     getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
      handleUpdateAdviceTemplate(id){
         getVascularAccessByDetail(id).then(response=>{
            if(response.data.state ==1){
@@ -739,7 +751,7 @@
               }
              this.form.blood_access_part_opera_id = blood_part
 
-             this.form.first_start_time = this.getTime(accessDetail.first_start_time,"{y}-{m}-{d}")
+             this.form.first_start_time = this.getTime(accessDetail.first_start_time)
 
              var inflow_id = 0
              for(let i=0;i<this.optionsPass.length;i++){
@@ -749,9 +761,9 @@
              }
              this.form.inflow_pass = inflow_id
              this.form.remark = accessDetail.remark
-             this.form.start_time = this.getTime(accessDetail.start_time,"{y}-{m}-{d}")
+             this.form.start_time = this.getTime(accessDetail.start_time)
              this.form.stop_reason = accessDetail.stop_reason
-             this.form.stop_time = this.getTime(accessDetail.stop_time,"{y}-{m}-{d}")
+             this.form.stop_time = this.getTime(accessDetail.stop_time)
  
              this.form.user_status = accessDetail.user_status
              this.form.other_vascular = accessDetail.other_vascular

src/xt_pages/workforce/appointment.vue

@@ -68,29 +68,29 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
       <div style="display:flex;align-items:center">
         <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印排班</el-button>
-        <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel>
+        <!-- <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel> -->
         <!-- <el-button @click="printTable" type="primary" size="small">打印排班</el-button> -->
         <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
           导出排班
         </el-button>
-        <el-button
+        <!-- <el-button
             @click="generateLog()"
             class="filter-item"
             type="primary"
             v-if="is_edit"
             size="small"
         >下载日志
-        </el-button>
+        </el-button> -->
         <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
         </el-button>
-        <el-button type="primary" size="small" @click="copySchedule" v-if="is_edit">复制排班</el-button>
-        <el-button type="primary" size="small" v-if="is_edit" @click="smartsch">智能排班</el-button>
+        <!-- <el-button type="primary" size="small" @click="copySchedule" v-if="is_edit">复制排班</el-button>
+        <el-button type="primary" size="small" v-if="is_edit" @click="smartsch">智能排班</el-button> -->
         <el-button type="primary" size="small" v-if="!is_edit" @click="editsch">编辑排班</el-button>
-        <el-button type="danger" size="small" v-if="is_edit" @click="is_edit = false ">退出编辑</el-button>
+        <!-- <el-button type="danger" size="small" v-if="is_edit" @click="outisedit">退出编辑</el-button> -->
       </div>
     </div>
     <div class="app-container">
-      <div style="right:30px;position:fixed;z-index:99">
+      <div style="right:30px;position:absolute;z-index:99">
         <span>导出周次:</span>
         <el-date-picker
             v-model="weekTime"
@@ -119,10 +119,6 @@
 
       </el-tabs>
 
-      <!-- </el-col>
-    </el-row> -->
-<!--  -->
-
       <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
                   :schedule-zone-row-prop="scheduleZoneRow"
                   :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
@@ -130,10 +126,36 @@
       </table-data>
 
       <edit-table-data ref="edittableData"  :week-time="activeName" :partitions-prop="partitions"
-                       :schedule-zone-row-prop="scheduleZoneRow"
-                       :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
-                       @event2="changeSchedule" v-if="is_edit" @event3="changeWeekDay"></edit-table-data>
-
+                        :schedule-zone-row-prop="scheduleZoneRow" :schedule-zone-prop="scheduleZone"
+                         title="" @event1="changePartition"
+                         @event2="changeSchedule" v-if="is_edit" @event3="changeWeekDay">
+                      
+        <div class="position">
+          <!-- <bread-crumb :crumbs="crumbs"></bread-crumb> -->
+          <div></div>
+        <div style="display:flex;align-items:center">
+          <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印排班</el-button>
+          <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel>
+          <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
+            导出排班
+          </el-button>
+          <el-button
+              @click="generateLog()"
+              class="filter-item"
+              type="primary"
+              v-if="is_edit"
+              size="small"
+          >下载日志 
+          </el-button>
+          <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
+          </el-button>
+          <el-button type="primary" size="small" @click="copySchedule" v-if="is_edit">复制排班</el-button>
+          <el-button type="primary" size="small" v-if="is_edit" @click="smartsch">智能排班</el-button>
+          <el-button type="primary" size="small" v-if="!is_edit" @click="editsch">编辑排班</el-button>
+          <el-button type="danger" size="small" v-if="is_edit" @click="outisedit">退出编辑</el-button>
+        </div>
+      </div>
+        </edit-table-data>
 
       <el-dialog title="复制排班" width="600px" :visible.sync="newVisible">
         <el-form :model="form" ref="form" label-width="90px" :rules="rules">
@@ -225,6 +247,7 @@ export default {
       days: [],
       logs: [],
       is_edit: false,
+      schedulingTableVisible:false,//全屏
       scheduleZoneRow: [],
       downloadLoading: false,
       msgTipVisible: false,
@@ -276,7 +299,8 @@ export default {
     ScheduleUploadExcel,
     tableData,
     BreadCrumb,
-    UploadExcel
+    UploadExcel,
+
   },
   methods: {
     dragstart(event, item) {
@@ -644,20 +668,16 @@ export default {
         // console.log("111111111")
         // console.log(that.scheduleZone)
       })
-    },changeSch(val){
+    },
+    changeSch(val){
       // console.log(this.partitions)
       // console.log(this.scheduleZoneRow)
       // console.log(this.scheduleZone)
 
-
-
-    },changeWeekType(val){
-
-
-
-    },changeZone(val){
-
-
+    },
+    changeWeekType(val){
+    },
+    changeZone(val){
     },
     setScheduleTemplateAction: function () {
       this.$router.push({path: '/workforce/template'})
@@ -665,7 +685,8 @@ export default {
     export_file: function () {
       // this.getWeekPanelsTwo()
       this.export_file_step_two()
-    },export_file_step_two: function(){
+    },
+    export_file_step_two: function(){
 
       this.downloadLoading = true
       import('@/vendor/Export2Excel').then(excel => {
@@ -2871,16 +2892,23 @@ export default {
 
     getTime(val) {
       return uParseTime(val, '{y}-{m}-{d}')
-    }, smartsch(){
+    },
+     smartsch(){
       this.$nextTick(function() {
         this.$refs.edittableData.showSmartDialog()
       })
-    },editsch() {
+    },
+    editsch() {
       this.is_edit = true
-      this.$nextTick(function() {
+      this.schedulingTableVisible=true
+      this.$nextTick(function() {//, this.days,this.zones
         this.$refs.edittableData.setEditData(this.patientList, this.$store.getters.treatment_mode, this.days,this.zones)
       })
     },
+    outisedit(){
+      this.is_edit=false
+      this.schedulingTableVisible=false
+    },
     copySchedule() {
       this.newVisible = true
     },
@@ -3006,7 +3034,8 @@ export default {
           this.templateObj = template
         }
       })
-    },getPatientList(){
+    },
+    getPatientList(){
       patientLists().then(response => {
         if (response.data.state == 1) {
           var patientList = response.data.data.list

src/xt_pages/workforce/components/ScheduleItem.vue

@@ -1,11 +1,11 @@
 <template>
+  <!-- 排班表填充内容 -->
     <div >
 
             <div>
                 <span :class='modeColor(scheduleDetail.mode_name)'>{{scheduleDetail.patient}}</span><br/>
                 <span v-if="scheduleDetail.mode_name.length>0" :class='modeColor(scheduleDetail.mode_name)'>({{scheduleDetail.mode_name}})</span>
-              <span >{{scheduleDetail.dialysis_machine_name}}</span>
-
+              <span v-if="schedulFlag">{{scheduleDetail.dialysis_machine_name}}</span>
             </div>
     </div>
 </template>
@@ -26,8 +26,16 @@ export default {
               }
           },
       },
+      schedulFlag:{
+        type:Boolean,
+        default:false
+      }
+  },
+  data() {
+    return {
+      schedul:false
+    }
   },
-
 
   methods:{
         modeColor(name){
@@ -45,7 +53,7 @@ export default {
 
 <style lang="scss" scoped>
 .modeRed{
-  color:#ed5555;
+  color:#ee780a;
 }
 .modePurple{
   color: #53b86e;

src/xt_pages/workforce/components/template_table.vue

@@ -27,7 +27,7 @@
           <div style="margin-bottom: 10px; display: flex">
             <h3 style="line-height: 45px">
               <span
-                style="margin-right: 30px; font-size: 16px; white-space: nowrap"
+                style="margin-right: 15px; font-size: 16px; white-space: nowrap"
               >当前选择</span
               >
             </h3>
@@ -71,7 +71,7 @@
                     <el-table-column
                       prop="name"
                       label="患者名称"
-                      width="104"
+                      
                       align="center"
                     >
                     </el-table-column>
@@ -92,7 +92,7 @@
                     <el-table-column
                       prop="name"
                       label="透析模式"
-                      width="104"
+
                       align="center"
                     ></el-table-column>
                   </el-table>
@@ -102,22 +102,8 @@
           </div>
         </div>
         <div class="right_contain">
-          <!--          <span>分区：</span>-->
-          <!--          <el-select-->
-          <!--              v-model="partition_id"-->
-          <!--              multiple-->
-          <!--              placeholder="请选择"-->
-          <!--              @change="changePartiton"-->
-          <!--          >-->
-          <!--            <el-option-->
-          <!--                v-for="item in this.all_zones"-->
-          <!--                :key="item.id"-->
-          <!--                :label="item.name"-->
-          <!--                :value="item.id"-->
-          <!--            >-->
-          <!--            </el-option>-->
-          <!--          </el-select>-->
           <el-table
+            :fit="true"
             :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
             ref="table"
             :data="opera_device_numbers"
@@ -125,32 +111,31 @@
             show-summary
             height="675"
             style="width: 100%; cursor: pointer"
-
-            :summary-method="getSummaries"
             row-class-name="table-row-new-class schedule-table-row"
+            :summary-method="getSummaries"
             @cell-click="itemClick"
             sum-text="总数"
           >
+          <!--   -->
             <el-table-column
               label="分区"
-              width="80"
+              min-width="50"
               align="center"
               fixed
-              style="width: 100px; background-color: red; display: block"
             >
               <template slot-scope="scope">
                 {{ scope.row.zone.name }}
               </template>
             </el-table-column>
 
-            <el-table-column label="机号" width="80" align="center" fixed>
+            <el-table-column label="机号" min-width="40" align="center" fixed>
               <template slot-scope="scope">
                 <div>{{ scope.row.number }}</div>
               </template>
             </el-table-column>
 
-            <el-table-column label="周一" width="335" align="center">
-              <el-table-column prop="1_1" label="上" width="110" align="center">
+            <el-table-column label="周一"  align="center">
+              <el-table-column prop="1_1" label="上" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -187,7 +172,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="1_2" label="下" width="110" align="center">
+              <el-table-column prop="1_2" label="下" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -224,7 +209,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="1_3" label="晚" width="110" align="center">
+              <el-table-column prop="1_3" label="晚" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -263,8 +248,8 @@
               </el-table-column>
             </el-table-column>
 
-            <el-table-column label="周二" width="335" align="center">
-              <el-table-column prop="2_1" label="上" width="110" align="center">
+            <el-table-column label="周二"  align="center">
+              <el-table-column prop="2_1" label="上" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -300,7 +285,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="2_2" label="下" width="110" align="center">
+              <el-table-column prop="2_2" label="下" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -337,7 +322,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="2_3" label="晚" width="110" align="center">
+              <el-table-column prop="2_3" label="晚" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -376,8 +361,8 @@
               </el-table-column>
             </el-table-column>
 
-            <el-table-column label="周三" width="335" align="center">
-              <el-table-column prop="3_1" label="上" width="110" align="center">
+            <el-table-column label="周三"  align="center">
+              <el-table-column prop="3_1" label="上" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -414,7 +399,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="3_2" label="下" width="110" align="center">
+              <el-table-column prop="3_2" label="下" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -451,7 +436,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="3_3" label="晚" width="110" align="center">
+              <el-table-column prop="3_3" label="晚" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -490,8 +475,8 @@
               </el-table-column>
             </el-table-column>
 
-            <el-table-column label="周四" width="335" align="center">
-              <el-table-column prop="4_1" label="上" width="110" align="center">
+            <el-table-column label="周四"  align="center">
+              <el-table-column prop="4_1" label="上" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -528,7 +513,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="4_2" label="下" width="110" align="center">
+              <el-table-column prop="4_2" label="下" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -565,7 +550,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="4_3" label="晚" width="110" align="center">
+              <el-table-column prop="4_3" label="晚" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -604,8 +589,8 @@
               </el-table-column>
             </el-table-column>
 
-            <el-table-column label="周五" width="335" align="center">
-              <el-table-column prop="5_1" label="上" width="110" align="center">
+            <el-table-column label="周五" align="center">
+              <el-table-column prop="5_1" label="上" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -642,7 +627,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="5_2" label="下" width="110" align="center">
+              <el-table-column prop="5_2" label="下" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -679,7 +664,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="5_3" label="晚" width="110" align="center">
+              <el-table-column prop="5_3" label="晚" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -718,8 +703,8 @@
               </el-table-column>
             </el-table-column>
 
-            <el-table-column label="周六" width="335" align="center">
-              <el-table-column prop="6_1" label="上" width="110" align="center">
+            <el-table-column label="周六"  align="center">
+              <el-table-column prop="6_1" label="上" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -756,7 +741,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="6_2" label="下" width="110" align="center">
+              <el-table-column prop="6_2" label="下" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -793,7 +778,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="6_3" label="晚" width="110" align="center">
+              <el-table-column prop="6_3" label="晚" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -832,11 +817,11 @@
               </el-table-column>
             </el-table-column>
 
-            <el-table-column label="周日" min-width="335" align="center">
+            <el-table-column label="周日" align="center">
               <el-table-column
                 prop="7_1"
                 label="上"
-                min-width="110"
+                min-width="40"
                 align="center"
               >
                 <template slot-scope="scope">
@@ -878,7 +863,7 @@
               <el-table-column
                 prop="7_2"
                 label="下"
-                min-width="110"
+                min-width="40"
                 align="center"
               >
                 <template slot-scope="scope">
@@ -920,7 +905,7 @@
               <el-table-column
                 prop="7_3"
                 label="晚"
-                min-width="110"
+                min-width="40"
                 align="center"
               >
                 <template slot-scope="scope">
@@ -961,7 +946,7 @@
               </el-table-column>
             </el-table-column>
 
-            <el-table-column
+            <!-- <el-table-column
               prop="total"
               label="总数"
               width="60"
@@ -971,7 +956,7 @@
               <template slot-scope="scope">
                 {{ scope.row.total }}
               </template>
-            </el-table-column>
+            </el-table-column> -->
           </el-table>
         </div>
       </div>
@@ -1353,7 +1338,7 @@ export default {
 
       partition_id: 0,
       tableHeight: document.documentElement.clientHeight,
-      template:null,
+      template:0,
       all_template:[],
       active_name:"first",
     };
@@ -2097,9 +2082,11 @@ export default {
       console.log("saveData")
       console.log(tempData)
       this.$emit("saveData", tempData,delData);
-    },changeJihao(){
+    },
+    changeJihao(){
       this.$forceUpdate()
-    },changeSchMachine(row) {
+    },
+    changeSchMachine(row) {
       let params = {
         zone_id: row.zone_id,
         sch_type: row.time_type,
@@ -2368,7 +2355,8 @@ export default {
 
       }
 
-    },    deepClone(source) {
+    }, 
+    deepClone(source) {
       if (!source && typeof source !== 'object') {
         throw new Error('error arguments', 'shallowClone')
       }
@@ -2580,7 +2568,8 @@ export default {
 
       }, 1000);
 
-    },curInfoDragStart(){
+    },
+    curInfoDragStart(){
       this.cur_drag_obj = 1
       this.cur_drag_info.patient_id = this.cur_info.patient_id
       this.cur_drag_info.patient_name = this.cur_info.patient_name
@@ -2807,7 +2796,8 @@ export default {
       this.all_zones = this.unique_two(this.all_zones);
 
       return maked_device_numbers;
-    },   coverSch(){
+    },  
+    coverSch(){
       let params={
         template_id:this.template.id,
         week_type_one:this.cur_drag_info.schedule_week,
@@ -2936,7 +2926,8 @@ export default {
           };
         }
       }
-    }, search_two: function () {
+    }, 
+    search_two: function () {
       if (this.keywords.length == 0) {
         this.patients = this.all_patients;
       } else {
@@ -3002,6 +2993,21 @@ export default {
       // else {
       //   this.$refs.selector_dialog.showWith(item.pid, item.treat_mode_id, weekday, time_type, device_number_id)
       // }
+      // console.log('row[column.property]',row[column.property]);
+      //   if (row[column.property].schedule_id > 0) {
+      //     let patient_id = row[column.property].patient_id
+      //       this.patient_id_hover = patient_id;
+      //   } else {
+      //     this.patient_id_hover = -1;
+      //     this.currentData.mode_id = 1;
+      //     this.currentData.id = 0;
+      //     this.currentData.patient_id = 0;
+      //     this.currentData.patient = "";
+      //     this.currentData.contagions = [];
+      //     this.getSchedulePatients();
+      //     this.dialogTableVisible = true;
+          
+      //   }
     },
     will_add_schedule_actionTwo: function (
       patient_id,
@@ -3364,7 +3370,8 @@ export default {
         this.data.push(obj);
         this.$refs.selector_dialog.hide();
       }
-    },    saveActionFour: function () {
+    }, 
+    saveActionFour: function () {
       var add_items = [];
       var del_items = [];
       var change_items = [];
@@ -3769,32 +3776,50 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-// /deep/ .el-dialog__wrapper {
-//   .el-dialog {
-     //     background: red;
-//     .el-dialog__header {
-       //       color: #fff;
-       //       background-color: #409eff !important;
-       //       border-color: #409eff;
-       //     }
-//   }
-// }
 .table_contain {
   display: flex;
 
 .left_contain {
-  width: 230px;
+  width: 14%;
   margin-right: 15px;
+  .item{
+    width: 115px;
+    padding: 6px 5px;
+    margin: 0px 5px ;
+    // border: solid 1px #eee;
+    text-align: left;
+  }
 }
 
 .right_contain {
-  width: 84%;
+  width: 86%;
+  .el-table{
+    padding: 0 !important;
+  }
+  .del_table_btn{
+    position: absolute;
+    right: 0px;
+    top: -3px;
+    // visibility: hidden;
+    .el-button {
+      width: 15px;
+      height: 15px;
+      padding: 0px;
+    }
+  }
 }
+
+// .el-table th .cell, .el-table td .cell {
+//     margin: 0;
+//     padding: 0 0px;
+// }
+// .el-table--medium td, .el-table--medium th {
+//     padding: 5px 0 !important;
+// }
 }
 .schedule-table-row {
   background: #fff !important;
 }
-
 .schedule-table-row:hover {
   background: #fff !important;
 }
@@ -3809,7 +3834,7 @@ export default {
 }
 
 #table_data {
-  /*min-height: calc(100vh - 350px);*/
+  min-height: calc(100vh - 350px);
 }
 
 #table_data ::-webkit-scrollbar {
@@ -3836,27 +3861,27 @@ export default {
 }
 }
 
-#table_data {
-  min-height: calc(100vh - 350px);
-}
+// #table_data {
+//   min-height: calc(100vh - 350px);
+// }
 
 #table_data ::-webkit-scrollbar {
   height: 15px;
 }
 
-.del_table_btn {
-  position: absolute;
-  right: 0px;
-  top: -3px;
-  z-index: 999;
-  visibility: hidden;
-
-.el-button {
-  width: 15px;
-  height: 15px;
-  padding: 0px;
-}
-}
+// .del_table_btn {
+//   position: absolute;
+//   right: 0px;
+//   top: -3px;
+//   z-index: 999;
+//   visibility: hidden;
+
+// .el-button {
+//   width: 15px;
+//   height: 15px;
+//   padding: 0px;
+// }
+// }
 
 #table_data {
   min-height: calc(100vh - 350px);
@@ -3911,7 +3936,7 @@ export default {
 }
 }
 
-.el-dialog__header {
-  padding: 0 !important;
-}
+// .el-dialog__header {
+//   padding: 0 !important;
+// }
 </style>

src/xt_pages/workforce/printOne.vue

@@ -60,7 +60,7 @@
                     <div style="min-height: 80px">
                       <div class="proj">
                         <div class="proj_item">
-                          <p v-html="getPatientName(item.schedule_type,it.partition_id)" class="zone_name">
+                          <p v-html="getPatientName(item.schedule_type,it.partition_id)" class="zone_name" style="font-size:20px">
                             
                           </p>
                         </div>
@@ -665,7 +665,7 @@ export default {
           if (this.hiddenFlag) {
             str += arr[i].name + '&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp '
           } else {
-            str += arr[i].name + '(' + '上次床位:' + arr[i].order.DeviceNumber.zone.name + '-' + arr[i].order.DeviceNumber.number + '  ' + '血管通路:' + this.getBloodAccess(arr[i].order.blood_access_id) + '  ' + '上机备注:' + arr[i].order.order_remark + ')<br/>'
+            str += arr[i].name + '(' + '上次床位:' + arr[i].order.DeviceNumber.zone.name + '-' + arr[i].order.DeviceNumber.number + '  ' + '血管通路:' + this.getBloodAccess(arr[i].order.blood_access_id) + '  ' + '排班备注:' + arr[i].order.schedule_remark + ')<br/>'
           }
         }
       }

src/xt_pages/workforce/remind_print_setting.vue

@@ -19,7 +19,51 @@
         <div class="print_main_content">
           <div class="table_panel">
             <div v-for="(main_collection,index) in scheduleData" :key="index" style="page-break-after: always;">
-              <div class="signPrint" v-if="org_id != 10188 && org_id!=10217  && org_id!=10340 && org_id!=9671 && org_id!=9675">
+              <div class="signPrint" v-if="org_id != 10188  && org_id!=10340 && org_id!=9671 && org_id!=9675">
+                <div>
+                  <span v-if="printObj.mode == 1">透析模式:
+                    <span v-if="main_collection.mode_id ==1">HD</span>
+                    <span v-if="main_collection.mode_id ==2">HDF</span>
+                    <span v-if="main_collection.mode_id ==3">HD+HP</span>
+                    <span v-if="main_collection.mode_id ==4">HP</span>
+                    <span v-if="main_collection.mode_id ==5">HF</span>
+                    <span v-if="main_collection.mode_id ==6">SCUF</span>
+                    <span v-if="main_collection.mode_id ==7">IUF</span>
+                    <span v-if="main_collection.mode_id ==8">HFHD</span>
+                    <span v-if="main_collection.mode_id ==9">HFHD+HP</span>
+                    <span v-if="main_collection.mode_id ==10">PHF</span>
+                    <span v-if="main_collection.mode_id ==11">HFR</span>
+                    <span v-if="main_collection.mode_id ==12">HDF+HP</span>
+                    <span v-if="main_collection.mode_id ==13">CRRT</span>
+                    <span v-if="main_collection.mode_id ==14">腹水回输</span>
+                    <span v-if="main_collection.mode_id ==19">IUF+HD</span>
+                    <span v-if="main_collection.mode_id ==20">UF</span>
+                    <span v-if="main_collection.mode_id ==21">HD+</span>
+                    <span v-if="main_collection.mode_id ==22">血浆胆红素吸附+HDF</span>
+                    <span v-if="main_collection.mode_id ==23">血浆胆红素吸附</span>
+                    <span v-if="main_collection.mode_id ==24">I-HDF</span>
+                    <span v-if="main_collection.mode_id ==25">HD高通</span>
+                    <span v-if="main_collection.mode_id ==26">CVVH</span>
+                    <span v-if="main_collection.mode_id ==27">CVVHD</span>
+                    <span v-if="main_collection.mode_id ==28">CVVHDF</span>
+                    <span v-if="main_collection.mode_id ==29">PE</span>
+                    <span v-if="main_collection.mode_id ==30">血浆胆红素吸附+HP</span>
+                    <span v-if="main_collection.mode_id ==31">HPD</span>
+                    <span v-if="main_collection.mode_id ==32">HDP</span>
+                  </span>
+                </div>
+                <div>
+                  <span v-if="printObj.week == 1">
+                     星期:
+                     <span v-if="main_collection.schedule_week ==1">星期一</span>
+                     <span v-if="main_collection.schedule_week ==2">星期二</span>
+                     <span v-if="main_collection.schedule_week ==3">星期三</span>
+                     <span v-if="main_collection.schedule_week ==4">星期四</span>
+                     <span v-if="main_collection.schedule_week ==5">星期五</span>
+                     <span v-if="main_collection.schedule_week ==6">星期六</span>
+                     <span v-if="main_collection.schedule_week ==7">星期日</span>
+                  </span>
+                </div>
                 <div>
                  <span v-if="printObj.zone == 1">分区/</span>
                  <span v-if="printObj.number == 1">床位号:</span>
@@ -31,9 +75,9 @@
                   <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
                 </div>
                 <div v-if="printObj.anticoagulant == 1">抗凝剂:
-                  <span v-if="org_id == 10138 ">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
+                  <span v-if="org_id == 10138 || org_id == 0 || org_id == 10278">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
                   <span v-else >
-                   <span>{{getAnticoagulant(main_collection.dialysissolution.mode_id)}}</span>
+                   <span>{{getAnticoagulant(main_collection.dialysissolution.anticoagulant)}}</span>
                   </span>
                 </div>
                <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
@@ -78,7 +122,22 @@
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">体重增加:{{(main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight).toFixed(2)}}</div>
                 <div>用法:静脉注射</div>
-                <div>打印时间:{{currentDate}}</div>
+                <!-- 透析器灌流器 -->
+               
+                 <div>
+                  <span v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器:</span>
+                  <span v-if="printObj.dialyzers == 1&& main_collection.dialysissolution.dialysis_dialyszers!=''">{{main_collection.dialysissolution.dialysis_dialyszers}}</span>
+                  <span v-if="printObj.perfusion_apparatus == 1&& main_collection.dialysissolution.dialysis_irrigation!=''">{{main_collection.dialysissolution.dialysis_irrigation}}</span>
+
+                  <span v-if="org_id == 10440 && main_collection.dialysissolution.dialyzer_perfusion_apparatus!=''">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
+                </div>
+                <div v-if="printObj.doctor_advice == 1">
+                    医嘱：
+                   <span v-if="main_collection.doctoradvice!=''">{{getAdvice(main_collection.doctoradvice)}}</span>
+                </div>
+                
+               
+                <div v-if="org_id!=10440&&org_id!=0">打印时间:{{currentDate}}</div>
               </div>
 
               <div class="signPrint" style="font-size:16px;" v-else>
@@ -285,12 +344,12 @@
        getScheduleList(params).then(response=>{
          if(response.data.state ==1){
            var list = response.data.data.list
-          
+           
            for(let i=0;i<list.length;i++){
               list[i].sort = list[i].number.sort
            }
            var arr = list.sort(this.compare('sort'))
-           
+           console.log("arr--------",arr)
            this.scheduleData = arr
 
              let a = response.data.data.day
@@ -323,7 +382,7 @@
                 days = '星期日';
                 break;
           }
-          var str = year + "年" + month + "月" + day + "日  " + days;
+          var str = year + "年" + month + "月" + day + "日  ";
           this.currentDate = str
           }
        })
@@ -593,6 +652,29 @@
         if(name == 7){
          name = "低分子肝素钠"
        }
+       if(name == 8){
+         name = "依诺肝素"
+       }
+
+       if(name == 9){
+         name = "达肝素"
+       }
+       if(name == 10){
+         name = "体外抗凝"
+       }
+
+       if(name == 11){
+         name = "那屈肝素"
+       }
+
+       if(name == 12){
+         name = "无抗凝剂"
+       }
+       if(name == 13){
+         name = "那屈肝素钙"
+       }
+
+
 
        return name
      },

src/xt_pages/workforce/schedule_print.vue

@@ -57,15 +57,20 @@
                 </td>
                 <td :width="td_4_width" valign="top">
                   <div class="proj" v-if="Object.keys(main_collection.hdf).length > 0">
-                    <div class="proj_title">血滤:</div>
+                    <div class="proj_title">血滤(HDF):</div>
                     <div class="proj_item" v-html="patient_other_names(main_collection.hdf)">
                     </div>
                   </div>
                   <div class="proj" v-if="Object.keys(main_collection.hd_hp).length > 0">
-                    <div class="proj_title">灌流:</div>
+                    <div class="proj_title">灌流(HD+HP):</div>
                     <div class="proj_item" v-html="patient_other_names(main_collection.hd_hp)">>
                     </div>
                   </div>
+                   <div class="proj" v-if="Object.keys(main_collection.hfhd_hp).length > 0">
+                    <div class="proj_title">灌流(HFHD+HP):</div>
+                    <div class="proj_item" v-html="patient_other_names(main_collection.hfhd_hp)">>
+                    </div>
+                  </div>
                 </td>
               </tr>
               </tbody>
@@ -110,7 +115,7 @@
             },
             hdf: [ /* schedule, ... */],
             hd_hp: [ /* schedule, ... */],
-
+            hfhd_hp:[],
             new_hdf:{
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
@@ -120,7 +125,12 @@
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
               evening: { /* zone_name: [ schedule, ... ] */ }
-            }
+            },
+            new_hfhd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
 
           },
           {
@@ -133,6 +143,7 @@
             },
             hdf: [ /* schedule, ... */],
             hd_hp: [ /* schedule, ... */],
+            hfhd_hp:[],
             new_hdf:{
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
@@ -142,7 +153,12 @@
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
               evening: { /* zone_name: [ schedule, ... ] */ }
-            }
+            },
+            new_hfhd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
           },
           {
             day: 3,
@@ -154,6 +170,7 @@
             },
             hdf: [ /* schedule, ... */],
             hd_hp: [ /* schedule, ... */],
+            hfhd_hp:[],
             new_hdf:{
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
@@ -163,7 +180,12 @@
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
               evening: { /* zone_name: [ schedule, ... ] */ }
-            }
+            },
+             new_hfhd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
           },
           {
             day: 4,
@@ -175,6 +197,7 @@
             },
             hdf: [ /* schedule, ... */],
             hd_hp: [ /* schedule, ... */],
+            hfhd_hp:[],
             new_hdf:{
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
@@ -184,7 +207,12 @@
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
               evening: { /* zone_name: [ schedule, ... ] */ }
-            }
+            },
+             new_hfhd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
           },
           {
             day: 5,
@@ -196,6 +224,7 @@
             },
             hdf: [ /* schedule, ... */],
             hd_hp: [ /* schedule, ... */],
+            hfhd_hp:[],
             new_hdf:{
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
@@ -205,7 +234,12 @@
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
               evening: { /* zone_name: [ schedule, ... ] */ }
-            }
+            },
+             new_hfhd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
           },
           {
             day: 6,
@@ -217,6 +251,7 @@
             },
             hdf: [ /* schedule, ... */],
             hd_hp: [ /* schedule, ... */],
+            hfhd_hp:[],
             new_hdf:{
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
@@ -226,7 +261,12 @@
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
               evening: { /* zone_name: [ schedule, ... ] */ }
-            }
+            },
+             new_hfhd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
           },
           {
             day: 7,
@@ -238,6 +278,7 @@
             },
             hdf: [ /* schedule, ... */],
             hd_hp: [ /* schedule, ... */],
+            hfhd_hp:[],
             new_hdf:{
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
@@ -247,7 +288,12 @@
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
               evening: { /* zone_name: [ schedule, ... ] */ }
-            }
+            },
+             new_hfhd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
           }
         ],
 
@@ -320,6 +366,8 @@
             } else if (schedule.mode.id == 3) { // HD+HF
 
               main_collection.hd_hp.push(schedule)
+            }else if(schedule.mode.id == 9){ //HFHD+HP
+               main_collection.hfhd_hp.push(schedule)
             }
 
           }

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))