Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/advice.js

     })
   }
 }
-export function DeleteGroupAdvice(groupno, mode) {
+export function DeleteGroupAdvice(groupno, mode,patient_id,advice_date) {
   return request({
-    url:'/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode,
+    url:'/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode+"&patient_id="+patient_id+"&advice_date="+advice_date,
     method: 'delete',
     headers: {
       Permission: 3
   })
 }
 
-export function DeleteNewGroupAdvice(groupno, mode) {
+export function DeleteNewGroupAdvice(groupno, mode,patient_id,advice_date) {
   return request({
     url:
-      '/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode,
+      '/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode+'&patient_id='+patient_id+"&advice_date="+advice_date,
     method: 'delete',
     headers: {
       Permission: 3

src/store/modules/globalConfig.js

       {
         id: 3,
         name: '离异'
+      },
+      {
+        id: 4,
+        name: '丧偶'
       }
+      
     ],
     reimbursement_ways: [ // 报销方式
       {

src/xt_pages/Pharmacy/DrugDispensing.vue

         :visible.sync="dialogVisibleOne"
          width="40%">
        <span>
+        <div style="margin-bottom: 10px;">
+         <span >追溯码个数:{{getTotal() }} 个</span>
+        </div>
         <el-input
           ref="Datefrom"
           @keyup.native="changeText"
       drug_id:0,
       newArrList:[],
       baseList:[],
+      textAreaList:[]
     };
   },
 
   methods: {
+    getTotal(){
+      if(this.textarea!=null){
+        var  textAreaList = this.textarea.split(",")
+        console.log("textArrleti",textAreaList)
+        var arr = []
+        if(textAreaList!=null && textAreaList.length>0){
+          for(let i=0;i<textAreaList.length;i++){
+            if(textAreaList[i]!=""){
+              arr.push(textAreaList[i])
+            }
+          }
+          return  arr.length
+        }else{
+          return ""
+        }
+      
+      }
+
+    },
     // 追溯码
     getDrugCode(id,DataSources,DrugCode,index){
       

src/xt_pages/Pharmacy/PatientDispensing.vue

         :visible.sync="dialogVisibleOne"
          width="40%">
        <span>
+        <div style="margin-bottom: 10px;">
+         <span >追溯码个数:{{getTotal() }} 个</span>
+        </div>
         <el-input
           ref="inputRef"
           @keyup.native="changeText"
       patientList:[],
       drug_id:0,
       total_count:0,
-      newArrList:[]
+      newArrList:[],
+      textAreaList:[]
     };
   },
-  watch: {},
+ 
   created() {
     this.init();
     this.gettodaynumber();
     // this.selectedbydefault();
   },
   methods: {
+    getTotal(){
+
+      if(this.textarea!=null){
+        var  textAreaList = this.textarea.split(",")
+        console.log("textArrleti",textAreaList)
+        var arr = []
+        if(textAreaList!=null && textAreaList.length>0){
+          for(let i=0;i<textAreaList.length;i++){
+             if(textAreaList[i]!=""){
+               arr.push(textAreaList[i])
+             }
+          }
+          return  arr.length
+        }else{
+          return ""
+        }
+       
+      }
+     
+    },
     openDialog(){
       this.$nextTick(() => {
         this.$refs.inputRef.focus()
        
         var textarea = ""
         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+
+      
          
         if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id==0 || this.$store.getters.xt_user.org.id == 10278|| this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10610){
 
        
       }
 
-
+      this.getTotal()
     },
     
     hasDuplicates(arr) {
 
 
   },
+  watch:{
+
+  }
   
 };
 </script>

src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue

                                   (record.dialysis_order &&
                                     monitor_record.operate_time ==
                                     record.dialysis_order.start_time)
-                                ">【开始透析】
+                                ">
                                 </template>
 
                                 {{ monitor_record.end }} {{ monitor_record.symptom }} &nbsp;{{
                         kg
                       </div>
 
-                      <div class="inline_block" style="flex: 1">
+                      <!-- <div class="inline_block" style="flex: 1">
                         <span>透析中入量(g):</span>
                         <div class="under_line" style="width: 70px; text-align: center">
                           {{
                           }}
                         </div>
                         {{ getUnit(record) }}
-                      </div>
+                      </div> -->
 
                       <div class="inline_block" style="flex: 1">
                         实际超滤量:
               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) {
                 if (this.org_id != 10683) {
-                  this.records[i].monitor_records[j].end = "【结束透析】";
+                  this.records[i].monitor_records[j].end = "";
                 }
 
                 tempmonitorflag = false;
               if (this.org_id != 10515 && this.org_id != 0) {
                 if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
                   if (this.org_id != 10683) {
-                    this.records[i].monitor_records[j].end = "【结束透析】";
+                    this.records[i].monitor_records[j].end = "";
                   }
 
                 }
                 if (this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == "") {
                   if (this.org_id != 10683) {
-                    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 = ""
                   }
 
                 }

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

            this.$message.error("已执行的医嘱无法删除!")
            return
         }
-        this.DeleteGroupAdvice(this.groupSelectRow.groupno)
+        console.log("groupno====================",this.groupSelectRow)
+       
+        this.DeleteGroupAdvice(this.groupSelectRow.groupno,this.groupSelectRow.patient_id,this.groupSelectRow.advice_date)
 
         // this.$confirm('确认删除些条医嘱内容?', '删除医嘱内容', {
         //   confirmButtonText: '确定',
       }
       ,
 
-      DeleteGroupAdvice(groupno) {
+      DeleteGroupAdvice(groupno,patient_id,advice_date) {
+
         this.$confirm('确认删除这组医嘱?', '医嘱删除', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
             ) {
               mode = '5'
             }
-            DeleteGroupAdvice(groupno, mode).then(response => {
+            DeleteGroupAdvice(groupno, mode,patient_id,advice_date).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 if(response.data.code == 600000008){

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

       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
         console.log("除非=======================")
 
-        if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635  || this.$store.getters.xt_user.template_info.org_id==0   || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10726|| this.$store.getters.xt_user.template_info.org_id==10752){
+        if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635  || this.$store.getters.xt_user.template_info.org_id==0   || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10726|| this.$store.getters.xt_user.template_info.org_id==10752 ||  this.$store.getters.xt_user.template_info.org_id==10697){
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(1)
         this.pre = pre
         // console.log("pre1", pre);
         this.getPermission()
-        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10726 || this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10735 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742|| this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752){
+        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10726 || this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10735 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742|| this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10697){
           this.getPatientBefor()
         }
 
           var prescription = response.data.data.prescription
           if(patientBefor!=undefined){
 
-            if(this.$store.getters.xt_user.template_info.org_id == 10727  ||this.$store.getters.xt_user.template_info.org_id == 10740 ||this.$store.getters.xt_user.template_info.org_id == 10742||this.$store.getters.xt_user.template_info.org_id == 10745||this.$store.getters.xt_user.template_info.org_id == 10751){
+            if(this.$store.getters.xt_user.template_info.org_id == 10727  ||this.$store.getters.xt_user.template_info.org_id == 10740 ||this.$store.getters.xt_user.template_info.org_id == 10742||this.$store.getters.xt_user.template_info.org_id == 10745||this.$store.getters.xt_user.template_info.org_id == 10751||this.$store.getters.xt_user.template_info.org_id == 10697){
               if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               
                  this.dialysisPrescription.target_ultrafiltration = ((patientBefor.weight_before - patientBefor.dry_weight - patientBefor.additional_weight).toFixed(0))*1000

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

                 org_id!=10558 &&
                 org_id!=10517 && 
                 org_id!=10414 && 
-                org_id!=10598 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10721) ||
+                org_id!=10598 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10721 && org_id!=10731) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||
             width="100"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id == 10644 || org_id == 10721) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id == 10644 || org_id == 10721 || org_id == 10731) &&
               template_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <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 && org_id!=10410 && org_id!=10617  && org_id!=10677 && org_id !=10702 && org_id !=10721 && org_id !=10727 && org_id !=10206 && org_id!=10751&& org_id!=10752) || org_id == 10558 || org_id ==10598 || org_id ==10414 " width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换率1')" width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || 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 == 10445 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && 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 != 10445  && this.$store.getters.xt_user.template_info.org_id != 10751&& this.$store.getters.xt_user.template_info.org_id != 10752) || org_id == 10558 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id == 10567 || org_id == 10644" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || 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 == 10445 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10731" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && 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 != 10445  && this.$store.getters.xt_user.template_info.org_id != 10751&& this.$store.getters.xt_user.template_info.org_id != 10752) || org_id == 10558 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id == 10567 || org_id == 10644 || org_id == 10731" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('置换量1')" width="92px"  > 置换量(L)  </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if=" isShow('SpO₂') && org_id == 9829" width="92px" > SpO₂(%) </th>

src/xt_pages/dialysis/details/index.vue

           newArr.sort(this.compare('created_time'))
         }
 
-        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587 || this.org_id ==10571 || this.org_id ==10679 || this.org_id==10702 || this.org_id==10721){
+        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587 || this.org_id ==10571 || this.org_id ==10679 || this.org_id==10702 || this.org_id==10721 || this.org_id == 10635){
           if(newArr!=null && newArr.length>0){
             for(let i=0;i<newArr.length;i++){
               newArr[i].sort =0
           newArr.sort(this.compare('created_time'))
         }
 
-        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587 || this.org_id == 10679 || this.org_id == 10702 || this.org_id == 10721){
+        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587 || this.org_id == 10679 || this.org_id == 10702 || this.org_id == 10721 || this.org_id == 10635){
           if(newArr!=null && newArr.length>0){
             for(let i=0;i<newArr.length;i++){
               newArr[i].sort =0

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

                                   monitor.operate_time ==
                                     dialysisOrder.start_time)&&(org_id!=10414) && (org_id!=10683)
                                 "
-                                >【开始透析】 <span v-if="org_id ==10598">引血100ml/min</span>
+                                > <span v-if="org_id ==10598">引血100ml/min</span>
                                 </template>
 
                               {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{
                       kg
                     </div>
 
-                    <div class="inline_block" style="flex: 1">
+                    <!-- <div class="inline_block" style="flex: 1">
                       透析中入量(g):
                       <div class="under_line"
                         style="width: 70px; text-align: center"
                       </div>
 
                       {{ getUnit(afterdialysis.dialysis_intakes_unit) }}
-                    </div>
+                    </div> -->
 
                     <div class="inline_block" style="flex: 1">
                       实际超滤量:
           if (Object.keys(monitor).length > 0 && index > 1) {
             if ((this.dialysisOrder &&monitor.operate_time == this.dialysisOrder.end_time)&&(this.org_id!=10414)) {
               if(this.org_id!=10683){
-                this.monitors[index].end = "【结束透析】";
+                this.monitors[index].end = "";
               }
 
               tempmonitorflag = false;
             }
             if ((tempmonitorflag && index == this.monitors.length - 1)&&(this.org_id!=10414)) {
               if(this.org_id!=10683){
-                this.monitors[index].end = "【结束透析】";
+                this.monitors[index].end = "";
               }
             }
           }

src/xt_pages/hospitalStation/recordTemplate/printOne.vue

               <span v-if="patient.marital_status == 1">未婚</span>
               <span v-if="patient.marital_status == 2">已婚</span>
               <span v-if="patient.marital_status == 3">离异</span>
+              <span v-if="patient.marital_status == 4">丧偶</span>
             </div>
             <div>职业：{{getProfession(patient.profession)?getProfession(patient.profession):''}}</div>
         </div>

src/xt_pages/outpatientDoctorStation/recordTemplate/printFour.vue

                   <span v-if="patient.marital_status == 1">未婚</span>
                   <span v-if="patient.marital_status == 2">已婚</span>
                   <span v-if="patient.marital_status == 3">离异</span>
+                  <span v-if="patient.marital_status == 4">丧偶</span>
                 </div>
                 <div>职业：{{getProfession(patient.profession)?getProfession(patient.profession):''}}</div>
                 <div>病历编号：{{patient.id?patient.id:''}}</div>

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

               <span v-if="patient.marital_status == 1">未婚</span>
               <span v-if="patient.marital_status == 2">已婚</span>
               <span v-if="patient.marital_status == 3">离异</span>
+              <span v-if="patient.marital_status == 4">丧偶</span>
             </div>
             <div>职业：{{getProfession(patient.profession)?getProfession(patient.profession):''}}</div>
         </div>

src/xt_pages/stock/drugs/drugNewQuery.vue

                <PurchaseNewDrugQuery ref="mychildfive"></PurchaseNewDrugQuery>
             </el-tab-pane>
         
-            <!-- <el-tab-pane label="进销存查询" name="second">
-              <PurchaseDrugQuery ref="mychild"></PurchaseDrugQuery>
+            <!-- <el-tab-pane label="进销存查询2" name="second">
+               <PurchaseDrugQuery ref="mychild"></PurchaseDrugQuery>
             </el-tab-pane>  -->
 
             <el-tab-pane label="有效期查询" name="third">
       if(val.name =="five"){
        this.$refs.mychildfive.open()
       }
+     
     }
   },
   created(){

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

       @open="openDialog"
       :visible.sync="dialogVisible"
       width="40%">
+
+      <div style="margin-bottom: 10px;">
+        <span >追溯码个数:{{getTotal() }} 个</span>
+      </div>
       <span>
         <el-input
         
       dialogVisible:false,
       currentRow:{},
       currentIndex:0,
-      textarea:""
+      textarea:"",
+      textAreaList:[]
     };
   },
   methods: {
+    getTotal(){
+      if(this.textarea!=null){
+        var  textAreaList = this.textarea.split(",")
+        console.log("textArrleti",textAreaList)
+        var arr = []
+        if(textAreaList!=null && textAreaList.length>0){
+          for(let i=0;i<textAreaList.length;i++){
+            if(textAreaList[i]!=""){
+              arr.push(textAreaList[i])
+            }
+          }
+          return  arr.length
+        }else{
+          return ""
+        }
+      
+      }
+
+    },
     openDialog(){
       this.$nextTick(() => {
         this.$refs.inputRef.focus()
         this.textarea = textarea
 
       }
+      this.getTotal()
    },
   },
 

src/xt_pages/stock/drugs/inventoryPrint.vue

                         <td align="center">批号</td>
                         <td style="width: 100px;" align="center">生产日期</td>
                         <td align="center">有效日期</td>
-                        <td align="center">生产企业</td>
+                        <td align="center" style="width: 100px;">生产企业</td>
                         <td align="center">国药准字</td>
                         <td align="center">单位</td>
-                        <td style="width:200px" align="center">库存量</td>
+                        <td style="width:100px" align="center">剩余库存</td>
+                        <td style="width: 100px;" align="center">盘点数量</td>
                     </tr>
                     <tr v-for="(item,index) in tableData" :key="index">
                         <td align="center">{{index+1}}</td>
                         <td align="center">{{getManufacturerName(item.manufacturer)}}</td>
                         <td align="center">{{item.number}}</td>
                         <td align="center">{{item.max_unit}}</td>
-                        <td align="center"></td>
+                        <td align="center">
+                          <span v-if="item.stock_max_number>0">
+                            {{ item.stock_max_number }}{{ item.max_unit }}
+                          </span>
+                           <span v-if="item.stock_min_number>0">
+                            {{ item.stock_min_number }}{{ item.min_unit }}
+                           </span>
+                        </td>
+                        <td align="center">
+
+                        </td>
                     </tr>
                 </table>
 

src/xt_pages/stock/inventoryPrint.vue

                         <td style="width: 100px;" align="center">生产企业</td>
                         <td align="center">国药准字</td>
                         <td align="center">单位</td>
-                        <td style="width:200px" align="center">库存量</td>
+                        <td style="width:100px" align="center">剩余库存</td>
+                        <td style="width:200px" align="center">盘点数量</td>
                     </tr>
                     <tr v-for="(item,index) in tableData" :key="index">
                         <td align="center">{{index+1}}</td>
                         <td align="center">{{getManufacturerName(item.manufacturer)}}</td>
                         <td align="center">{{item.remark}}</td>
                         <td align="center">{{item.packing_unit}}</td>
+                        <td align="center">{{ item.stock_count }}</td>
                         <td align="center"></td>
                     </tr>
                 </table>

src/xt_pages/stock/query/purchaseNewStockQuery.vue

             this.loading = false
             for(let i=0;i<list.length;i++){
                
-              if(this.org_id ==10210 || this.org_id ==10215 || this.org_id == 10265){
+              if(this.org_id ==10210 || this.org_id ==10215 || this.org_id == 10265 || this.org_id ==0){
                 list[i].stockIn = list[i].GoodStartFlowInfo.over_count
               }else{
                 console.log("HHAHHAHA",list[i].id)
                if(this.org_id ==10697){
                   list[i].stock_in_price = list[i].buy_price
                   list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
-               }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
+               }else if(this.org_id ==0){
+                list[i].stock_in_price = list[i].buy_price
+                list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
+               }else if(this.org_id == 10644 || this.org_id == 10752){
                  list[i].stock_in_price = "/"
-                 console.log("val1",this.getAllStockInPrice(list[i].StWarehousingInfoTwo))
-                 console.log("val2",this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))
-                 console.log("val3",this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) )
-                 console.log("val4",this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow))
+                //  console.log("val1",this.getAllStockInPrice(list[i].StWarehousingInfoTwo))
+                //  console.log("val2",this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))
+                //  console.log("val3",this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) )
+                //  console.log("val4",this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow))
 
                 list[i].stockMoney = parseFloat(this.getAllStockInPrice(list[i].StWarehousingInfoTwo))  +parseFloat(this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))  - parseFloat(this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty))  - parseFloat(this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow)) 
                 if(list[i].stockMoney>0){
               if(this.org_id ==10697){
                list[i].addStockMoney = list[i].buy_price 
                 list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
-              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
+              }else if(this.org_id == 0){
+                list[i].addStockMoney = list[i].buy_price 
+                list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
+              } else if(this.org_id == 10644 || this.org_id == 10752){
                 list[i].addStockMoney = "/"
                 list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
               } else{
               if(this.org_id == 10697){
                 list[i].stockOutprice = list[i].packing_price
                 list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
-              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
+              }else if(this.org_id == 0){
+                list[i].stockOutprice = list[i].packing_price
+                list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
+              }else if(this.org_id == 10644 || this.org_id == 10752){
                 list[i].stockOutprice = "/"
                 list[i].saleOutMoney = this.getWarehosueOutInfoPrice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
                 if(list[i].saleOutMoney == "NaN"){
 
 
              
-              if(this.org_id == 10265){
+              if(this.org_id == 10265 || this.org_id == 0){
                 list[i].overStock = list[i].GoodEndFlowInfo.over_count
               }else{
                 if((list[i].stockIn + list[i].stockAdd - list[i].outStock)>0 ){
               if(this.org_id ==10697){
                 list[i].overPrice = list[i].packing_price
                 list[i].overMoney = (list[i].packing_price*list[i].overStock).toFixed(2)
-              }else if(this.org_id == 0 || this.org_id ==10644 || this.org_id == 10752){
+              }else if(this.org_id == 0){
+                list[i].overPrice = list[i].GoodEndFlowInfo.buy_price
+                list[i].overMoney = (list[i].GoodEndFlowInfo.buy_price*list[i].overStock).toFixed(2)
+              } else if(this.org_id ==10644 || this.org_id == 10752){
                 list[i].overPrice = "/"
-                // console.log("stockMoney-00000000000000",list[i].stockMoney)
-                // console.log("saleStockMoney-00000000000000",list[i].saleStockMoney)
-                // console.log("saleOutMoney-00000000000000",list[i].saleOutMoney)
                 list[i].overMoney = (parseFloat(list[i].stockMoney)  + parseFloat(list[i].saleStockMoney) - parseFloat(list[i].saleOutMoney)).toFixed(2)
-                // console.log("hahahha",list[i].overMoney)
               }else{
                 list[i].overPrice = "/"
                 list[i].overMoney = "/"

src/xt_pages/stock/stockOutOrder.vue

       manufacturer: [],
       selectedTableData: [],
       dealer: [],
-      type: 0,
+      type: 1,
       drug_id: 0,
       dialogVisible: false,
       editdialogVisible: false,

src/xt_pages/upload/fast/basicInfo.vue

                 this.form.marital_status = '已婚'
             }else if(this.form.marital_status == 3){
                 this.form.marital_status = '离异'
+            }else if(this.form.marital_status == 4){
+                this.form.marital_status = '丧偶'
             }else if(this.form.marital_status == 0){
                 this.form.marital_status = ''
             }

src/xt_pages/user/components/PatientDetail.vue

 
             <div v-show="!generic_info_fold">
               <el-col :span="8">
-                <el-form-item label="别名 : " prop="alias">
+                <el-form-item label="血型 : " prop="alias">
                   <el-input v-model="form.alias" disabled></el-input>
                 </el-form-item>
               </el-col>

src/xt_pages/user/components/PatientForm.vue

 
               <div v-show="!generic_info_fold">
                 <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
-                  <el-form-item label="别名 : " prop="alias">
+                  <el-form-item label="血型 : " prop="alias">
                     <el-input v-model="form.alias"></el-input>
                   </el-form-item>
                 </el-col>
     // this.styleOptions = this.$store.getters.patient_types;
     // this.partitionOptions = this.$store.getters.partitions;
     this.maritalOptions = getDataConfig("patient", "marital_options");
+    console.log("maritalOptians==============",this.maritalOptions)
     this.wayOptions = getDataConfig("patient", "reimbursement_ways");
     // this.typeOptions = this.$store.getters.blood_types;
     // this.rhOptions = this.$store.getters.rh;

src/xt_pages/user/doctorAdvice.vue

 import { jsGetAge, uParseTime } from "@/utils/tools";
 import { getDataConfig } from "@/utils/data";
 import { getSelfMedicalList,getDrugDescByDrugName } from "@/api/drug/drug"
+import patient from "../../router/modules/patient";
 let rowIndex = 1;
 const rowKey = 0;
 
     },
     DeleteGroupAdvice(groupno, row) {
       console.log("patinet_id =======",row)
+      var patient_id = row.patient_id
+      var advice_date = row.advice_date
       this.$confirm("确认删除这组医嘱?", "医嘱删除", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
             }
           }
 
-          DeleteNewGroupAdvice(groupno, mode).then(response => {
+          DeleteNewGroupAdvice(groupno, mode,patient_id,advice_date).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)``;
               return false;

src/xt_pages/user/physiqueprinting.vue

                 <div style="flex: 1;">
                   首次透析日期：{{ patient.first_dialysis_date ? getTime(patient.first_dialysis_date, '{y}-{m}-{d}') : '' }}
                 </div>
-                <div style="flex: 1;">血型：{{ getBloodType(patient.blood_type) }}</div>
+                <div style="flex: 1;">血型：{{ patient.alias }}</div>
                 <div style="flex: 1;">报销方式：{{ getWayOptions(patient.reimbursement_way_id) }}</div>
               </div>
               <div style="display: flex; justify-self: start; margin-top: 5px ;width: 100%;">
               {{index+1}}.<span>{{ item }}</span><br/>
             </div>
             <div style="text-align: right;margin-bottom: 10px;">
-              <span style="font-weight: bold;">病历书写者：</span>
-              {{getDoctorName(item.doctor_id)}}
+
+             <span style="font-weight: bold;">病历书写者：</span>
+              <span v-if="getUrl(item.doctor_id)!=''">
+                <img :src="getUrl(item.doctor_id)" style="height: 50px">
+              </span>
+              <span v-if="getUrl(item.doctor_id)==''">
+                {{getDoctorName(item.doctor_id)}}
+              </span>
+             
             </div>
           </div>
           <div style="float: right;">
       },
       diagnosis: [],
       treatment_plan_list:[],
-      org_id:0
+      org_id:0,
+      signatureList:[]
     }
   },
   components: {
       fetchAllDoctorAndNurse().then(response => {
         if (response.data.state == 1) {
           this.doctorOptions = response.data.data.doctors;
+          var signature = response.data.data.signature
+          this.signatureList = signature
         }
       });
     },
+    getUrl(creator){
+      var url = ""
+      for(let i=0;i<this.signatureList.length;i++){
+         if(creator == this.signatureList[i].admin_user_id){
+             url = this.signatureList[i].url
+         }
+      }
+      return url
+    },
     getDoctorName: function(doctor_id) {
       for (let index = 0; index < this.doctorOptions.length; index++) {
         const doctor = this.doctorOptions[index]

src/xt_pages/workforce/remind_print_setting.vue

                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
                     {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                    </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 12">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 13">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 14">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 15">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 16">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 17">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 18">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 19">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
                 </div>
 
                 <div v-if="org_id==0 || org_id ==10460">
     this.printDate = moment().format("YYYY-MM-DD HH:mm:ss")
     this.modeOptions = this.$store.getters.treatment_mode
     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
+    console.log("anticoagulants_confit---------------",this.anticoagulants_confit)
     this.week_type = this.$route.query.week_type
     this.week_time  = this.$route.query.week_time
     this.zone = this.$route.query.zone