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

src/api/inspection.js

@@ -115,6 +115,15 @@ export function getNewInspectionDetailList(params){
 }
 
 
+export function EditPatientNewInspection(data){
+ 
+  return request({
+    url:"/api/editpatientnewinspection",
+    method:"post",
+    data:data,
+  })
+}
+
 
 
 

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -861,13 +861,14 @@
                            }}
                           </span>
 
-                          <span v-if="org_id==10510 && record.prescription.mode_id!=2&& record.prescription.mode_id!=5&& record.prescription.mode_id!=12">
+                          <span v-if="org_id==10510 && (record.prescription.mode_id==2 || record.prescription.mode_id==5 || record.prescription.mode_id ==12)">
                               {{
                             record.assessment_after_dislysis.displace_liqui_value
                               ? record.assessment_after_dislysis.displace_liqui_value
                               : "/"
                            }}
                           </span>
+                        
 
                           <span v-if="org_id!=10206&&org_id!=10510">
                             {{

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

@@ -3286,7 +3286,7 @@ mu
             if (this.dialysisPrescription.anticoagulant == '低分子肝素') {
               this.dialysisPrescription.anticoagulant = 3
             }
-            if (this.dialysisPrescription.anticoagulant == 1) {
+            if (this.dialysisPrescription.anticoagulant == 1 || this.dialysisPrescription.anticoagulant == 12) {
               this.dialysisPrescription.anticoagulant_weichi = '0'
               this.dialysisPrescription.anticoagulant_shouji = '0'
               this.dialysisPrescription.anticoagulant_zongliang = '0'
@@ -3837,7 +3837,7 @@ mu
         this.$refs[formName].validate((valid)=>{
           if(valid){
             if(!this.isLoading){
-              if (this.dialysisPrescription.anticoagulant == 1) {
+              if (this.dialysisPrescription.anticoagulant == 1 || this.dialysisPrescription.anticoagulant == 12) {
                 this.dialysisPrescription.anticoagulant_weichi = '0'
                 this.dialysisPrescription.anticoagulant_shouji = '0'
                 this.dialysisPrescription.anticoagulant_zongliang = '0'

src/xt_pages/dialysis/template/DialysisPrintOrderFortyEight.vue

@@ -109,7 +109,7 @@
               ></label-box>&nbsp;
               <label-box
                 :isChecked="
-                  prescription.mode_id == 12
+                  prescription.mode_id == 3
                     ? true
                     : false
                 "
@@ -123,7 +123,7 @@
               ></label-box
               >&nbsp; -->
                   &nbsp;
-                  <span>其他：  <span v-if="prescription.mode_id==3">HD+HP</span>
+                  <span>其他：
                                 <span v-if="prescription.mode_id == 5">
                                 HF
                                 </span>
@@ -145,9 +145,9 @@
                                 <span v-if="prescription.mode_id == 11">
                                 HFR
                                 </span>
-                                <!-- <span v-if="prescription.mode_id == 12">
+                                <span v-if="prescription.mode_id == 12">
                                 HDF+HP
-                                </span> -->
+                                </span>
                                 <span v-if="prescription.mode_id == 13">
                                 CRRT
                                 </span>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -918,12 +918,13 @@
                         </span>
 
                         <span v-if="org_id ==10510 ">
-                          <span v-if="prescription.mode_id!=2&&prescription.mode_id!=5&&presciption.mode_id!=12">{{
+                          <span v-if="prescription.mode_id ==2 || prescription.mode_id ==5 || presciption.mode_id==12">{{
                             afterdialysis.displace_liqui_value
                             ? afterdialysis.displace_liqui_value
                             : "/"
                            }}
                         </span>
+                        <span v-else>/</span>
                         </span>
                         <span v-if="org_id!=10206&& org_id!=10510"> {{
                           prescription.displace_liqui_value

src/xt_pages/org/orginfo.vue

@@ -390,6 +390,7 @@ import Neditor from '@/components/Neditor'
             GetOrgInfo().then(response=>{
                 var res = response.data;
                 if (res.state === 1) {
+                    this.formloading = false;
                     this.form.org_name = res.data.orginfo.org_name;
                     this.form.contact_name = res.data.orginfo.contact_name;
                     this.form.org_introduction = res.data.orginfo.org_introduction;
@@ -410,8 +411,9 @@ import Neditor from '@/components/Neditor'
                     this.form.illness_list = [];
                     this.form.org_gallery = res.data.orginfo.org_gallery;
                     this.fileList = [];
-                    for (const index in this.form.org_gallery) {
-                        var image = {id:this.form.org_gallery[index].id, name:this.form.org_gallery[index].id, url: this.form.org_gallery[index].type==1?this.form.org_gallery[index].url:this.form.org_gallery[index].url+'?vframe/jpg/offset/0/w/100/h/100'};
+                    var gallery =  res.data.orginfo.gallery
+                    for (const index in gallery) {
+                        var image = {id:gallery[index].id, name:gallery[index].id, url:gallery[index].type==1?gallery[index].url:gallery[index].url+'?vframe/jpg/offset/0/w/100/h/100'};
                         this.fileList.push(image);
                     }
 
@@ -488,12 +490,13 @@ import Neditor from '@/components/Neditor'
                         this.childtypes = [];
                     }
                     this.illnessOptions = res.data.illness?res.data.illness:[];
-                    this.formloading = false;
+                   
                 } else {
+                    this.formloading = false;
                     this.$message.error(resp.msg)
                 }
             }).catch(e=>{
-
+                this.formloading = false;
             })
         },
          myTrim(x) {

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -770,6 +770,7 @@
                         that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                         that.form.phone = patient.phone
                         that.form.id_card = patient.id_card_no
+                        that.form.social_type = parseInt(response.data.data.insutype)
 
                       } else {
                         that.form.id = patient.id
@@ -839,7 +840,7 @@
                     that.form.psn_desc = response.data.data.desc
 
                   } else if (that.form.id_card_type == 2) {
-                    2
+                    that.form.social_type = parseInt(response.data.data.insutype)
                     that.form.id = patient.id
                     that.form.name = patient.name
                     that.form.gender = patient.gender

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -431,6 +431,8 @@ export default {
     detalid: Number,
     befor:Object,
     LastCaseHistory:Object,
+    prescriptions:Array,
+    prescriptionInfo:Object,
   },
   components: {
     medicalRecord,
@@ -783,12 +785,32 @@ export default {
         return uParseTime(val, "{y}-{m}-{d}");
       }
     },
+    getDiagnosis(ids){
+        let newIds = ids.split(',').sort(function(a,b){
+          return a-b;
+        })
+        let nameArr = []
+        for(let i=0;i<this.diagnoses.length;i++){
+          if(newIds.indexOf(this.diagnoses[i].id.toString()) > -1){
+            nameArr.push(this.diagnoses[i].class_name)
+          }
+        }
+        let newNameArr = []
+        nameArr.map((item,index) => {
+          newNameArr.push(item)
+          nameArr.splice(index,1,'')
+        })
+        newNameArr.push(...nameArr)
+        console.log("---------------------------",newNameArr.join(' '))
+        return newNameArr.join(' ')
+     },
   },
   created() {
     this.getlist();
     this.getInitData();
     this.wayOptions = getDataConfig("patient", "reimbursement_ways");
-
+    
+    console.log("patient----------------",this.patientInfo)
     if ((this.patientInfo.gender ==1)) {
       this.patientInfo.gender = "男";
     } else if ((this.patientInfo.gender == 2)) {
@@ -867,8 +889,10 @@ export default {
         this.lab_apparatus = this.patientInfo.lab_apparatus;
         console.log("WOWOWOWOOWOWOWWO",this.patientInfo)
         console.log("透气那数据阿道夫阿道夫阿道夫低分安抚",this.LastCaseHistory)
-
-
+        console.log("befor------------------------",this.befor)
+        console.log("patient------------------------",this.patientInfo)
+        console.log("prescriptionInfo--------------------",this.prescriptionInfo)
+        console.log("this.diagnoses",this.diagnoses)
         if(this.befor!=undefined){
           if(this.case_history.temperature == 0){
             this.case_history.temperature =  this.befor.temperature?this.befor.temperature:""
@@ -890,10 +914,22 @@ export default {
             this.case_history.dbp = this.befor.diastolic_blood_pressure?this.befor.diastolic_blood_pressure:""
           }   
         }
+        if(this.patientInfo!=null){
+           this.case_history.chief_conplaint = this.patientInfo.patient_complains
+           this.case_history.history_of_present_illness = this.patientInfo.present_history
+           this.case_history.past_history = this.patientInfo.past_history
+           this.allergic_history = this.patientInfo.allergic_history
+           this.case_history.diagnostic = this.patientInfo.diagnose
+         
+           if(this.prescriptionInfo!=null){
+               console.log("诊断---------------------",this.diagnoses)
+              this.case_history.diagnose = this.getDiagnosis(this.prescriptionInfo.diagnosis) 
+           }
+        }
       },
       deep: true,
     },
-
+ 
     case_history: {
       handler(val, oldval) {
         console.log(val, oldval, "监听中。。");

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -183,7 +183,7 @@
 
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
                      :hisPatientInfo="hisPatientInfo" v-if="titleType == '电子病历'" :detalid="detalid" :befor="befor"
-                     :LastCaseHistory="LastCaseHistory"
+                     :LastCaseHistory="LastCaseHistory" :prescriptions="prescriptions" :prescriptionInfo="prescriptionInfo"
                      ref="child"></desk-record>
         <medicalRecord ref='medicalRecord' @func="getMsgFormSon"></medicalRecord>
         <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
@@ -1995,9 +1995,13 @@ export default {
           this.case_history.physical_examination = this.case_history.physical_examination
           this.case_history.special_inspection = this.case_history.special_inspection
           this.case_history.lab_apparatus = this.case_history.lab_apparatus
-
+    
           //处方相关
           this.prescriptionList = response.data.data.prescription
+
+          var  prescriptionInfo = response.data.data.prescriptionInfo
+          console.log("prescriptionInfo-----------------",prescriptionInfo)
+          this.prescriptionInfo = prescriptionInfo
           let is_medicine = false
           if (response.data.data.prescription.length > 0) {
             for (let i = 0; i < response.data.data.prescription.length; i++) {

src/xt_pages/outpatientDoctorStation/recordTemplate/printFour.vue

@@ -78,10 +78,11 @@
             <div class="otherInfo">
                 <div class="otherName">体格检查：</div>
                 <div style="flex:1;">
-                    <span>体温：{{ history.temperature ? history.temperature + '℃' : '/' }}</span>
+                     {{ history.physical_examination }}
+                    <!-- <span>体温：{{ history.temperature ? history.temperature + '℃' : '/' }}</span>
                     <span>脉搏：{{ history.pulse ? history.pulse + '次/分' : '/' }}</span>
                     <span>呼吸：{{ history.breathing ? history.breathing + '次/分' : '/' }}</span>
-                    <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
+                    <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span> -->
                 </div>
             </div>
             <div class="otherInfo">

src/xt_pages/user/lapsoInspection.vue

@@ -268,7 +268,7 @@
             </el-col>
             <el-col :span="7">
               <el-form-item
-                label="检验日期222"
+                label="检验日期"
                 prop="inspect_date"
                 :rules="[
                   { required: true, message: '请输入检验日期', trigger: 'blur' }
@@ -451,7 +451,8 @@
     setRemind,
     setRemindDialog,
     getNewInspectionList,
-    getNewInspectionDetailList
+    getNewInspectionDetailList,
+    EditPatientNewInspection
   } from '@/api/inspection'
   import { getFileExtension, uParseTime } from '@/utils/tools'
   
@@ -725,7 +726,7 @@
         this.form.formItem = []
         if(this.inspectionData!=null){
           this.formTitle = '修改' + this.project.project_name
-          
+          this.form.method = "edit"
           for(let i=0;i<this.inspectionData.length;i++){
             console.log("类型====================",this.inspectionData[i].inspect_type)
             var obj = {id:0,project_id:0,project_name:"",item_id:0,item_name:"",range_type:"",value:"",unit:"",item_id:0} 
@@ -906,9 +907,12 @@
       //   })
       // },
       submitEdit(){
-         
+          
          console.log("hhahahahh",this.form.formItem)
-        EditPatientNewInspection().then(response=>{
+          var params = {
+            data:this.form.formItem
+          }
+        EditPatientNewInspection(params).then(response=>{
 
         })
       },