提交代码

src/xt_pages/outpatientCharges/statementTemplate/printFour.vue

                                 </div>
                                 <div style="border-right:1px solid #000;width:15%;text-align:center;">
                                     <p class="chargeP">
-                                        <span v-if='item.type == 1'>{{item.advice.drug.drug_spec}}</span>
-                                        <span v-if='item.type == 2'>{{item.project.project.unit}}</span>
-                                        <span v-if='item.type == 3'>{{item.project.unit}}</span>
+                                        <span v-if='item.type == 1'>{{ item.advice.drug.dose + item.advice.drug.dose_unit + "*" +item.advice.drug.min_number + item.advice.drug.min_unit +"/" + item.advice.drug.max_unit}}</span>
+                                        <span v-if='item.project.type == 2'>{{item.project.project.unit}}</span>
+                                        <span v-if='item.project.type == 3'>{{item.project.unit}}</span>
                                     </p>
                                 </div>
                                 <div style="border-right:1px solid #000;width:15%;text-align:center;">
                                     <p class="chargeP">
-                                        <span>{{item.cnt}}次</span>
+                                      <span v-if='item.type == 1'>{{item.cnt}}{{item.advice.prescribing_number_unit}}</span>
+                                      <span v-if='item.project.type == 2'>{{item.cnt}}{{item.project.project.unit}}</span>
+                                      <span v-if='item.project.type == 3'>{{item.cnt}}{{item.project.unit}}</span>
                                     </p>
                                 </div>
                                 <div style="border-right:1px solid #000;width:15%;text-align:center;">
                               </div>
                               <div style="border-right:1px solid #000;width:15%;text-align:center;">
                                   <p class="chargeP">
-                                      <span v-if='item.advice_id > 0'>{{item.advice.drug.drug_spec}}</span>
+                                      <span v-if='item.advice_id > 0'>{{item.advice.drug.dose + item.advice.drug.dose_unit + "*" +item.advice.drug.min_number + item.advice.drug.min_unit +"/" + item.advice.drug.max_unit}}</span>
                                       <span v-if='item.project.type == 2'>{{item.project.project.unit}}</span>
                                       <span v-if='item.project.type == 3'>{{item.project.unit}}</span>
                                   </p>

src/xt_pages/outpatientTool/components/settle.vue

               <template slot-scope="scope">{{scope.row.hifmi_pay.toFixed(2)}}</template>
           </el-table-column>
 
+        <el-table-column align="center" prop="item_name" label="其他支付">
+          <template slot-scope="scope">{{scope.row.oth_pay.toFixed(2)}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="item_name" label="公务员医疗补助资金支出">
+          <template slot-scope="scope">{{scope.row.cvlserv_pay.toFixed(2)}}</template>
+        </el-table-column>
+
         <el-table-column align="center" prop="item_name" label="微信支付">
           <template slot-scope="scope">{{scope.row.wechat_pay}}</template>
         </el-table-column>
         })
         this.sameRowArr = sameRowArr
       }, merge({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex === 0 || columnIndex === 1  || columnIndex === 15) {
+        if (columnIndex === 0 || columnIndex === 1) {
           const _row = this.tempArr[rowIndex]
           const _col = _row > 0 ? 1 : 0
           return {

src/xt_pages/user/components/PatientSidebar.vue

               name:'1-7',
               label:'血管通路'
             },
-            {
-              name: '1-2',
-              label: '病程管理'
-            },
-            {
-              name: '1-9',
-              label: '阶段小结'
-            },
-            {
-              name: '1-10',
-              label: '出院小结'
-            },
-            {
-              name: '1-3',
-              label: '检验检查'
-            },
-            {
-              name:'1-8',
-              label:'传染病管理'
-            },
-            {
-              name: '1-5',
-              label: '抢救记录'
-            },
-            {
-              name: '1-11',
-              label: '首次病程记录'
-            }
+            // {
+            //   name: '1-2',
+            //   label: '病程管理'
+            // },
+            // {
+            //   name: '1-9',
+            //   label: '阶段小结'
+            // },
+            // {
+            //   name: '1-10',
+            //   label: '出院小结'
+            // },
+            // {
+            //   name: '1-3',
+            //   label: '检验检查'
+            // },
+            // {
+            //   name:'1-8',
+            //   label:'传染病管理'
+            // },
+            // {
+            //   name: '1-5',
+            //   label: '抢救记录'
+            // },
+            // {
+            //   name: '1-11',
+            //   label: '首次病程记录'
+            // }
           ]
         },
         {
               label: '宣教信息'
             }
           ]
-        }, {
+        },
+        {
           name: '3',
           label: '病情记录',
           children: [
               label: '体格检查'
             },
             {
-              name: '3-3',
+              name: '1-11',
               label: '首次病程记录'
             },
             {
-              name: '3-4',
+              name: '1-2',
               label: '病程记录'
             }, {
-              name: '3-5',
+              name: '1-5',
               label: '抢救记录'
             }, {
-              name: '3-6',
+              name: '1-9',
               label: '阶段小结'
             }, {
-              name: '3-7',
+              name: '1-10',
               label: '出院小结'
             }
           ]
-        }
+        },
+        {
+          name: '4',
+          label: '检验检查',
+          children: [
+            {
+              name: '1-3',
+              label: '肾科检验'
+            },
+            {
+              name: '4-1',
+              label: '肾科检查'
+            },
+            {
+              name: '4-3',
+              label: 'KT/V'
+            },
+            {
+              name: '1-8',
+              label: '传染病管理'
+            },
+          ]
+        },
+
       ],
       name:""
     }
       } else if(name == '3-2'){
         this.$router.push({path:'/patient/patient/'+this.id+'/firstDisease'})
 
+      }else if(name == '4-1'){
+        this.$router.push({path:'/patients/inspection_check?id='+this.id})
+      }else if(name == '4-3'){
+        this.$router.push({path:'/patients/ktv?id='+this.id})
       }
     },
     changePatient(value) {

src/xt_pages/user/inspection.vue

         </el-col>
         <el-col :span="17" v-loading="itemLoading">
           <div class="filter-container" style="float:right">
+            <el-button
+              size="small"
+              class="filter-item"
+              type="primary"
+              @click="openPic()"
+              icon="el-icon-circle-plus-outline"
+              :disabled="project ? false : true"
+            >上传图片
+            </el-button>
             <el-button
               size="small"
               class="filter-item"
               @click="openNew()"
               icon="el-icon-circle-plus-outline"
               :disabled="project ? false : true"
-              >新增</el-button
+            >新增
+            </el-button
             >
             <el-button
               size="small"
               icon="el-icon-edit-outline"
               @click="openEdit()"
               :disabled="itemDate ? false : true"
-              >修改</el-button
+            >修改
+            </el-button
             >
             <el-button
               size="small"
               icon="el-icon-delete"
               @click="deleteInspection()"
               :disabled="itemDate ? false : true"
-              >删除</el-button
+            >删除
+            </el-button
             >
           </div>
           <div class="filter-container">
             <el-button class="filter-item" type="text" style="color:#000"
-              >{{ itemName }}
+            >{{ itemName }}
               <span v-if="itemDate"
-                >（检查日期：{{ itemDate }}）</span
+              >（检查日期：{{ itemDate }}）</span
               ></el-button
             >
           </div>
-          <el-table
-            :header-cell-style="{
+          <div v-if="!isPic">
+            <el-table
+              :header-cell-style="{
               backgroundColor: 'rgb(245, 247, 250)',
               color: '#606266'
             }"
-            :row-style="{ color: '#303133' }"
-            :data="items"
-            border
-            style="width: 100%"
-            id="user-inspection-order"
-          >
-            <el-table-column
-              prop="item_name"
-              label="检验项目"
-              align="center"
-              min-width="180"
-            >
-              <template slot-scope="scope">
-                {{ scope.row.item_name }} {{ scope.row.item_name_addition }}
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="name"
-              label="结果"
-              align="center"
-              min-width="80"
+              :row-style="{ color: '#303133' }"
+              :data="items"
+              border
+              style="width: 100%"
+              id="user-inspection-order"
+
             >
-              <template slot-scope="scope">
-                <span v-if="scope.row.value =='阳性'" style="color:red">{{ scope.row.value }}</span>
-                <span v-else>{{ scope.row.value }}</span>
-                <span v-if="scope.row.range_type == 1">
-                  {{scope.row.value_direction}}
+              <el-table-column
+                prop="item_name"
+                label="检验项目"
+                align="center"
+                min-width="180"
+              >
+                <template slot-scope="scope">
+                  {{ scope.row.item_name }} {{ scope.row.item_name_addition }}
+                </template>
+              </el-table-column>
+
+              <el-table-column
+                prop="name"
+                label="结果"
+                align="center"
+                min-width="80"
+              >
+                <template slot-scope="scope">
+                  <div v-if="items[0].value.indexOf('http') < 0">
+                    <span v-if="scope.row.value =='阳性'" style="color:red">{{ scope.row.value }}</span>
+                    <span v-else>{{ scope.row.value }}</span>
+                    <span v-if="scope.row.range_type == 1">
+                  {{ scope.row.value_direction }}
                 </span>
+                  </div>
+                  <div v-else>
+                    <img :src="scope.row.value">
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column
+                prop="address"
+                label="参考值"
+                align="center"
+                min-width="120"
+              >
+                <template slot-scope="scope">
+                  <div   v-if="items[0].value.indexOf('http')  < 0">
+                     <span v-if="scope.row.range_type == 1"
+                     >{{ scope.row.range_min }}~{{ scope.row.range_max }}</span
+                     >
+                    <span v-else>{{ scope.row.range_value }}</span>
+                  </div>
+                </template>
+
+              </el-table-column>
+
+              <el-table-column
+                prop="111"
+                label="单位"
+                align="center"
+                min-width="80"
+              >
+                <template slot-scope="scope">
+                  <div  v-if="items[0].value.indexOf('http') < 0">
+                    <span>{{ scope.row.unit }}</span>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div v-else>
+            <el-row>
+              <template v-for="(item, index) in items">
+                <el-col :span="7" :key="index">
+                  <div style="width: 400px">
+                    <el-row>
+                      <img  :src="item.value" alt="">
+                    </el-row>
+                    <el-row>
+                      <div>{{item.item_name}}</div>
+                    </el-row>
+                  </div>
+                </el-col>
               </template>
-            </el-table-column>
-            <el-table-column
-              prop="address"
-              label="参考值"
-              align="center"
-              min-width="120"
-            >
-              <template slot-scope="scope">
-                <span v-if="scope.row.range_type == 1"
-                  >{{ scope.row.range_min }}~{{ scope.row.range_max }}</span
-                >
-                <span v-else>{{ scope.row.range_value }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="unit"
-              label="单位"
-              align="center"
-              min-width="80"
-            >
-            </el-table-column>
-          </el-table>
+            </el-row>
+
+          </div>
+
           <el-pagination
             align="right"
             @current-change="handleCurrentChangePage"
           type="primary"
           v-if="form.method == 'add'"
           @click="submitNew('form')"
-          >保 存</el-button
+        >保 存
+        </el-button
         >
         <el-button type="primary" v-else @click="submitEdit('form')"
-          >保 存</el-button
+        >保 存
+        </el-button
         >
       </div>
     </el-dialog>
+
+    <el-dialog
+      :title="formTitle"
+      :visible.sync="dialogPicFormVisible"
+      width="1000px"
+      id="user-inspection-form"
+    >
+      <el-form :model="form" ref="form" label-position="top">
+        <el-row>
+          <el-col :span="7">
+            <el-form-item
+              label="检验日期"
+              prop="inspect_date"
+              :rules="[
+                { required: true, message: '请输入检验日期', trigger: 'blur' }
+              ]"
+            >
+              <el-date-picker
+                style="width:95%"
+                v-model="form.inspect_date"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm"
+                format="yyyy-MM-dd HH:mm"
+                placeholder="选择日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <template v-for="(item, index) in form.imgs">
+            <el-col :span="5" :key="index">
+              <div>
+                <el-row>
+                  <img width="100px" :src="item.img_url" alt="">
+                </el-row>
+                <el-row>
+                  <el-input v-model="item.desc" style="width: 100px"></el-input>
+                </el-row>
+                <el-row>
+                  <el-button
+                    type="danger"
+                    @click="deletePic(item,index)"
+                  >删除
+                  </el-button>
+                </el-row>
+              </div>
+            </el-col>
+            <el-col :span="1" :key="'form-col' + index">&nbsp;</el-col>
+          </template>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-upload
+          :data="uploadData"
+          :multiple="false"
+          action="https://upload.qiniup.com"
+          :show-file-list="false"
+          :on-error="handleAvatarError"
+          :on-success="handleAvatarSuccess"
+          :before-upload="beforeAvatarUpload">
+          <el-button type="primary">选择文件</el-button>
+        </el-upload>
+        <el-button @click="dialogPicFormVisible = false">取 消</el-button>
+        <el-button
+          type="primary"
+          v-if="this.form.pic_method== 'add'"
+          @click="submitPicNew()"
+        >保 存
+        </el-button>
+
+        <el-button
+          type="primary"
+          v-if="this.form.pic_method == 'edit'"
+          @click="submitEditPicNew()"
+        >修 改
+        </el-button>
+      </div>
+    </el-dialog>
   </div>
+
 </template>
 
 <script>
 import PatientSidebar from './components/PatientSidebar'
+import { getToken } from '@/api/qiniu'
+
 import {
-  fetchInspectionReference,
   CreatePatientInspection,
-  fetchPatientInspections,
+  CreatePatientPICInspection,
+  editPatientPICInspection,
+  DeletePatientInspection,
   EditPatientInspection,
-  DeletePatientInspection
+  fetchInspectionReference,
+  fetchPatientInspections
 } from '@/api/inspection'
-import { uParseTime, isPositiveNumber } from '@/utils/tools'
+import { getFileExtension, uParseTime } from '@/utils/tools'
 
 export default {
   name: 'Inspection',
   data() {
     return {
       total: 0,
+      qiniuDomain: 'https://images.shengws.com/',
+      isPic:false,
+      uploadData: { token: '', key: '' },
       pageLoading: true,
       itemLoading: false,
       formLoading: false,
       },
       itemName: '请选择项目',
       formTitle: '',
+      dialogPicFormVisible: false,
       dialogFormVisible: false,
       patient_info: null,
+
       form: {
         remind_cycle: '',
         method: 'add',
+        pic_method:'add',
         project_id: 0,
         inspect_date: '',
         old_inspect_date: '',
-        formItem: [{ id: 0, value: '' }]
+        formItem: [{ id: 0, value: '' }],
+        imgs: [],
+        delete_imgs:[],
       },
       formItem: [],
       items: [],
     }
   },
   methods: {
-    changeInput(item){
-      
-      if(item.item_name == '血清铁' || item.item_name == '总铁结合力'){
+    beforeAvatarUpload(file) {
+      // const isJPG = file.type === "image/jpeg";
+      var fileType = file.type
+      const isJPG = fileType.indexOf('image') > -1
+      const isLt2M = file.size / 1024 / 1024 < 5
+
+      if (!isJPG) {
+        this.$message.error('只能上传图片')
+        return false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 5MB!')
+        return false
+      }
+
+      var date = new Date()
+      var ext = getFileExtension(file.name)
+      var key =
+        date.getFullYear() +
+        '/' +
+        (date.getMonth() + 1) +
+        '/' +
+        date.getDate() +
+        '/' +
+        date.getHours() +
+        '/' +
+        date.getMinutes() +
+        '/' +
+        date.getSeconds() +
+        '/' +
+        '_s_' +
+        file.uid +
+        '.' +
+        ext
+      this.loading = this.$loading({
+        lock: true,
+        text: '上传中...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+
+      const _self = this
+      return new Promise((resolve, reject) => {
+        getToken()
+          .then(response => {
+            const token = response.data.data.uptoken
+            _self._data.uploadData.token = token
+            _self._data.uploadData.key = key
+            resolve(true)
+          })
+          .catch(err => {
+            console.log(err)
+            reject(false)
+            this.loading.close()
+          })
+      })
+    },
+
+    handleAvatarError(err, file, fileList) {
+      this.$message.error(err)
+      this.loading.close()
+      return false
+    },
+    handleAvatarSuccess(res, file) {
+      this.form.imgs.push({
+        img_url: this.qiniuDomain + res.url + '?imageView2/2/w/500/h/500/q/90',
+        desc: '',
+        id: 0
+      })
+      this.loading.close()
+    },
+    changeInput(item) {
+
+      if (item.item_name == '血清铁' || item.item_name == '总铁结合力') {
         let index1 = ''
         let index2 = ''
-        this.form.formItem.map((it,index) => {
-          if(this.form.formItem[index].item_name == '血清铁'){
+        this.form.formItem.map((it, index) => {
+          if (this.form.formItem[index].item_name == '血清铁') {
             index1 = index
           }
-          if(this.form.formItem[index].item_name == '总铁结合力'){
+          if (this.form.formItem[index].item_name == '总铁结合力') {
             index2 = index
           }
-          if(it.item_name == '转铁蛋白饱和度(计算)'){
+          if (it.item_name == '转铁蛋白饱和度(计算)') {
             it.value = (parseFloat(this.form.formItem[index1].value) / parseFloat(this.form.formItem[index2].value)) * 100
           }
         })
             }
           })
         })
-        .catch(() => {})
+        .catch(() => {
+        })
     },
     openEdit() {
+
+      if (this.project == null) {
+        this.$message.error('请先选择项目')
+        return false
+      }
+      if(this.isPic){
+        this.form.pic_method = 'edit'
+        this.formTitle = '修改' + this.project.project_name
+        this.form.project_id = this.project.project_id
+        this.form.inspect_date = this.itemDate
+        this.form.old_inspect_date = this.itemDate
+        this.form.imgs = []
+        this.form.delete_imgs = []
+        for(var index in this.inspections){
+          this.form.imgs.push({
+            id: this.inspections[index].id,
+            img_url: this.inspections[index].inspect_value,
+            desc: this.inspections[index].item_name
+          })
+        }
+        console.log(this.form.imgs)
+        this.dialogPicFormVisible = true
+      }else{
+        console.log("22222")
+        this.form.method = 'edit'
+        this.formTitle = '修改' + this.project.project_name
+        this.form.project_id = this.project.project_id
+        this.form.inspect_date = this.itemDate
+        this.form.old_inspect_date = this.itemDate
+        this.form.remind_cycle = this.patient_info.remind_cycle
+        console.log(this.form.remind_cycle)
+
+        this.form.formItem = []
+        for (var index in this.project.inspection_reference) {
+          this.form.formItem.push({
+            id: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].id : 0,
+            project_id: this.project.inspection_reference[index].project_id,
+            project_name: this.project.inspection_reference[index].project_name,
+            item_id: this.project.inspection_reference[index].id,
+            item: this.project.inspection_reference[index].item,
+            item_name: this.project.inspection_reference[index].item_name,
+            range_type: this.project.inspection_reference[index].range_type,
+            value: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].inspect_value : '',
+            select_options: this.project.inspection_reference[index].range_options.split(','),
+            unit: this.project.inspection_reference[index].unit
+          })
+        }
+        console.log(this.form.formItem)
+        this.dialogFormVisible = true
+
+      }
+
+    }, openPic() {
       if (this.project == null) {
         this.$message.error('请先选择项目')
         return false
       }
 
-      this.form.method = 'edit'
-      this.formTitle = '修改' + this.project.project_name
+      this.form.pic_method = 'add'
+      this.formTitle = '新增' + this.project.project_name
       this.form.project_id = this.project.project_id
-      this.form.inspect_date = this.itemDate
-      this.form.old_inspect_date = this.itemDate
+      this.form.imgs=[]
+      this.form.delete_imgs=[]
       this.form.remind_cycle = this.patient_info.remind_cycle
-      console.log(this.form.remind_cycle)
-
+      var today = new Date()
+      this.form.inspect_date = uParseTime(today, '{y}-{m}-{d} {h}:{i}')
       this.form.formItem = []
       for (var index in this.project.inspection_reference) {
+        // var formItem = this.project.inspection_reference[index];
+        // formItem["value"] = '';
+        // if (formItem.range_type==2) {
+        //   formItem["select_options"] = formItem.range_options.split(",");
+        // }
         this.form.formItem.push({
-          id: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].id : 0,
+          id: 0,
           project_id: this.project.inspection_reference[index].project_id,
           project_name: this.project.inspection_reference[index].project_name,
           item_id: this.project.inspection_reference[index].id,
           item: this.project.inspection_reference[index].item,
           item_name: this.project.inspection_reference[index].item_name,
           range_type: this.project.inspection_reference[index].range_type,
-          value: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].inspect_value : '',
-          select_options: this.project.inspection_reference[index].range_options.split(','),
+          value: '',
+          select_options: this.project.inspection_reference[
+            index
+            ].range_options.split(','),
           unit: this.project.inspection_reference[index].unit
         })
       }
-      console.log(this.form.formItem)
-      this.dialogFormVisible = true
+      console.log('form.formItem', this.form.formItem)
+      this.dialogPicFormVisible = true
+
     },
     openNew() {
       if (this.project == null) {
           value: '',
           select_options: this.project.inspection_reference[
             index
-          ].range_options.split(','),
+            ].range_options.split(','),
           unit: this.project.inspection_reference[index].unit
         })
       }
-      console.log('form.formItem',this.form.formItem)
+      console.log('form.formItem', this.form.formItem)
       this.dialogFormVisible = true
     },
     submitEdit(formName) {
                 duration: 2000
               })
               this.patient_info.remind_cycle =
-                  response.data.data.remind_cycle
+                response.data.data.remind_cycle
               this.itemDate = this.form.inspect_date
               this.items = []
               var inspections = response.data.data.inspections
               this.inspectionsMap = {}
               for (var index in inspections) {
                 inspectionsMap[inspections[index].item_id] =
-                    inspections[index]
+                  inspections[index]
                 this.inspectionsMap[inspections[index].item_id] =
-                    inspections[index]
+                  inspections[index]
               }
               var items = this.project.inspection_reference
-              console.log("itmes",items)
+              console.log('itmes', items)
               for (var index in items) {
                 if (items[index].id in inspectionsMap) {
                   var item = {}
           return false
         }
       })
+    }, submitEditPicNew() {
+      if (this.form.imgs.length == 0) {
+        this.$message.error('未上传图片')
+        return false
+      }
+      this.formLoading = true
+      editPatientPICInspection(
+        this.patientID,
+        this.form
+      )
+        .then(response => {
+          if (response.data.state === 1) {
+            this.$notify({
+              title: '成功',
+              message: '修改成功',
+              type: 'success',
+              duration: 2000
+            })
+            this.itemDate = this.form.inspect_date
+            this.items = []
+            this.dialogPicFormVisible = false
+            this.queryParams.patient = this.patientID
+            this.queryParams.project_id = this.project.project_id
+            this.queryParams.page = 1
+            this.total = 0
+            this.fetchPatientInspections(this.queryParams)
+          } else {
+            this.$message.error(response.data.msg)
+            return false
+          }
+        })
+        .catch(v => {
+          this.$message.error(v)
+          return false
+        })
+      this.formLoading = false
+
+    },deletePic(item,index){
+      if(item.id == 0){
+        this.form.imgs.splice(index,1)
+      }else{
+        for(let index in this.form.imgs){
+          if(item.id == this.form.imgs[index].id){
+            this.form.imgs.splice(index,1)
+            this.form.delete_imgs.push({
+              id:item.id,
+            })
+          }
+        }
+
+      }
+    },
+    submitPicNew() {
+      this.formLoading = true
+      if (this.form.imgs.length == 0) {
+        this.$message.error('未上传图片')
+        return false
+      }
+      CreatePatientPICInspection(
+        this.patientID,
+        this.form
+      )
+        .then(response => {
+          if (response.data.state === 1) {
+            this.$notify({
+              title: '成功',
+              message: '新增成功',
+              type: 'success',
+              duration: 2000
+            })
+            this.itemDate = this.form.inspect_date
+            this.items = []
+            for (var index in this.projects) {
+              if (this.projects[index].project_id == this.form.project_id) {
+                this.projects[index].count++
+                break
+              }
+            }
+            this.total += 1
+            // var inspections = response.data.data.inspections
+            // this.inspections = response.data.data.inspections
+            // if (inspections == null) {
+            //   this.inspections = []
+            //   return false
+            // }
+            // var inspectionsMap = {}
+            // this.inspectionsMap = {}
+            //
+            // var items = this.project.inspection_reference
+            // for (var index in items) {
+            //   if (items[index].id in inspectionsMap) {
+            //     var item = {}
+            //     for (var key in items[index]) {
+            //       item[key] = items[index][key]
+            //     }
+            //     item.value = inspectionsMap[items[index].id].inspect_value
+            //     item.value_direction = ''
+            //     this.items.push(item)
+            //   }
+            // }
+            this.dialogPicFormVisible = false
+            this.queryParams.patient = this.patientID
+            this.queryParams.project_id = this.project.project_id
+            this.queryParams.page = 1
+            this.total = 0
+            this.fetchPatientInspections(this.queryParams)
+          } else {
+            this.$message.error(response.data.msg)
+            return false
+          }
+        })
+        .catch(v => {
+          this.$message.error(v)
+          return false
+        })
+      this.formLoading = false
+
     },
     fetchInspectionReference() {
       fetchInspectionReference(this.patientID)
             return false
           }
         })
-        .catch(v => {})
+        .catch(v => {
+        })
     },
     setCurrent(row) {
       this.$refs.singleTable.setCurrentRow(row)
     },
     fetchPatientInspections(params) {
       this.items = []
+      this.isPic = false
       fetchPatientInspections(params)
         .then(response => {
           if (response.data.state == 1) {
               inspectionsMap[inspections[index].item_id] = inspections[index]
               this.inspectionsMap[inspections[index].item_id] = inspections[index]
             }
+
             var items = this.project.inspection_reference
             for (var index in items) {
-              if (items[index].id in inspectionsMap || items[index].item_id in inspectionsMap) {
-                var item = {}
-                for (var key in items[index]) {
-                  item[key] = items[index][key]
-                }
-                if (item.item_id > 0) {
-                  if (inspectionsMap[items[index].item_id] == undefined) {
-                    item.value = inspectionsMap[items[index].id].inspect_value
-                  } else {
-                    item.value = inspectionsMap[items[index].item_id].inspect_value
-                  }
-                } else {
+              var item = {}
+              for (var key in items[index]) {
+                item[key] = items[index][key]
+              }
+              if (item.item_id > 0) {
+                if (inspectionsMap[items[index].item_id] == undefined) {
                   item.value = inspectionsMap[items[index].id].inspect_value
+                  item.item_name = inspectionsMap[items[index].id].item_name
+
+                } else {
+                  item.value = inspectionsMap[items[index].item_id].inspect_value
+                  item.item_name = inspectionsMap[items[index].item_id].item_name
+
                 }
-                item.value_direction = ''
-                if (item.range_type == 1) {
-                  var value = parseFloat(item.value)
-                  var range_min = parseFloat(item.range_min)
-                  var range_max = parseFloat(item.range_max)
-                  if (value < range_min) {
-                    item.value_direction = '↓'
-                  } else if (value > range_max) {
-                    item.value_direction = '↑'
-                  }
+              } else {
+                item.value = inspectionsMap[items[index].id].inspect_value
+                item.item_name = inspectionsMap[items[index].id].item_name
+
+              }
+              // item["inspect_desc"] = inspectionsMap[items[index].id].inspect_desc
+              // item["inspect_type"] = inspectionsMap[items[index].id].inspect_type
+              item.value_direction = ''
+              if (item.range_type == 1) {
+                var value = parseFloat(item.value)
+                var range_min = parseFloat(item.range_min)
+                var range_max = parseFloat(item.range_max)
+                if (value < range_min) {
+                  item.value_direction = '↓'
+                } else if (value > range_max) {
+                  item.value_direction = '↑'
                 }
-                this.items.push(item)
+              }
+              this.items.push(item)
+
+
+              if(item.value.indexOf("http") >= 0){
+                this.isPic = true
               }
             }
-            console.log(this.items)
           }
         })
-        .catch(v => {})
+        .catch(v => {
+        })
       setTimeout(() => {
         this.itemLoading = false
       }, 1000)
   border-bottom: 0px !important;
   border-right: 0px !important;
 }
+
 #user-inspection-order th {
   border-right: 0px !important;
 }
+
 #user-inspection-form .el-form-item__content {
   line-height: 0 !important;
 }
+
 .el-table td,
 .el-table th.is-leaf,
 .el-table--border,
 .el-table--group {
   border-color: #d0d3da;
 }
+
 .el-table--border::after,
 .el-table--group::after,
 .el-table::before {

src/xt_pages/user/sickHistory.vue

                 </el-table-column>
                 <el-table-column label="记录医生" align="center">
                   <template slot-scope="scope">
-                    {{ doctorName(scope.row.recorder) }}
+                    {{ doctorName(scope.row.doctor_id) }}
                   </template>
                 </el-table-column>
               </el-table>
 
 
               <label class="title"><span class="name">肾移植史</span> : </label>
-              <el-select style="width: 150px;" v-model="is_shenyizhishi" placeholder="选择肾移植史" @change="didSelectTemplate">
+              <el-select style="width: 150px;" v-model="is_shenyizhishi" placeholder="选择肾移植史" >
                 <el-option label="无" value="0"></el-option>
                 <el-option label="有" value="1"></el-option>
               </el-select>
             <div class="cell clearfix">
 
               <label class="title"><span class="name">腹膜透析史</span> : </label>
-              <el-select style="width: 150px;" v-model="is_fumotouxishi" placeholder="选择腹膜透析史" @change="didSelectTemplate">
+              <el-select style="width: 150px;" v-model="is_fumotouxishi" placeholder="选择腹膜透析史" >
                 <el-option label="无" value="0"></el-option>
                 <el-option label="有" value="1"></el-option>
               </el-select>
               </el-select>
 
               <label class="title"><span class="name">过敏药物</span> : </label>
-              <el-select style="width: 100px;" v-model="is_guominyaowu" placeholder="选择过敏药物" @change="didSelectTemplate">
+              <el-select style="width: 100px;" v-model="is_guominyaowu" placeholder="选择过敏药物">
                 <el-option label="无" value="0"></el-option>
                 <el-option label="有" value="1"></el-option>
               </el-select>
         <div>
           <div class="new_record_form">
             <div class="cell clearfix">
-              <label class="title"><span class="name">病程日期</span> : </label>
-              <el-date-picker v-model="edit_course_of_disease_time" prefix-icon="el-icon-date" :editable="false"
-                              style="width: 200px;"
-                              type="datetime"
-                              placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
+              <label class="title"><span class="name">病程标题</span> : </label>
+              <el-input v-model="edit_title" style="width: 150px"></el-input>
+
+              <label class="title"><span class="name">日期</span> : </label>
+              <el-date-picker v-model="edit_sick_history_time" prefix-icon="el-icon-date" :editable="false"
+                              style="width: 150px;"
+                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
                               value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
 
-              <label class="title"><span class="name">日常病程</span> : </label>
-              <el-select v-model="select_template" placeholder="可选择病程模板" @change="didEditSelectTemplate">
-                <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
-                           :value="option.content"></el-option>
+
+              <label class="title"><span class="name">肾移植史</span> : </label>
+              <el-select style="width: 150px;" v-model="edit_is_shenyizhishi" placeholder="选择肾移植史" >
+                <el-option label="无" value="0"></el-option>
+                <el-option label="有" value="1"></el-option>
               </el-select>
             </div>
 
+            <div class="cell clearfix">
+
+              <label class="title"><span class="name">腹膜透析史</span> : </label>
+              <el-select style="width: 150px;" v-model="edit_is_fumotouxishi" placeholder="选择腹膜透析史" >
+                <el-option label="无" value="0"></el-option>
+                <el-option label="有" value="1"></el-option>
+              </el-select>
+
+              <label class="title"><span class="name">医生</span> : </label>
+              <el-select style="width: 100px;" v-model="edit_doctor_id" placeholder="请选择医生">
+                <el-option v-for="(item,index) in doctorOptions" :label="item.name" :value="item.id" :key="index"></el-option>
+              </el-select>
+
+              <label class="title"><span class="name">过敏药物</span> : </label>
+              <el-select style="width: 100px;" v-model="edit_is_guominyaowu" placeholder="选择过敏药物">
+                <el-option label="无" value="0"></el-option>
+                <el-option label="有" value="1"></el-option>
+              </el-select>
+              <el-input v-if="edit_is_guominyaowu == 1" v-model="edit_guominyaowu_desc"></el-input>
 
-            <div class="cell clearfix" style="margin-top: 10px">
-              <label class="title"><span class="name">病程标题</span> : </label>
-              <el-input v-model="edit_title" style="width: 420px"></el-input>
+            </div>
+
+            <div class="cell clearfix">
+              <label class="title"><span class="name">病史模版</span> : </label>
+              <el-select v-model="select_template" placeholder="选择病史模板" @change="didSelectTemplate">
+                <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
+                           :value="option.content"></el-option>
+              </el-select>
             </div>
 
             <div class="textarea_panel">
-              <!--<el-input v-model="edit_new_content" type="textarea" rows="6" resize="none"></el-input>-->
               <keep-alive>
                 <editor ref="edit_neditor"
-                        id="edit_editor"
+                        id="editors"
                         style="width: 600px"
-                        v-bind:r_content="edit_new_content">
+                        v-bind:r_content="edit_new_content"
+                >
                 </editor>
               </keep-alive>
             </div>
 
+
             <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
               <el-button @click="show_edit_dialog = false">取消</el-button>
-              <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary"
+              <el-button type="primary"
                          @click="modifyAction" :loading="uploading_new_record">保存
               </el-button>
             </div>
 import { fetchAllDoctorAndNurse } from "@/api/doctor";
 
 import {
-  createCourseOfDiseaseRecord,
-  deleteCourseOfDiseaseRecords,
-  getCourseOfDiseaseRecords,
-  modifyCourseOfDiseaseRecord,
-  GetCoursePrintData
+  createSickHistoryRecord,
+  deleteSickHistoryRecords,
+  GetSickHistoryRecords,
+  ModifySickHistoryRecord,
 } from '@/api/patient'
 import { parseTime } from '@/utils'
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
       is_fumotouxishi:'',
       is_guominyaowu:'',
       guominyaowu_desc:"",
+
+      edit_is_shenyizhishi:'',
+      edit_is_fumotouxishi:'',
+      edit_is_guominyaowu:'',
+      edit_guominyaowu_desc:"",
+
       doctor_id:"",
       doctorOptions:null,
       records: [],
       show_edit_dialog: false,
       uploading_new_record: false,
       templates: this.$store.getters.configlist.sick_history,
+      select_template:"",
       new_content: '',
       edit_new_content: '',
-      edit_course_of_disease_time: '',
+      edit_sick_history_time: '',
       selectingRows: [],
       table_current_index: -1,
       edit_current_id: 0,
+      edit_doctor_id:0,
       edit_title: '',
       ids:"",
       idArr:[],
       '-' +
       (nowDay < 10 ? '0' + nowDay : nowDay)
 
-    this.requestCourseRecords()
+    this.requestSickHistory()
     this.fetchAllDoctorAndNurse()
 
   },
         }
       });
     },
-    requestCourseRecords: function() {
+    requestSickHistory: function() {
       this.loading = true
-      getCourseOfDiseaseRecords(this.patient_id, this.start_time, this.end_time).then(rs => {
+      let params = {
+        patient_id:this.patient_id,
+        start_time:this.start_time,
+        end_time:this.end_time,
+      }
+      GetSickHistoryRecords(params).then(rs => {
         this.loading = false
         var resp = rs.data
         if (resp.state == 1) {
       return parseTime(time, '{y}-{m}-{d} {h}:{i}:{s}')
     },
     doctorName: function(doctor_id) {
-      for (let index = 0; index < this.doctors.length; index++) {
-        const doctor = this.doctors[index]
+      for (let index = 0; index < this.doctorOptions.length; index++) {
+        const doctor = this.doctorOptions[index]
         if (doctor.id == doctor_id) {
           return doctor.name
         }
       return ''
     },
     modifyAction: function() {
-
       this.edit_new_content = this.$refs.edit_neditor.content
       if (this.edit_new_content.length == 0) {
         this.$message.error('请填写病程内容')
         return
       }
       this.uploading_new_record = true
-      modifyCourseOfDiseaseRecord(this.patient_id, this.edit_new_content, this.edit_course_of_disease_time, this.edit_current_id, this.edit_title).then(rs => {
+      let params = {
+        id:this.edit_current_id,
+        patient_id: this.patient_id,
+        content: this.edit_new_content,
+        record_time: this.edit_sick_history_time,
+        title: this.edit_title,
+        is_shenyizhishi:this.edit_is_shenyizhishi,
+        is_fumotouxishi:this.edit_is_fumotouxishi,
+        is_guominyaowu:this.edit_is_guominyaowu,
+        guominyaowu_desc:this.edit_guominyaowu_desc,
+        doctor_id: this.edit_doctor_id
+      }
+
+      ModifySickHistoryRecord(params).then(rs => {
         this.uploading_new_record = false
         var resp = rs.data
         if (resp.state == 1) {
           this.records[this.table_current_index].record_time = resp.data.record.record_time
           this.records[this.table_current_index].recorder = resp.data.record.recorder
           this.records[this.table_current_index].title = resp.data.record.title
-
+          this.records[this.table_current_index].doctor_id = resp.data.record.doctor_id
+          this.records[this.table_current_index].is_shenyizhi_history = resp.data.record.is_shenyizhi_history
+          this.records[this.table_current_index].is_fumo_dialysis_history = resp.data.record.is_fumo_dialysis_history
+          this.records[this.table_current_index].is_hypersusceptibility = resp.data.record.is_hypersusceptibility
+          this.records[this.table_current_index].hypersusceptibility_desc = resp.data.record.hypersusceptibility_desc
           this.show_edit_dialog = false
           this.edit_new_content = ''
           this.table_current_index = -1
-
         } else {
           this.table_current_index = -1
           this.$message.error(resp.msg)
 
     createAction: function() {
       this.new_content = this.$refs.editor.content
-      console.log("hhhhh2h3h232323232",this.new_content)
       if (this.new_content.length == 0) {
         this.$message.error('请填写病程内容')
         return
       }
       this.uploading_new_record = true
-
-      createCourseOfDiseaseRecord(this.patient_id, this.new_content, this.course_of_disease_time, this.title).then(rs => {
+      let params = {
+        patient_id: this.patient_id,
+        content: this.new_content,
+        record_time: this.sick_history_time,
+        title: this.title,
+        is_shenyizhishi:this.is_shenyizhishi,
+        is_fumotouxishi:this.is_fumotouxishi,
+        is_guominyaowu:this.is_guominyaowu,
+        guominyaowu_desc:this.guominyaowu_desc,
+        doctor_id: this.doctor_id
+      }
+      createSickHistoryRecord(params).then(rs => {
         this.uploading_new_record = false
         var resp = rs.data
         if (resp.state == 1) {
           this.records.unshift(resp.data.record)
-          // this.$refs.record_table.setCurrentRow()
-          // this.$refs.record_table.setCurrentRow(this.records[0])
-          // this.current_select_record = this.records[0]
           this.show_dialog = false
           this.new_content = ''
           this.title = ''
       }
       var ids_str = ids.join(',')
       this.loading = true
-      deleteCourseOfDiseaseRecords(this.patient_id, ids_str).then(rs => {
+
+      let params={
+        patient_id:this.patient_id,
+        ids:ids_str,
+      }
+
+      deleteSickHistoryRecords(params).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
           for (let id_index = 0; id_index < ids.length; id_index++) {
         this.$message.error(err)
       })
     }, startTimeChange(val) {
-      this.requestCourseRecords()
+      this.requestSickHistory()
     }, endTimeChange(val) {
-      this.requestCourseRecords()
+      this.requestSickHistory()
     }, showEdit() {
       if (this.table_current_index == -1) {
         this.$message.error('请选择要修改的病程内容')
         return
       }
-      this.show_edit_dialog = true
-      this.edit_course_of_disease_time = this.recordTime(this.records[this.table_current_index].record_time)
+      this.edit_is_shenyizhishi = this.records[this.table_current_index].is_shenyizhi_history.toString()
+      this.edit_is_fumotouxishi = this.records[this.table_current_index].is_fumo_dialysis_history.toString()
+      this.edit_is_guominyaowu = this.records[this.table_current_index].is_hypersusceptibility.toString()
+      this.edit_guominyaowu_desc = this.records[this.table_current_index].hypersusceptibility_desc
+      this.edit_sick_history_time = this.recordTime(this.records[this.table_current_index].record_time)
       this.edit_new_content = this.records[this.table_current_index].content
       this.edit_current_id = this.records[this.table_current_index].id
-      this.edit_title = this.records[this.table_current_index].title
+      this.edit_doctor_id = this.records[this.table_current_index].doctor_id
+      console.log(this.edit_new_content )
+      this.edit_title = this.records[this.table_current_index].title//
+      this.show_edit_dialog = true
+
       this.$refs.record_table.setCurrentRow(null)
 
     }, tableRow({ row, rowIndex }) {