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/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -264,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
@@ -770,10 +770,21 @@
                   <td style="height: 20px" width="50">
                     <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="420">
                     <p style="height: 20px; line-height: 20px">医嘱执行记录</p>
                   </td>
-                  <td style="height: 20px" width="100">
+                  <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">
@@ -809,6 +820,31 @@
                   <td width="50">
                     {{ getTime(advice.start_time, "{h}:{i}") }}
                   </td>
+                  <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>
@@ -833,7 +869,11 @@
                     }}</span>
                     <span>{{ advice.remark }}</span>
                   </td>
-                  <td style="line-height: 30px" width="100">
+                  <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>

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/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/outpatientCharges/outpatientChargesManagement.vue

@@ -2912,9 +2912,9 @@ export default {
             this.pwd = ''
           } else {
             if (this.activeName == 'first') {
-              this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder)
+              this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)
             } else {
-              this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder)
+              this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)
             }
 
           }
@@ -2922,7 +2922,7 @@ export default {
           if (this.activeName == 'first') {/////////////////////////押金shows
             this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)
           } else {
-            this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder)
+            this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)
           }
         }
 
@@ -4527,7 +4527,6 @@ export default {
                       price: prescription.project[b].price,
                       remark: prescription.project[b].remark,
                       // medical_code: prescription.project[b].project.medical_code,
-                      unit: prescription.project[b].unit,
                       type: prescription.project[b].type,
                       execution_state: prescription.project[b].execution_state,
 
@@ -4545,14 +4544,14 @@ export default {
                       obj['project_name'] = prescription.project[b].project.project_name
                       obj['spec'] = ''
                       obj['name_id'] = 0
-
+                      obj['unit']=  prescription.project[b].project.unit
                     } else if (prescription.project[b].type == 3) {
                       obj['statistical_classification'] = ''
                       obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                       obj['project_name'] = prescription.project[b].good_info.good_name
                       obj['spec'] = prescription.project[b].good_info.specification_name
                       obj['name_id'] = prescription.project[b].good_info.manufacturer
-
+                      obj['unit']=  prescription.project[b].good_info.packing_unit
                     }
 
                     tempProject.push(obj)

src/xt_pages/workforce/template.vue

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