bug修改

src/api/patient.js

@@ -36,7 +36,6 @@ export function createPatient(patient) {
   })
 }
 export function editPatient(id, patient) {
-  console.log('patient', patient)
   return request({
     url: '/api/patients/edit?id=' + id + '&record_date=' + patient.record_date + '&is_infectious=' + patient.is_infectious + '&remind_cycle=' + patient.remind_cycle,
     method: 'put',
@@ -238,6 +237,7 @@ export function deleteRescueRecords(patient_id, ids_str) {
 }
 
 export function EditLapseto(patient_id, data) {
+  console.log('data', data)
   return request({
     url: '/api/patients/lapseto/edit?id=' + patient_id,
     method: 'post',
@@ -345,28 +345,18 @@ export function getAllData(id, page, limit) {
   })
 }
 
-
 export function postExportPatients(params) {
   return request({
     url: '/api/patients/export',
     method: 'Post',
-    data: params,
+    data: params
   })
 }
 
-
-
 export function getMaxDialysisNo() {
   return request({
     url: '/api/patients/dialysis_no',
-    method: 'Get',
+    method: 'Get'
   })
 }
 
-
-
-
-
-
-
-

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -170,6 +170,7 @@
           >打印</el-button
         >
       </template>
+
       
     </div>
     <div class="app-container ">
@@ -264,6 +265,14 @@
         v-bind:childResponse="childResponse"
         v-if="org_template_info.template_id == 16"
       ></DialysisPrintOrderSixteen>
+      <DialysisPrintOrderSeventeen
+         v-bind:childResponse="childResponse"
+         v-if="org_template_info.template_id == 17"
+      ></DialysisPrintOrderSeventeen>
+      <DialysisPrintOrderEighteen
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 18"
+      ></DialysisPrintOrderEighteen>
     </div>
   </div>
 </template>
@@ -290,6 +299,8 @@ import DialysisPrintOrderTwelve from "./template/DialysisPrintOrderTwelve";
 import DialysisPrintOrderThirteen from "./template/DialysisPrintOrderThirteen";
 import DialysisPrintOrderFifteen from "./template/DialysisPrintOrderFifteen";
 import DialysisPrintOrderSixteen from "./template/DialysisPrintOrderSixteen";
+import DialysisPrintOrderSeventeen from "./template/DialysisPrintOrderSeventeen";
+import DialysisPrintOrderEighteen from "./template/DialysisPrintOrderEighteen";
 export default {
   name: "dialysisPrintOrder",
   components: {
@@ -308,6 +319,8 @@ export default {
     DialysisPrintOrderEight,
     DialysisPrintOrderNine,
     DialysisPrintOrderSixteen,
+    DialysisPrintOrderSeventeen,
+    DialysisPrintOrderEighteen,
     LabelBox,
     BreadCrumb
   },
@@ -544,6 +557,20 @@ export default {
           style: style,
           scanStyles: false
         });
+      }else if (this.org_template_info.template_id == 17) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
+      }else if (this.org_template_info.template_id == 18) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue

@@ -303,6 +303,7 @@
         }
         this.item_columns = item_inspection_reference
         var projectInfo = this.getPojectInfo(this.item_columns[0].project_id, this.item_columns[0].id)
+        console.log("projectInfo",projectInfo)
         this.query.project_id = projectInfo.project_id
         this.query.item_id = projectInfo.id
         this.item_name = projectInfo.item_name
@@ -332,7 +333,7 @@
               let project = []
               let item = []
               this.all_inspection_reference = resp.data.references
-
+               console.log("====",this.all_inspection_reference)
               for (let i = 0; i < this.all_inspection_reference.length; i++) {
                 project.push(this.all_inspection_reference[i])
               }
@@ -350,6 +351,7 @@
                   item.push(this.all_inspection_reference[i])
                 }
               }
+             console.log("item",item)
               this.item_columns = item
               this.item_name = item[0].item_name
 
@@ -468,6 +470,7 @@
         GetInspectionIndexTable(params)
           .then(rs => {
             var resp = rs.data
+            console.log("resp",resp)
             if (resp.state == 1) {
               this.tableData = []
               for (let i = 0; i < resp.data.data.length; i++) {

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -568,7 +568,8 @@ export default {
       getFirstQuarter(params).then(response=>{
          if(response.data.state === 1){
             var count =  response.data.data.count
-
+            console.log("count",count)  
+            //获取已经配置的数据 
             var arr=[]
             for(let i=0;i<count.length;i++){  
                for(let j=0;j<this.normData.length;j++){
@@ -577,7 +578,8 @@ export default {
                 }
               }
             }
-        
+           console.log("arr",arr )
+           
             var arrtwo =  this.arrayDate(count,this.normData)
             for(let i=0;i<arrtwo.length;i++){
                 this.$set(arrtwo[i], 'Count', 0)
@@ -588,7 +590,7 @@ export default {
             arrtwo.map(item => {
               arr.push(item)
             })
-            arr.sort(this.compare('sort'))    
+            // arr.sort(this.compare('sort'))    
             for(const key in this.normData ){
                this.modesData.xAxis.push(this.normData[key].item_name);
                 if(key in arr){

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -150,7 +150,7 @@ export default {
         start_time: "",
         end_time: "",
         page: 1,
-        limit: 10
+        limit: 20
       },
       total:0,
       lapstor:0,
@@ -328,7 +328,7 @@ export default {
            this.newArr = a
            var arr = this.arrayToObj(a)
 
-         // console.log("娃哈哈",arr)
+          console.log("娃哈哈",arr)
            this.ObjectData = arr
 
 
@@ -445,119 +445,165 @@ export default {
       getPatientsControl(this.lapstor,this.listQuery.start_time,this.listQuery.end_time,this.listQuery.page,this.listQuery.limit).then(response=>{
          if(response.data.state == 1){
            var patients = response.data.data.patients
-             this.tablePatients = patients
-             var total =  response.data.data.total
-             // console.log("total",total)
-             this.total = total
-             var control = response.data.data.control
-
-
-             // console.log("control",control)
-             var newArr = []
-             //分页
-             for(let i=0;i<control.length;i++){
-             for(let j=0;j<patients.length;j++){
-                if(control[i].patient_id == patients[j].patient_id){
-                   newArr.push(control[i])
+            // console.log("patients",patients)
+            this.tablePatients = patients
+            var total = response.data.data.total
+            this.total = total
+            var control = response.data.data.control
+            // console.log("control",control)
+            var newArr = []
+            // 分页
+            for (let i = 0; i < control.length; i++) {
+              for (let j = 0; j < patients.length; j++) {
+                if (control[i].inspect_date == patients[j].inspect_date) {
+                  newArr.push(control[i])
                 }
-             }
-           }
-        // console.log("newArr",newArr)
+              }
+            }
+          // console.log("newArr",newArr)
           let dataInfo = {}
           newArr.forEach((item, index) => {
-            let { patient_id } = item
-            if (!dataInfo[patient_id]) {
-              dataInfo[patient_id] = {
-                patient_id,
-                name:item.name,
+            let { inspect_date } = item
+            if (!dataInfo[inspect_date]) {
+              dataInfo[inspect_date] = {
+                inspect_date,
+                name: item.name,
                 child: [],
-                inspect_date:item.inspect_date
-
+                patient_id: item.patient_id
               }
             }
           })
+        let list = Object.values(dataInfo)
+        
 
-          let list = Object.values(dataInfo)
-          list.map(item => {
+         list.map(item => {
             for (let i = 0; i < newArr.length; i++) {
-               if (item.inspect_date == newArr[i].inspect_date && item.patient_id == newArr[i].patient_id) {
-                   item.child.push(newArr[i])
-                }
+              if (item.inspect_date == newArr[i].inspect_date) {
+                item.child.push(newArr[i])
               }
+            }
+          })
+        //  console.log("list",list)  
+         var newarrtwo = []
+          list.map(item => {
+            item.child.map(it => {
+              newarrtwo.push(it)
             })
-          //console.log("list",list)
-
-          var  newarrtwo = []
-          list.map(item=>{
-              item.child.map(it=>{
-                 newarrtwo.push(it)
-              })
           })
-       // console.log("多少条",newarrtwo)
-
-        //配置的才显示
-
-        var arrthree = []
-        for(let i=0;i<newarrtwo.length;i++){
-           for(let j=0;j<this.normData.length;j++){
-              if(newarrtwo[i].item_id == this.normData[j].inspection_minor){
-                 arrthree.push(newarrtwo[i])
+        //  console.log("newarrtwo",newarrtwo)
+          // 配置的才显示
+         var arrthree = []
+          for (let i = 0; i < newarrtwo.length; i++) {
+            for (let j = 0; j < this.normData.length; j++) {
+              if (newarrtwo[i].item_id == this.normData[j].inspection_minor) {
+                arrthree.push(newarrtwo[i])
               }
-           }
-        }
-        // console.log("arrthree",arrthree)
-
-       var arrfour =  this.arrayDate(arrthree,newarrtwo)
-       // console.log("arrfour",arrfour)
-         arrfour.map(item=>{
-           item.item_name = ""
-           arrthree.push(item)
-         })
-
-          var dd = {};
-           for (const index in arrthree) {
-           if (!(arrthree[index].name in dd)) {
-              dd[arrthree[index].name] = {};
             }
-             if (!(arrthree[index].item_name in dd[arrthree[index].name]) && arrthree[index].item_name != 0) {
-               dd[arrthree[index].name][arrthree[index].item_name] = arrthree[index];
+          }
+          // console.log("arrthree",arrthree)
+          var arrfour = this.arrayDate(arrthree, newarrtwo)
+          // console.log("arrfour",arrfour)
+          arrfour.map(item => {
+            item.item_name = ''
+            arrthree.push(item)
+          })
+          // console.log('arrthree', arrthree)
+          var dd = {}
+          for (const index in arrthree) {
+            if (!(arrthree[index].inspect_date in dd)) {
+              dd[arrthree[index].inspect_date] = {}
+            }
+            console.log("abc",dd[arrthree[index].inspect_date])
+            if (!(arrthree[index].item_name in dd[arrthree[index].inspect_date]) && arrthree[index].item_name != 0) {
+              dd[arrthree[index].inspect_date][arrthree[index].item_name] = arrthree[index]
+             
             }
           }
-          this.tableData= []
-
-          for(const key in dd){
-              for(const mkey in this.ObjectData){
-                 if (!(this.ObjectData[mkey].item_name in dd[key])) {
-                   dd[key][this.ObjectData[mkey].item_name] = {
-                   item_name: this.ObjectData[mkey].item_name,
-                   name: mkey,
-                   inspect_value:0
-                  };
-                }
-              }
-              this.tableData.push({ name: key, data: dd[key]});
-             }
-
-
-            let projectArr = []
-            this.newArr.map(item => {
-              projectArr.push(item.item_name)
-            })
-           // console.log("projectArr",projectArr)
-
-            this.tableData.map(item => {
-            // console.log("item---",item.data)
-              let newarr = Object.values(item.data);
-              // console.log("arr",newarr)
-              newarr.sort((a,b)=>{
-                // console.log(1111,a)
-                // console.log(2222,b)
-                return projectArr.indexOf(a.item_name)-projectArr.indexOf(b.item_name);
-              });
-              item.data = newarr
-             // console.log(1111111111,item.data)
-            })
-         console.log("表",this.tableData)
+         console.log("dd",dd)
+        //   let dataInfotwo = {}
+        //   newArr.forEach((item, index) => {
+        //     let { inspect_date } = item
+        //     if (!dataInfotwo[inspect_date]) {
+        //       dataInfotwo[inspect_date] = {
+        //         inspect_date,
+        //         name: item.name,
+        //         item_id:item.item_id,
+        //         item_name:item.item_name,
+        //         range_max:item.range_max,
+        //         range_min:item.range_min,
+        //       }
+        //     }
+        //   })
+        // let listtwo = Object.values(dataInfotwo)
+        //  console.log("listtwo",listtwo)
+        // let arrsix = []
+        // for(let i=0;i<listtwo.length;i++){
+        //    arrsix.push({
+        //         name:listtwo[i].name,
+        //        inspectdate:dd[listtwo[i].inspect_date]
+        //    })
+        // }
+      //  var obj = {}
+      //  var fruitsObj = {...arrsix}
+      //  console.log("陈工",fruitsObj)
+      //  console.log("objecdat",this.ObjectData)
+       
+          // for (const key in dd) {
+          //   var total = 0;
+          //   for (const mkey in this.modeOptions) {
+          //     if (mkey in dd[key]) {
+          //       dd[key][mkey].mode = this.modeOptions[mkey].name;
+          //       var number = parseInt(dd[key][mkey].number);
+          //       if (isNaN(number) || number == 0) {
+          //         dd[key][mkey].number = "";
+          //         number = 0;
+          //       }
+          //       total += number;
+          //     } else {
+          //       dd[key][mkey] = {
+          //         mode: this.modeOptions[mkey].name,
+          //         mode_id: mkey,
+          //         number: 0
+          //       };
+          //     }
+          //   }
+          //   this.tableData.push({ date: key, data: dd[key], total: total });
+          // }
+       
+          //  for(const key in dd){
+          //    for(const mkey in this.ObjectData){
+          //       if(mkey in dd[key]){
+          //         dd[key][mkey].item_name =  this.ObjectData[mkey].item_name
+          //         var inspect_value = dd[key][mkey].inspect_value
+          //         if(inspect_value == 0){
+          //           inspect_value = 0
+          //         }
+          //       }else{
+          //         dd[key][mkey] = {
+          //            item_name:this.ObjectData[mkey].item_name,
+          //            item_id:mkey,
+          //            inspect_value:0,
+          //         }
+          //       }
+          //    }
+          //    this.tableData.push({ date: key, data: dd[key]})
+          //  }
+
+          //  console.log("表哥",this.tableData)
+
+
+          // for (const key in dd) {
+          //   for (const mkey in this.ObjectData) {
+          //     if (!(this.ObjectData[mkey].item_name in dd[key])) {
+          //       dd[key][this.ObjectData[mkey].item_name] = {
+          //         item_name: this.ObjectData[mkey].item_name,
+          //         name: mkey,
+          //         inspect_value: 0
+          //       }
+          //     }
+          //   }
+          //   this.tableData.push({ name: key, data: dd[key]})
+          // }
          }
       })
     },
@@ -571,11 +617,11 @@ export default {
         var result = [];
         for(var i = 0; i < array2.length; i++){
             var obj = array2[i];
-            var num = obj.patient_id;   //staff_id   就是要对比的key
+            var num = obj.item_id;   //staff_id   就是要对比的key
             var isExist = false;
             for(var j = 0; j < array1.length; j++){
                 var aj = array1[j];
-                var n = aj.patient_id;
+                var n = aj.item_id;
                 if(n == num){
                     isExist = true;
                     break;

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

@@ -326,10 +326,13 @@ export default {
               dd[dtd[index].date][dtd[index].mode_id] = dtd[index];
             }
           }
+          console.log("dd",dd)
           for (const key in dd) {
             var total = 0;
             for (const mkey in this.modeOptions) {
               if (mkey in dd[key]) {
+                console.log("=====",dd[key])
+                console.log(this.modeOptions[mkey].name)
                 dd[key][mkey].mode = this.modeOptions[mkey].name;
                 var number = parseInt(dd[key][mkey].number);
                 if (isNaN(number) || number == 0) {

src/xt_pages/user/components/PatientForm.vue

@@ -280,7 +280,7 @@
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''" v-show="showLapseto">
                 <el-form-item
                   label="治疗状态(转归) : "
                   class="is-required"
@@ -1225,6 +1225,7 @@ export default {
       ],
 
       subscibe: {},
+      showLapseto:true,
       rules: {
         contagions: [
           {
@@ -1275,6 +1276,9 @@ export default {
     }
   },
   created() {
+    if(this.isEdit == true){
+       this.showLapseto = false
+    }
     // this.styleOptions = this.$store.getters.patient_types;
     // this.partitionOptions = this.$store.getters.partitions;
     this.maritalOptions = getDataConfig("patient", "marital_options");

src/xt_pages/user/patients.vue

@@ -489,7 +489,7 @@
             </el-radio-group>
           </el-form-item> -->
           <el-form-item label="治疗状态(转归):" prop="lapseto_type" required>
-              <el-radio v-model="lapsetoForm.lapseto_type">{{lapeseto}}</el-radio>
+              <el-radio v-model="lapsetoForm.lapseto_type" :label="lapsetoForm.lapseto_type">{{lapeseto}}</el-radio>
           </el-form-item>
           <el-form-item label="转归时间 :" prop="lapseto_time" required>
             <el-date-picker
@@ -1111,6 +1111,12 @@
           this.$message.error('请选择时间')
           return
         }
+         if(this.lapeseto == "留治"){
+           this.lapsetoForm.lapseto_type = 1
+         }
+         if(this.lapeseto == "转出"){
+           this.lapsetoForm.lapseto_type = 2
+         }
         EditLapseto(this.lapsetoForm.patient_id, this.lapsetoForm).then(
           response => {
             if (response.data.state === 1) {