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

src/xt_pages/data/components/addConsumable.vue

@@ -56,7 +56,7 @@
                         </div>
                        <div style="width:100%;display:flex;align-items:center;">
                             <el-form-item prop="dosage" class="noMargin">
-                              <el-input v-model="form.dosage" type="number" style="width:100px" placeholder="剂量" :disabled="dosageShow"></el-input>  
+                              <el-input v-model="form.dosage" type="number" style="width:100px" placeholder="剂量" :disabled="dosageShow"></el-input>
                             </el-form-item>
                             <el-form-item prop="max_unit" class="noMargin">
                               <el-select v-model="form.max_unit" style="width:160px;" placeholder="剂量单位" @change="changeMaxUnit">
@@ -94,7 +94,7 @@
                             </el-select>
                           </el-form-item>
                         </div>
-                       
+
                         <el-form-item label="生产厂商 : " prop="name" style="width:100%">
                             <el-select v-model="form.manufacturer" style="width:100%" placeholder="请选择">
                                 <el-option
@@ -137,6 +137,16 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
+                      <el-form-item label="是否拆零:" prop="name">
+                        <el-select v-model="form.is_zero_flag" style="width:160px;" placeholder="请选择">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
                         <el-form-item label="是否备案:" prop="name">
                             <el-select v-model="form.is_record" style="width:160px;" placeholder="请选择">
                                 <el-option

src/xt_pages/data/components/addDrugs.vue

@@ -26,7 +26,7 @@
                                       maxlength="30"></el-input>
                         </el-form-item>
                       </div>
-                      
+
                       <!-- <div v-if="org_id == 0">
                         <el-form-item label="药品规格 : ">
                             <el-input v-model="form.specification_name" style="width:160px;" placeholder=""
@@ -331,6 +331,17 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
+
+                      <el-form-item label="是否拆零:" prop="is_special_diseases">
+                        <el-select v-model="form.is_zero_flag" style="width:160px;" placeholder="请选择">
+                          <el-option
+                            v-for="(item,index) in options"
+                            :key="index"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
                         <el-form-item label="是否备案 : " prop="is_record">
                             <el-select v-model="form.is_record" style="width:160px;" placeholder="请选择">
                                 <el-option
@@ -569,6 +580,9 @@
           label: '否'
           }
         ],
+
+
+
         Pharmacy: [
           {
             value: 1,
@@ -674,7 +688,8 @@
           is_project:"",
           is_show:"",
           is_self_drug:"2",
-        
+          is_zero_flag:"",
+
         },
 
         rules: {
@@ -758,7 +773,7 @@
     },
     methods: {
       changeText(retail_price){
-       
+
         this.form.min_price = (retail_price/this.form.min_number).toFixed(2)
       },
       changeTextOne(min_number){
@@ -878,6 +893,7 @@
             this.form[key] = obj[key]
           }
 
+
           this.form.drug_classify = parseInt(this.form.drug_classify)
           this.form['id'] = id
           this.drug_status = []
@@ -1017,6 +1033,10 @@
         form['is_project'] = this.form.is_project
         form['is_show'] = this.form.is_show
         form['is_self_drug'] = parseInt(this.form.is_self_drug)
+        form['is_zero_flag'] = parseInt(this.form.is_zero_flag)
+
+
+
         return form
       },
       getlist() {

src/xt_pages/data/components/consumables.vue

@@ -354,6 +354,8 @@
               bbx01:"",
               bby01:"",
               is_show:"",
+              is_zero_flag:"",
+
             },
             isVisibility: false,
           }
@@ -779,6 +781,13 @@
                 this.goodInfo.goodInfoDialog.formValue.is_show =  response.data.data.goodInfo.is_show.toString()
               }
 
+            if(response.data.data.goodInfo.is_zero_flag <=0){
+              this.goodInfo.goodInfoDialog.formValue.is_zero_flag = ''
+            }else{
+              this.goodInfo.goodInfoDialog.formValue.is_zero_flag =  response.data.data.goodInfo.is_zero_flag.toString()
+            }
+
+
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
 
           }
@@ -1303,7 +1312,7 @@
                 obj['default_count'] = ''
               } else {
              if (key == '*默认单次用量') {
-               obj['default_count'] = parseInt(results[i][key].replace(/\s/g,"")) 
+               obj['default_count'] = parseInt(results[i][key].replace(/\s/g,""))
               }
            }
 
@@ -1363,7 +1372,7 @@
               }
            }
 
-         
+
 
            if (results[i]['医保编码'] === undefined) {
                 obj['medical_insurance_number'] = ''
@@ -1527,7 +1536,7 @@
           'goods':tableData
         };
         console.log("param2332323223",params)
-    
+
         postGoodInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg;
@@ -1665,7 +1674,7 @@
          }
          return manufacturer_name
        }
-      
+
     },
     created() {
       this.goodInfo.goodInfoDialog.formValue.is_user = "2"

src/xt_pages/data/components/drugs.vue

@@ -330,6 +330,7 @@
           is_default: '',//是否默认
           is_charge_predict: '',//是否收费预估项
           is_statistics_work: '',//是否统计工作量
+
           is_charge_use: '',//是否收费常用项
           drug_code: '',
           hosp_appr_flag:'',
@@ -388,6 +389,8 @@
           is_default: '',//是否默认
           is_charge_predict: '',//是否收费预估项
           is_statistics_work: '',//是否统计工作量
+          is_zero_flag: '',//是否拆零
+
           is_charge_use: '',//是否收费常用项
           drug_code: '',
           social_security_directory_code:'',
@@ -521,7 +524,7 @@
          }
           return ''
         }
-        
+
       },
       getDealer(id){
         if (id == 0) {
@@ -535,7 +538,7 @@
           }
           return name
         }
-       
+
       },
       goodInfoDialogComfirm: function(val) {
 
@@ -688,6 +691,18 @@
 
               }
 
+              if(this.formValue.is_zero_flag <= 0){
+
+                this.formValue.is_zero_flag = ''
+              } else{
+
+                this.formValue.is_zero_flag = this.formValue.is_zero_flag.toString()
+
+
+              }
+
+
+
               if(this.formValue.is_charge_use <= 0){
 
                 this.formValue.is_charge_use = ''
@@ -745,7 +760,7 @@
               if(this.formValue.drug_classify == 0){
                  this.formValue.drug_classify = ""
               }
-           
+
               if(this.formValue.is_project<=0){
                   this.formValue.is_project = ''
               }else{
@@ -1279,7 +1294,7 @@
            }
 
 
-           
+
 
            if (results[i]['限制性用药'] === undefined) {
                 obj['lmt_used_flag'] = ''
@@ -1519,7 +1534,7 @@
           'drugs':tableData
         };
         console.log("params222222222",params)
-        
+
         postDrugInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg;
@@ -1527,7 +1542,7 @@
              this.getAllManufacturer();
              this.GetAllConfig();
              this.$message.success("导入成功!")
-        
+
            }else{
              this.$message.error("导入失败,请下载日志查看")
            }
@@ -1592,7 +1607,7 @@
 
 
          console.log("this.table",this.list)
-         
+
          for(let i=0;i<this.list.length;i++){
           for(let j=0;j<this.drugCategoryList.length;j++){
               if(this.list[i].drug_category == this.drugCategoryList[j].value){
@@ -1625,7 +1640,7 @@
 
              }
            }
-           
+
           this.list[i].specification_name = this.list[i].dose + this.list[i].dose_unit + this.list[i].min_number + this.list[i].min_unit + "/"+this.list[i].max_unit
 
           if(this.list[i].is_special_diseases == 1 ){

src/xt_pages/data/druguseTemplate.vue

@@ -685,6 +685,12 @@
                     </el-form-item>
                   </el-col>
 
+                  <el-col :span="24">
+                      <el-form-item prop="remark" label="医嘱嘱托 :">
+                        <el-input style="width: 300px" v-model="templateFormEdit.remark"></el-input>&nbsp;
+                      </el-form-item>
+                  </el-col>
+
 
                 </el-row>
               </el-form>
@@ -1453,7 +1459,8 @@
           prescribing_number_unit: '',
           delivery_way: '',
           execution_frequency: '',
-          id: 0
+          id: 0,
+          remark:""
         },
         drugdicForm: {
           name: '',
@@ -2584,6 +2591,7 @@
         this.templateFormEdit.weekday = row.week_days.split(',')
         this.templateFormEdit.drug_id = row.drug_id
         this.templateFormEdit.way  = row.way
+        this.templateFormEdit.remark = row.remark
         this.templateEditFormVisible = true
         if (row.parent_id > 0) {
           this.editDialogTitle = '编辑子药'

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1307,6 +1307,7 @@ export default {
       }],
       tabIndex: 1,
       hisPatientInfo: {},
+      lastHisPatientInfo: {},
       schedule:{},
       loadingtwo: false,
       patientTableData: [{}],
@@ -1918,7 +1919,7 @@ export default {
                 return false
               } else {
                 if (response.data.data.failed_code == -10) {
-                  if(response.data.data.failed_type && response.data.data.failed_type == 100){
+                  if(4 && response.data.data.failed_type == 100){
                     that.event_result = response.data.data.msg
                     that.roleTableData =  that.event_result.output.result
                     that.warm_type =  response.data.data.warm_type
@@ -6096,6 +6097,8 @@ export default {
             this.loading = false
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
+            this.lastHisPatientInfo = response.data.data.last_his_patient_info
+
             this.info = response.data.data.info
             this.order = response.data.data.order
             this.schedule = response.data.data.sch
@@ -6124,6 +6127,11 @@ export default {
               if (this.info.sick_type == 0) {
                 this.form.sick_type = ''
               }
+
+              if(this.org_id == 10721 && this.lastHisPatientInfo.id > 0){
+                   this.form.sick_type = this.lastHisPatientInfo.sick_type
+              }
+
             } else {
               this.form.p_type = 14
               this.form.sick_type = this.sick[0].id
@@ -6134,9 +6142,15 @@ export default {
                   this.form.diagnosis.push(parseInt(response.data.data.last_info.diagnosis.split(',')[i]))
                 }
               }
-
               this.sick_history = ''
+              if(this.org_id == 10721  && this.lastHisPatientInfo.id > 0){
+                this.form.sick_type = this.lastHisPatientInfo.sick_type
+              }
+
             }
+            console.log("this.form.sick_type")
+
+            console.log(this.form.sick_type)
             this.addtions_charge = response.data.data.addtions_charge
 
             if (response.data.data.prescription.length > 0 && response.data.data.prescription[0].advices.length > 0) {

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -332,8 +332,14 @@ export default {
           for (let i = 0; i < list.length; i++) {
             for (let j = 0; j < list[i].orders.length; j++) {
               for (let z = 0; z < list[i].orders[j].order_info.length; z++) {
-                list[i].orders[j].order_info[z].record_date =
-                  list[i].orders[j].settle_accounts_date;
+                if(list[i].orders[j].order_info[z].advice_id > 0){
+                  list[i].orders[j].order_info[z].record_date =
+                    list[i].orders[j].order_info[z].advice.advice_date;
+                }
+                if(list[i].orders[j].order_info[z].project_id > 0){
+                  list[i].orders[j].order_info[z].record_date =
+                    list[i].orders[j].order_info[z].project.record_date;
+                }
                 list[i].orders[j].order_info[z].number =
                   list[i].orders[j].number;
                 this.tableData.push(list[i].orders[j].order_info[z]);

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -331,6 +331,18 @@
               </el-select>
           </el-form-item>
 
+
+          <el-form-item label="是否拆零: " prop="limit_remark" style="width:100%;">
+            <el-select v-model="form.is_zero_flag" style="width:160px;" filterable placeholder="请选择">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
         </el-form>
       </el-tab-pane>
     </el-tabs>
@@ -426,7 +438,8 @@
           bbx01:"",
           bby01:"",
           is_show:"",
-          
+          is_zero_flag:"",
+
         },
 
         rules: {
@@ -663,6 +676,10 @@
         form["bbx01"] = this.form.bbx01
         form["bby01"] = this.form.bby01
         form["is_show"] = this.form.is_show
+        form["is_zero_flag"] = this.form.is_zero_flag
+
+
+
 
         return form
       }, changeSelected: function(val) {

src/xt_pages/user/courseOfDisease_new.vue

@@ -204,8 +204,8 @@
               </el-button>
             </div>
           </div>
-          <div>
-            <text_content @new_content="newcontent"></text_content>
+          <div v-if="AuToShow = true">
+            <text_content @new_content="newcontent" :patient="patient" :prescriptionList="prescriptionList" :berforList="berforList" :monitorList="monitorList" :dryweightList="dryweightList" :inpectionList="inpectionList" :dialysisOrderList="dialysisOrderList"></text_content>
           </div>
         </div>
 
@@ -300,7 +300,14 @@
         tab:[{id:1,name:'人促红注射液',type:'长期医嘱',start:'2024-12-04',dosage:"3000iu",pinlv:'一周三次',status:''},
             {id:2,name:'人促红注射液2',type:'长期医嘱',start:'2024-12-05',dosage:"3000iu",pinlv:'一周三次',status:''}, 
         ],
-        
+        prescriptionList:[],
+        berforList:[],
+        monitorList:[],
+        dryweightList:[],
+        inpectionList:[],
+        dialysisOrderList:[],
+        patient:{},
+        AuToShow:false
       }
     },
     created() {
@@ -545,7 +552,7 @@
             }
           }
         })
-        this.auto_dialog = false
+       
         this.getAutoPatientContent()
       },
       // 本周
@@ -937,7 +944,7 @@
         return anticoagulant_name
       },
       getTime (time) {
-      return uParseTime(time, '{y}-{m}-{d} {h}:{i}:{s}')
+      return uParseTime(time, '{y}-{m}-{d}')
       },
       getTimeOne (time) {
       return uParseTime(time, '{y}-{m}-{d}')
@@ -954,17 +961,47 @@
           end_time:this.end_date,
           patient_id:this.patient_id,
         }
+        console.log("start_time==============",params)
        getAutoPatientContent(params).then(response=>{
           if(response.data.state == 1){
+          
             var prescription =  response.data.data.prescription
+            this.prescriptionList=[]
+            this.prescriptionList = prescription
 
             var berfor = response.data.data.berfor
+            this.berforList = []
+            this.berforList = berfor
 
             var monitorList  = response.data.data.monitorList
+            this.monitorList = []
+            this.monitorList = monitorList
 
             var dryweightList = response.data.data.dryweightList
 
+            this.dryweightList = []
+            this.dryweightList = dryweightList
+
             var inpectionList = response.data.data.inpectionList
+
+            this.inpectionList = []
+
+            this.inpectionList = inpectionList
+            
+            this.patient = {}
+            this.patient = response.data.data.patient
+            if(this.patient.gender == 1){
+               this.patient.gender_name = "男"
+            }
+            if(this.patient.gender == 2){
+               this.patient.gender_name = "女"
+            }
+
+            this.dialysisOrderList=[]
+            this.dialysisOrderList =response.data.data.dialysisOrder
+
+            this.AuToShow = true
+           
           }
        })
 

src/xt_pages/user/text_content.vue

@@ -142,7 +142,32 @@
 </template>
 
 <script>
+import { watch } from 'vue';
+
 export default{
+  props: {
+    patient: {
+      type: Object,
+    },
+    prescriptionList:{
+      type:Array
+    },
+    berforList:{
+      type:Array
+    },
+    monitorList:{
+      type:Array
+    },
+    dryweightList:{
+      type:Array
+    },
+    inpectionList:{
+      type:Array
+    },
+    dialysisOrder:{
+      type:Array
+    }
+  },
   data(){
     return {
       content:'',
@@ -150,7 +175,11 @@ export default{
       num:6,
       tab:[{id:1,name:'人促红注射液',type:'长期医嘱',start:'2024-12-04',dosage:"3000iu",pinlv:'一周三次',status:''},
             {id:2,name:'人促红注射液2',type:'长期医嘱',start:'2024-12-05',dosage:"3000iu",pinlv:'一周三次',status:''}, 
-        ]
+        ],
+       name:"",
+       gander:"",
+       age:0,
+       dialysis_no:""
     }
   },
   created(){
@@ -162,7 +191,7 @@ export default{
               <tr>
                 <td width="130" style="padding: 5px;">基本信息</td>
                 <td style="padding: 5px;">
-                  <span>姓名：朱康林</span>  <span>性别：男</span>  <span>年龄：58</span>  <span>透析号：21000005</span>
+                  <span>姓名：${this.name } </span>  <span>性别：${ this.patient.gender_name  }</span>  <span>年龄：${ this.patient.age }</span>  <span>透析号：${ this.patient.dialysis_no }</span>
                 </td>
               </tr>
               <tr>
@@ -257,7 +286,30 @@ export default{
     this.content = contents
     
   },
+  watch:{
+     patient:function(){
+     
+     }
+  },
   mounted(){
+    console.log("patient---------------------",this.patient)
+    this.name = this.patient.name
+    this.gander = ""
+    this.age = 0
+    this.dialysis_no = ""
+    if(this.patient.gender == 1){
+      this.gander = "男"
+    }
+    if(this.patient.gender == 2){
+      this.gander = "女"
+    }
+    this.age = this.patient.age
+    this.dialysis_no = this.patient.dialysis_no
+
+    console.log("name:",this.name)
+    console.log("gander:",this.gander)
+    console.log("age:",this.age)
+    console.log("dialysis_no:",this.dialysis_no)
     console.log('document.getElementById3334',document.getElementById('editer'))
     const iframeDoc = document.getElementById('editer').getElementsByTagName('tbody')[0].children[9].children[1]
     var newListArr =[]