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

package-lock.json

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

src/api/dialysis_record.js

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

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

@@ -945,7 +945,7 @@ export default {
       data['weight_after'] = this.form.weight_after ? parseFloat(this.form.weight_after) : 0
       data['weight_loss'] = this.form.weight_loss ? parseFloat(this.form.weight_loss) : 0
       data['temperature'] = this.form.temperature ? parseFloat(this.form.temperature) : 0
-      data['breathing_rate'] = this.form.temperature ? parseFloat(this.form.breathing_rate) : 0
+      data['breathing_rate'] = this.form.breathing_rate 
       data['systolic_blood_pressure'] = this.form.systolic_blood_pressure ? parseFloat(this.form.systolic_blood_pressure) : 0
       data['diastolic_blood_pressure'] = this.form.diastolic_blood_pressure ? parseFloat(this.form.diastolic_blood_pressure) : 0
       data['pulse_frequency'] = this.form.pulse_frequency ? parseFloat(this.form.pulse_frequency) : 0

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

@@ -89,7 +89,7 @@
 
           <el-col :span="8">
             <el-form-item label="呼吸频率(次/分)：" v-if="isShow('呼吸频率')">
-              <el-input type="number" v-model="assessmentBeforeDislysis.breathing_rate"></el-input>
+              <el-input  v-model="assessmentBeforeDislysis.breathing_rate"></el-input>
             </el-form-item>
           </el-col>
 

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

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

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

@@ -2142,13 +2142,8 @@ export default {
           ? 0
           : parseFloat(this.form.temperature);
       this.form.pulse_frequency =
-        parseFloat(this.form.pulse_frequency) == NaN
-          ? 0
-          : parseFloat(this.form.pulse_frequency);
-      this.form.breathing_rated =
-        parseFloat(this.form.breathing_rated) == NaN
-          ? 0
-          : parseFloat(this.form.breathing_rated);
+      parseFloat(this.form.pulse_frequency) == NaN ? 0: parseFloat(this.form.pulse_frequency);
+      this.form.breathing_rated = this.form.breathing_rated
       this.form.blood_flow_volume =
         parseFloat(this.form.blood_flow_volume) == NaN
           ? 0
@@ -2306,14 +2301,8 @@ export default {
               parseFloat(this.form.temperature) == NaN
                 ? 0
                 : parseFloat(this.form.temperature);
-            this.form.pulse_frequency =
-              parseFloat(this.form.pulse_frequency) == NaN
-                ? 0
-                : parseFloat(this.form.pulse_frequency);
-            this.form.breathing_rated =
-              parseFloat(this.form.breathing_rated) == NaN
-                ? 0
-                : parseFloat(this.form.breathing_rated);
+            this.form.pulse_frequency =parseFloat(this.form.pulse_frequency) == NaN? 0 : parseFloat(this.form.pulse_frequency);
+            this.form.breathing_rated = this.form.breathing_rated
             this.form.blood_flow_volume =
               parseFloat(this.form.blood_flow_volume) == NaN
                 ? 0

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

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

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1421,13 +1421,13 @@ export default {
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       const style2 =
         // 防止分页错位问题：table设置border: none；.tr设置page-break-inside:avoid; // 防止table数据太多，tr分页错乱 td设置border: 1px solid #000;// 防止部分分页的tr边框线没有
-        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;} .inside_table{border: none} .inside_table tr{page-break-inside:avoid;} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 20px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;} .print_page_main_content .proj_table tbody tr inside_table tbody tr{page-break-inside:avoid;} .print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px} ';
+        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;} .inside_table{border: none} .inside_table tr{page-break-inside:avoid;} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 20px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;} .print_page_main_content .proj_table tbody tr{page-break-inside:avoid;} .print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px} ';
       const style3 =
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:16px;border-color: #000;}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #000;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}.row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line {display: inline-block;border-bottom: 1px solid #000;text-align: center;white-space: nowrap; width: 50%;}';
       // const style3 =
       //   '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 16px;padding: 5px 5px;line-height: 18px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:950px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top:1050px;left: 50%;}.print-yema5{position: absolute;top:1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
       //
-
+ 
       const style5 =
         '@media print {.dialysis-print-order {width: 960px; margin: 0 auto;}.dialysis-print-order .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.dialysis-print-order .order-title {  margin: auto;  font-weight: 600;  text-align: center;  font-size: 22px;  padding: 10px 20px 0px 20px;}.dialysis-print-order .table-box {  width: 100%;  line-height: 18px;  font-size: 14px;}.dialysis-print-order .print-table {  width: 100%;  text-align: center;  border-collapse: collapse;  line-height: 28px;  font-size: 14px;}.dialysis-print-order .print-table-no {  width: 100%;  text-align: center;  border-collapse: collapse;  font-size: 14px;}.dialysis-print-order .under-line {  border-bottom: 1px solid #999;  width: 95%;  text-align: center;  margin-left: 2px;}.dialysis-print-order .title-box {  text-align: center;  font-size: 16px;}.dialysis-print-order .radio-lebel-box {  font-weight: 400;  cursor: pointer;}.dialysis-print-order .radio-no {  opacity: 0;  outline: none;  position: absolute;  margin: 0;  width: 0;  height: 0;  z-index: -1;}.dialysis-print-order .radio-inner {  white-space: nowrap;  cursor: pointer;  outline: none;  display: inline-block;  line-height: 1;  position: relative;  vertical-align: middle;}.dialysis-print-order .radio-fang {  display: inline-block;  position: relative;  border: 1px solid #000;  box-sizing: border-box;  width: 14px;  height: 14px;  background-color: #fff;  z-index: 1;  transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),    background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);}.dialysis-print-order .is-checked-radio::after {  content: "√";  font-size: 15px;}.dialysis-print-order .print-table-no tr td {  padding: 8px 5px;  line-height: 25px;}.dialysis-print-order .print-table tr td {  padding: 1px 1px;  /*line-height: 25px;*/}.es-img {  height: 25px;}.advice-name {  text-align: left;}.advice-children {  display: flex;}.title-box-pro {  border: 0 #fff;  line-height: 25px;  height: 25px;  text-align: left;  padding-left: 10px !important;}.title-box-pro-tr {  border: 0 #fff;}.text-align-left {  text-align: left !important;  padding-left: 10px !important;  font-size: 14px !important;  line-height: 25px;}.print-table-tr-new td {line-height: 20px !important;}.border-top-solid {border: solid 1px #000;}.print-template-two tr {line-height: 30px;}}';
       const style6 =

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -41,12 +41,12 @@
                   <tr class="list_table_1">
                     <td colspan="11" style="padding-left: 10px">
                       <div style="display: flex">
-                        <div style="width: 400px">
+                        <div style="width: 250px">
                           病情评估:&nbsp;<span>{{
                             sick_condition ? sick_condition : ""
                           }}</span>
                         </div>
-                        <div style="width: 400px">
+                        <div style="width: 250px">
                           入科方式:&nbsp;<span
                             v-for="(item, index) in way_arr"
                             :key="index"
@@ -56,6 +56,14 @@
                             >{{ item.name }}
                           </span>
                         </div>
+                        <div style="width: 250px">
+                          透析次数:&nbsp;<span>
+                            {{
+                              patientInfo.total_dialysis +
+                              patientInfo.user_sys_before_count
+                            }}次
+                          </span>
+                        </div>
                       </div>
                     </td>
                   </tr>
@@ -256,7 +264,7 @@
                           }}
                         </span></span
                       >
-                      mg&nbsp;&nbsp;&nbsp; 追加&nbsp;&nbsp;<span>{{
+                      &nbsp;mg&nbsp;&nbsp;&nbsp; 追加&nbsp;&nbsp;<span>{{
                         prescription.anticoagulant_weichi &&
                         prescription.anticoagulant == 2
                           ? prescription.anticoagulant_weichi
@@ -762,9 +770,23 @@
                   <td style="height: 20px" width="50">
                     <p style="height: 20px; line-height: 20px">时间</p>
                   </td>
-                  <td style="height: 20px" width="490">
+                  <td
+                    style="height: 20px"
+                    width="100"
+                    v-if="org_id == 10346 || org_id == 9675"
+                  >
+                    <p style="height: 20px; line-height: 20px">开嘱医生</p>
+                  </td>
+                  <td style="height: 20px" width="420">
                     <p style="height: 20px; line-height: 20px">医嘱执行记录</p>
                   </td>
+                  <td
+                    style="height: 20px"
+                    width="100"
+                    v-if="org_id == 10346 || org_id == 9675"
+                  >
+                    <p style="height: 20px; line-height: 20px">执行时间</p>
+                  </td>
                   <td style="height: 20px" width="85">
                     <p style="height: 20px; line-height: 20px">执行</p>
                   </td>
@@ -798,7 +820,32 @@
                   <td width="50">
                     {{ getTime(advice.start_time, "{h}:{i}") }}
                   </td>
-                  <td style="text-align: left; padding-left: 5px" width="485">
+                  <td
+                    style="line-height: 30px"
+                    width="100"
+                    v-if="org_id == 10346 || org_id == 9675"
+                  >
+                    <span v-if="setAdminUserES(advice.advice_doctor) == ''">
+                      {{ getAdminUser(advice.advice_doctor) }}
+                    </span>
+                    <span
+                      v-else
+                      style="
+                        display: flex;
+                        align-items: center;
+                        justify-content: space-around;
+                        height: 36px;
+                      "
+                    >
+                      <img
+                        style="height: 30px"
+                        :src="setAdminUserES(advice.advice_doctor)"
+                        alt
+                        srcset
+                      />
+                    </span>
+                  </td>
+                  <td style="text-align: left; padding-left: 5px" width="415">
                     <span v-if="advice.parent_id > 0">---></span>
                     <span>{{ advice.advice_name }}</span>
                     <span v-if="advice && advice.advice_desc"
@@ -822,6 +869,15 @@
                     }}</span>
                     <span>{{ advice.remark }}</span>
                   </td>
+                  <td
+                    style="line-height: 30px"
+                    width="100"
+                    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="85">
                     <span v-if="setAdminUserES(advice.execution_staff) == ''">{{
                       getAdminUser(advice.execution_staff)

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -642,6 +642,7 @@
                         <td width="50">脉搏<br />(次/分)</td>
                         <td width="60">血压<br />(mmHg)</td>
                         <td width="50">血容量<br />L</td>
+                        <td width="50">Kt/V<br /></td>
                         <td width="50">签名</td>
                         <td width="200">病情变化及处理</td>
                       </tr>
@@ -659,6 +660,7 @@
                           {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
                         </td>
                         <td style="padding:1px 5px;">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : '' }}</td>
+                        <td>{{ monitor.ktv ? monitor.ktv : "" }}</td>
                         <td style="padding:1px 5px;" height="30px">
                           <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">
                             {{ getAdminUser(monitor.monitoring_nurse) }}

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2055,6 +2055,38 @@
                       min
                     </div>
                   </div>
+                  <div
+                    class="row"
+                    style="padding: 2px 0; line-height: 23px; display: flex"
+                    v-if="org_id==9538 || org_id==9675"
+                  >
+                  <div class="inline_block" style="flex: 2.5">
+                      KT/V：
+                      <div
+                        class="under_line"
+                        style="
+                          width: 170px;
+                          text-align: center;
+                          white-space: normal;
+                        "
+                      >
+                        {{ afterdialysis.ktv ? afterdialysis.ktv : "/" }}
+                      </div>
+                    </div>
+                     <div class="inline_block" style="flex: 2.5">
+                      累积血容量：
+                      <div
+                        class="under_line"
+                        style="
+                          width: 170px;
+                          text-align: center;
+                          white-space: normal;
+                        "
+                      >
+                        <!-- {{ afterdialysis.cruor ? afterdialysis.cruor : "/" }} -->
+                      </div>
+                    </div>
+                  </div>
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

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

src/xt_pages/hospitalStation/doctorDesk.vue

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

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

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

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

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

src/xt_pages/user/components/PatientDetail.vue

@@ -1277,7 +1277,7 @@ export default {
       this.print_time = uParseTime(ptime, "{y}年{m}月{d}日");
 
       const style =
-        "@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content .order_title { text-align: center; font-size: 23px; line-height: 50px; font-weight: 500; } .print_main_content table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 18px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 18px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 17px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} }";
+        "@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content .order_title { text-align: center; font-size: 23px; line-height: 50px; font-weight: 500; } .print_main_content table { width: 100%; border-collapse: collapse; padding: 2px;border:none; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 18px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 18px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 17px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} }";
 
       setTimeout(() => {
         printJS({

src/xt_pages/workforce/template.vue

@@ -163,7 +163,7 @@
                 <el-button type="primary" @click="submitAction('form')">保 存</el-button>
             </div>
       </el-dialog>
-  </div>
+    </div>
 </template>
 
 <script>