Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/api/his/his.js

@@ -450,3 +450,15 @@ export function saveTeam(data, params) {
     params:params,
   });
 }
+
+
+
+
+export function editTeam(params,data) {
+  return request({
+    url: "/api/his/updateprojectteam",
+    method: "post",
+    data:data,
+    params:params,
+  });
+}

src/xt_pages/data/components/editInspection.vue

@@ -68,7 +68,7 @@
                           highlight-current-row ref="tab">
                     <el-table-column align="center" prop="name" label="分类" width="120">
                         <template slot-scope="scope">
-                            <div >{{scope.row.type == 2?getId(scope.row.statistical_classification):'耗材'}}</div>
+                            <div>{{scope.row.type == 2?getId(scope.row.statistical_classification):'耗材'}}</div>
                         </template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="组套明细" width="120">
@@ -95,7 +95,7 @@
                                         type="danger"
                                         icon="el-icon-delete"
                                         size="small"
-                                        @click="DeleteProject(scope.row.id,scope.$index)"
+                                        @click="DeleteProject(scope.row.m_id,scope.$index)"
                                 ></el-button>
                             </el-tooltip>
                         </template>
@@ -113,6 +113,9 @@
 </template>
 
 <script>
+  import {
+    editTeam
+  } from '@/api/his/his'
   import {
     addProjectList,
     DeleteProject,
@@ -201,7 +204,8 @@
                 project_name: projectList[i].project_name,
                 unit: projectList[i].unit,
                 price: projectList[i].price,
-                type: 2
+                type: 2,
+                m_id: 0
               }
               this.projectList.push(obj)
 
@@ -215,7 +219,9 @@
                 project_name: goodInfos[i].good_name,
                 unit: goodInfos[i].good_unit,
                 price: goodInfos[i].retail_price,
-                type: 3
+                type: 3,
+                m_id: 0
+
               }
               this.projectList.push(obj)
             }
@@ -230,6 +236,7 @@
       getProjectTeamDetail(id) {
         getProjectTeamDetail(id).then(response => {
           if (response.data.state == 1) {
+            this.tableData = []
             var projectTeamDetail = response.data.data.projectTeamDetail
             var hisList = response.data.data.hisList
 
@@ -239,17 +246,18 @@
             for (let i = 0; i < hisList.length; i++) {
 
               let obj = {
+                m_id: hisList[i].id,
                 id: hisList[i].project_id,
                 number: hisList[i].number,
                 type: hisList[i].type
               }
-              if(hisList[i].type == 2){
+              if (hisList[i].type == 2) {
                 obj['statistical_classification'] = hisList[i].project.statistical_classification
                 obj['project_name'] = hisList[i].project.project_name
                 obj['unit'] = hisList[i].project.unit
                 obj['price'] = hisList[i].project.price
 
-              }else{
+              } else {
                 obj['project_name'] = hisList[i].good_info.good_name
                 obj['unit'] = hisList[i].good_info.good_unit
                 obj['price'] = hisList[i].good_info.retail_price
@@ -279,13 +287,11 @@
         this.$refs[formName].validate((valid) => {
           var arr = []
           for (let i = 0; i < this.tableData.length; i++) {
-            arr.push(this.tableData[i].id)
+            if (this.tableData[i].m_id == 0) {
+              arr.push(this.tableData[i])
+            }
           }
 
-          var ids = arr.join(',')
-          var item_id = this.form.item_id + ',' + this.item_id.join(',')
-          console.log('item_id', item_id)
-
           if (valid) {
             var params = {
               id: this.form.id,
@@ -295,17 +301,17 @@
               wubi: this.form.wubi,
               tube_color: this.form.tube_color,
               team_type: this.form.team_type,
-              remark: this.form.remark,
-              ids: ids,
-              item_id: item_id
+              remark: this.form.remark
             }
-            // console.log("params",params)
-            updatedProjectTeam(params).then(response => {
+            let data = {
+              'info': arr
+            }            // console.log("params",params)
+            editTeam(params, data).then(response => {
               if (response.data.state == 1) {
-                var projectTeam = response.data.data.projectTeam
+                // var projectTeam = response.data.data.projectTeam
                 this.$message.success('保存成功')
                 this.visible = false
-                this.$parent.getlist()
+                // this.$parent.getlist()
               }
             })
           }
@@ -325,46 +331,51 @@
         return name
       },
       addProjectList() {
-
-        console.log('表格', this.tableData)
-        const params = {
-          id: this.form.project_detail,
-          number: parseInt(this.form.number)
-        }
-        console.log('params', params)
-        addProjectList(params).then(response => {
-          if (response.data.state == 1) {
-            var projectList = response.data.data.projectList
-            projectList.number = parseInt(this.form.number)
-            this.tableData.push(projectList)
-            console.log('23333', this.tableData)
-            var item = response.data.data.item
-            this.item_id.push(item.id)
-            this.$message.success('保存成功')
+        for (let i = 0; i < this.projectList.length; i++) {
+          if (this.form.project_detail == this.projectList[i].id) {
+            this.projectList[i].number = this.form.number
+            this.projectList[i].number = this.projectList[i].number.toString()
+            this.tableData.push(this.projectList[i])
             this.form.project_detail = ''
             this.form.number = ''
-            this.getlist()
           }
-        })
+        }
+
       },
       DeleteProject(id, index) {
 
-        this.$confirm('确认删除此项目吗?', '删除', {
-          confirmButtonText: '确 定',
-          cancelButtonText: '取 消',
-          type: 'warning'
-        }).then(() => {
-          DeleteProject(id).then(response => {
-            if (response.data.state == 1) {
-              this.tableData.splice(index, 1)
-
-            } else {
+        if (id == 0) {
+          this.$confirm('确认删除此项目吗?', '删除', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+            this.tableData.splice(index, 1)
 
-            }
           })
-        })
-          .catch(() => {
+            .catch(() => {
+            })
+
+        } else {
+          this.$confirm('确认删除此项目吗?', '删除', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+            DeleteProject(id).then(response => {
+              if (response.data.state == 1) {
+                this.tableData.splice(index, 1)
+
+              } else {
+
+              }
+            })
           })
+            .catch(() => {
+            })
+
+        }
+
       }
     },
     created() {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -703,13 +703,26 @@
           let count = 0;
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
             if (project_ids[i].price == project_month_prescriptions.project[a].price) {
-              obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
-              obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification;
+
+              if(project_month_prescriptions.project[a].type == 2){
+                obj['statistical_classification'] =  project_month_prescriptions.project[a].project.statistical_classification
+                obj['medical_code'] =  project_month_prescriptions.project[a].project.medical_code
+                obj['project_name'] =  project_month_prescriptions.project[a].project.project_name
+
+              }else if(project_month_prescriptions.project[a].type == 3){
+                obj['statistical_classification'] = ""
+                obj['medical_code'] =  project_month_prescriptions.project[a].good_info.medical_insurance_number
+                obj['project_name'] =  project_month_prescriptions.project[a].good_info.good_name
+              }
+
+
+              // obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
+              // obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification;
               obj['single_dose'] = project_month_prescriptions.project[a].single_dose;
               obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way;
               obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency;
               obj['number_days'] = project_month_prescriptions.project[a].day;
-              obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code;
+              // obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code;
               obj['unit'] = project_month_prescriptions.project[a].unit;
               obj['project_id'] = project_month_prescriptions.project[a].project_id;
               count = count + project_month_prescriptions.project[a].count;
@@ -717,8 +730,12 @@
               obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
 
             }
+
+
           }
           obj['total'] = count;
+
+
           projects.push(obj)
         }
 
@@ -1010,8 +1027,8 @@
                     let obj = {
                       id: prescription.project[b].id,
                       project_id: prescription.project[b].project_id,
-                      project_name: prescription.project[b].project.project_name,
-                      statistical_classification: prescription.project[b].project.statistical_classification,
+                      // project_name: prescription.project[b].project.project_name,
+                      // statistical_classification: prescription.project[b].project.statistical_classification,
                       single_dose: prescription.project[b].single_dose,
                       delivery_way: prescription.project[b].delivery_way,
                       execution_frequency: prescription.project[b].execution_frequency,
@@ -1019,9 +1036,21 @@
                       total: prescription.project[b].count.toString(),
                       price: prescription.project[b].price,
                       remark: prescription.project[b].remark,
-                      medical_code: prescription.project[b].project.medical_code,
+                      // medical_code: prescription.project[b].project.medical_code,
                       unit: prescription.project[b].project.unit
                     };
+
+                    if(prescription.project[b].type == 2){
+                      obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                      obj['medical_code'] =  prescription.project[b].project.medical_code
+                      obj['project_name'] =  prescription.project[b].project.project_name
+
+                    }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
+                    }
+
                     tempProject.push(obj)
                   }
 
@@ -1117,8 +1146,8 @@
                     let obj = {
                       id: prescription.project[b].id,
                       project_id: prescription.project[b].project_id,
-                      project_name: prescription.project[b].project.project_name,
-                      statistical_classification: prescription.project[b].project.statistical_classification,
+                      // project_name: prescription.project[b].project.project_name,
+                      // statistical_classification: prescription.project[b].project.statistical_classification,
                       single_dose: prescription.project[b].single_dose,
                       delivery_way: prescription.project[b].delivery_way,
                       execution_frequency: prescription.project[b].execution_frequency,
@@ -1126,9 +1155,21 @@
                       total: prescription.project[b].count.toString(),
                       price: prescription.project[b].price,
                       remark: prescription.project[b].remark,
-                      medical_code: prescription.project[b].project.medical_code,
+                      // medical_code: prescription.project[b].project.medical_code,
                       unit: prescription.project[b].project.unit
                     };
+
+                    if(prescription.project[b].type == 2){
+                      obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                      obj['medical_code'] =  prescription.project[b].project.medical_code
+                      obj['project_name'] =  prescription.project[b].project.project_name
+
+                    }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
+                    }
+
                     tempProject.push(obj)
                   }
 
@@ -2469,7 +2510,8 @@
                   price: temp2[b].price,
                   remark: '',
                   medical_code: temp2[b].medical_code,
-                  unit: temp2[b].unit
+                  unit: temp2[b].unit,
+                  type: temp2[b].type
                 }
                 if (obj.total == 0) {
                   obj.total = 1
@@ -2496,11 +2538,50 @@
         this.teamList = row
       },
       getlist() {
+        this.tabProject = []
         getHisProject().then(response => {
           if (response.data.state == 1) {
             var project = response.data.data.project
-            this.tabProject = project
-            this.allProject = project
+            for(let i = 0; i < project.length; i++){
+              let obj = {
+                id:project[i].id,
+                project_name:project[i].project_name,
+                statistical_classification:project[i].statistical_classification,
+                single_dose:project[i].single_dose,
+                delivery_way:project[i].delivery_way,
+                execution_frequency:project[i].execution_frequency,
+                number_days:project[i].number_days,
+                price: project[i].price,
+                medical_code:project[i].medical_code,
+                unit: project[i].unit,
+                type: 2,
+              }
+
+              this.tabProject.push(obj)
+            }
+
+
+
+            var good_info = response.data.data.good_info
+
+            for(let i = 0; i < good_info.length; i++){
+              let obj = {
+                id:good_info[i].id,
+                project_name:good_info[i].good_name,
+                statistical_classification: 0,
+                single_dose:1,
+                delivery_way:"",
+                execution_frequency:"",
+                number_days:1,
+                price: good_info[i].retail_price,
+                medical_code:good_info[i].medical_insurance_number,
+                unit: this.getGoodUnit(good_info[i].good_unit),
+                type: 3,
+              }
+              this.tabProject.push(obj)
+            }
+
+            this.allProject = this.tabProject
 
           }
         })
@@ -2517,6 +2598,13 @@
           }
         })
         return targetObj
+      },getGoodUnit(id){
+        var goodUnit =  this.$store.getters.good_unit;
+        for(let i = 0; i < goodUnit.length; i++){
+          if(goodUnit[i].id == id){
+            return goodUnit[i].name
+          }
+        }
       },
       getAllProjectTeam() {
         getAllProjectTeam().then(response => {

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -85,7 +85,7 @@
         <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span></template>
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-        <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
+        <template slot-scope="scope">{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">
@@ -208,7 +208,7 @@
         input: 1,
       }
     },
-    
+
    methods:{
      createFilter(queryString) {
        return (restaurant) => {
@@ -395,7 +395,7 @@
       }
     },mounted(){
       this.getInitData()
-     
+
     },
     watch:{
       // "prescription.advices":{
@@ -405,8 +405,8 @@
       //       if(item.single_dose != oldVal[index].single_dose || item.number_days != oldVal[index].number_days){
       //         item.total = item.single_dose * item.number_days
       //       }
-            
-            
+
+
       //     })
       //   },
       //   deep:true
@@ -417,13 +417,13 @@
       //       if(item.single_dose != oldVal[index].single_dose || item.number_days != oldVal[index].number_days){
       //         item.total = item.single_dose * item.number_days
       //       }
-            
+
       //     })
       //   },
       //   deep:true
       // }
     }
-    
+
   }
 </script>
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -92,6 +92,7 @@
                              style="position: fixed;width: calc(100% - 490px);background:#fff;">
                         <el-tab-pane label="电子处方" name="电子处方"></el-tab-pane>
                         <el-tab-pane label="电子病历" name="电子病历"></el-tab-pane>
+                        <el-tab-pane label="透析记录" name="透析记录"></el-tab-pane>
                     </el-tabs>
                     <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
                         <el-button size="small" ref="button_one" @click="open(1)" type="primary"
@@ -134,6 +135,7 @@
 
                 <medicalRecord ref='medicalRecord' @func="getMsgFormSon"></medicalRecord>
                 <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
+                <dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'></dialysis-index>
             </div>
 
         </div>
@@ -210,6 +212,7 @@
   import print from './print'
   import treatPrint from './treatPrint'
   import recordPrint from './recordPrint'
+  import dialysisIndex from './components/dialysisIndex'
 
   const moment = require('moment')
 
@@ -222,7 +225,8 @@
       saveRecordTemplate,
       print,
       treatPrint,
-      recordPrint
+      recordPrint,
+      dialysisIndex
     },
     data() {
       return {
@@ -710,13 +714,26 @@
           let count = 0
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
             if (project_ids[i].price == project_month_prescriptions.project[a].price) {
-              obj['project_name'] = project_month_prescriptions.project[a].project.project_name
-              obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
+
+
+              if(project_month_prescriptions.project[a].type == 2){
+                obj['statistical_classification'] =  project_month_prescriptions.project[a].project.statistical_classification
+                obj['medical_code'] =  project_month_prescriptions.project[a].project.medical_code
+                obj['project_name'] =  project_month_prescriptions.project[a].project.project_name
+
+              }else if(project_month_prescriptions.project[a].type == 3){
+                obj['statistical_classification'] = ""
+                obj['medical_code'] =  project_month_prescriptions.project[a].good_info.medical_insurance_number
+                obj['project_name'] =  project_month_prescriptions.project[a].good_info.good_name
+              }
+
+              // obj['project_name'] = project_month_prescriptions.project[a].project.project_name
+              // obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
               obj['single_dose'] = project_month_prescriptions.project[a].single_dose
               obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way
               obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency
               obj['number_days'] = project_month_prescriptions.project[a].day
-              obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
+              // obj['medical_c/**/ode'] = project_month_prescriptions.project[a].project.medical_code
               obj['unit'] = project_month_prescriptions.project[a].unit
               obj['project_id'] = project_month_prescriptions.project[a].project_id
               count = count + project_month_prescriptions.project[a].count
@@ -1151,8 +1168,8 @@
                   let obj = {
                     id: prescription.project[b].id,
                     project_id: prescription.project[b].project_id,
-                    project_name: prescription.project[b].project.project_name,
-                    statistical_classification: prescription.project[b].project.statistical_classification,
+                    // project_name: prescription.project[b].project.project_name,
+                    // statistical_classification: prescription.project[b].project.statistical_classification,
                     single_dose: prescription.project[b].single_dose,
                     delivery_way: prescription.project[b].delivery_way,
                     execution_frequency: prescription.project[b].execution_frequency,
@@ -1160,9 +1177,22 @@
                     total: prescription.project[b].count.toString(),
                     price: prescription.project[b].price,
                     remark: prescription.project[b].remark,
-                    medical_code: prescription.project[b].project.medical_code,
+                    // medical_code: prescription.project[b].project.medical_code,
                     unit: prescription.project[b].project.unit
                   }
+
+                  if(prescription.project[b].type == 2){
+                    obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                    obj['medical_code'] =  prescription.project[b].project.medical_code
+                    obj['project_name'] =  prescription.project[b].project.project_name
+
+                  }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
+                  }
+
+
                   tempProject.push(obj)
                 }
 
@@ -1336,8 +1366,8 @@
                         let obj = {
                           id: prescription.project[b].id,
                           project_id: prescription.project[b].project_id,
-                          project_name: prescription.project[b].project.project_name,
-                          statistical_classification: prescription.project[b].project.statistical_classification,
+                          // project_name: prescription.project[b].project.project_name,
+                          // statistical_classification: prescription.project[b].project.statistical_classification,
                           single_dose: prescription.project[b].single_dose,
                           delivery_way: prescription.project[b].delivery_way,
                           execution_frequency: prescription.project[b].execution_frequency,
@@ -1345,9 +1375,20 @@
                           total: prescription.project[b].count.toString(),
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
-                          medical_code: prescription.project[b].project.medical_code,
+                          // medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].unit
                         };
+                        if(prescription.project[b].type == 2){
+                          obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                          obj['medical_code'] =  prescription.project[b].project.medical_code
+                          obj['project_name'] =  prescription.project[b].project.project_name
+
+                        }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
+                        }
+
                         tempProject.push(obj)
                       }
                       for (let b = 0; b < prescription.addition.length; b++) {
@@ -1505,8 +1546,8 @@
                         let obj = {
                           id: prescription.project[b].id,
                           project_id: prescription.project[b].project_id,
-                          project_name: prescription.project[b].project.project_name,
-                          statistical_classification: prescription.project[b].project.statistical_classification,
+                          // project_name: prescription.project[b].project.project_name,
+                          // statistical_classification: prescription.project[b].project.statistical_classification,
                           single_dose: prescription.project[b].single_dose,
                           delivery_way: prescription.project[b].delivery_way,
                           execution_frequency: prescription.project[b].execution_frequency,
@@ -1514,9 +1555,19 @@
                           total: prescription.project[b].count.toString(),
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
-                          medical_code: prescription.project[b].project.medical_code,
+                          // medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].unit
                         };
+                        if(prescription.project[b].type == 2){
+                          obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                          obj['medical_code'] =  prescription.project[b].project.medical_code
+                          obj['project_name'] =  prescription.project[b].project.project_name
+
+                        }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
+                        }
                         tempProject.push(obj)
                       }
                       for (let b = 0; b < prescription.addition.length; b++) {
@@ -1675,8 +1726,8 @@
                         let obj = {
                           id: prescription.project[b].id,
                           project_id: prescription.project[b].project_id,
-                          project_name: prescription.project[b].project.project_name,
-                          statistical_classification: prescription.project[b].project.statistical_classification,
+                          // project_name: prescription.project[b].project.project_name,
+                          // statistical_classification: prescription.project[b].project.statistical_classification,
                           single_dose: prescription.project[b].single_dose,
                           delivery_way: prescription.project[b].delivery_way,
                           execution_frequency: prescription.project[b].execution_frequency,
@@ -1684,9 +1735,19 @@
                           total: prescription.project[b].count.toString(),
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
-                          medical_code: prescription.project[b].project.medical_code,
+                          // medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].unit
                         };
+                        if(prescription.project[b].type == 2){
+                          obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                          obj['medical_code'] =  prescription.project[b].project.medical_code
+                          obj['project_name'] =  prescription.project[b].project.project_name
+
+                        }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
+                        }
                         tempProject.push(obj)
                       }
                       for (let b = 0; b < prescription.addition.length; b++) {
@@ -1895,8 +1956,8 @@
                       let obj = {
                         id: prescription.project[b].id,
                         project_id: prescription.project[b].project_id,
-                        project_name: prescription.project[b].project.project_name,
-                        statistical_classification: prescription.project[b].project.statistical_classification,
+                        // project_name: prescription.project[b].project.project_name,
+                        // statistical_classification: prescription.project[b].project.statistical_classification,
                         single_dose: prescription.project[b].single_dose,
                         delivery_way: prescription.project[b].delivery_way,
                         execution_frequency: prescription.project[b].execution_frequency,
@@ -1904,9 +1965,19 @@
                         total: prescription.project[b].count.toString(),
                         price: prescription.project[b].price,
                         remark: prescription.project[b].remark,
-                        medical_code: prescription.project[b].project.medical_code,
+                        // medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].unit
                       }
+                      if(prescription.project[b].type == 2){
+                        obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                        obj['medical_code'] =  prescription.project[b].project.medical_code
+                        obj['project_name'] =  prescription.project[b].project.project_name
+
+                      }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
+                      }
                       tempProject.push(obj)
                     }
                     for (let b = 0; b < prescription.addition.length; b++) {
@@ -2062,11 +2133,11 @@
                     tempAdvice.push(obj)
                   }
                   for (let b = 0; b < prescription.project.length; b++) {
+
+
                     let obj = {
                       id: prescription.project[b].id,
                       project_id: prescription.project[b].project_id,
-                      project_name: prescription.project[b].project.project_name,
-                      statistical_classification: prescription.project[b].project.statistical_classification,
                       single_dose: prescription.project[b].single_dose,
                       delivery_way: prescription.project[b].delivery_way,
                       execution_frequency: prescription.project[b].execution_frequency,
@@ -2074,10 +2145,20 @@
                       total: prescription.project[b].count.toString(),
                       price: prescription.project[b].price,
                       remark: prescription.project[b].remark,
-                      medical_code: prescription.project[b].project.medical_code,
                       unit: prescription.project[b].unit
                     }
-                    tempProject.push(obj)
+                    if(prescription.project[b].type == 2){
+                      obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                      obj['medical_code'] =  prescription.project[b].project.medical_code
+                      obj['project_name'] =  prescription.project[b].project.project_name
+
+                    }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
+                    }
+
+                      tempProject.push(obj)
                   }
                   for (let b = 0; b < prescription.addition.length; b++) {
                     let obj = {