Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

config/dev.env.js

@@ -0,0 +1,15 @@
+// module.exports = {
+//   NODE_ENV: '"development"',
+//   ENV_CONFIG: '"dev"',
+//   BASE_API: '"https://api-dev"'
+// }
+module.exports = {
+  NODE_ENV: '"development"',
+  ENV_CONFIG: '"dev"',
+  BASE_API: '"http://api.xt.test.sgjyun.com"',//'"http://localhost:9529"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
+  SSO_HOST: '"https://testsso.sgjyun.com"',
+  SRCM_HOST: '"http://test1.sgjyun.com"',
+  XT_HOST: '"http://xt.test.sgjyun.com"',
+  MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
+  CDM_HOST: '"http://cdm.test.sgjyun.com"',
+}

config/index.js

@@ -0,0 +1,96 @@
+'use strict'
+// Template version: 1.2.6
+// see http://vuejs-templates.github.io/webpack for documentation.
+
+const path = require('path')
+
+module.exports = {
+  dev: {
+
+    // Paths
+    assetsSubDirectory: 'static',
+    assetsPublicPath: '/',
+    proxyTable: {},
+
+    // Various Dev Server settings
+
+    // can be overwritten by process.env.HOST
+    // if you want dev by ip, please set host: '0.0.0.0'
+
+    // host: 'xt.test.sgjyun.com',
+    // host: 'xt.kuyicloud.com',
+    host: 'xt.test.sgjyun.com',
+    port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    autoOpenBrowser: true,
+    errorOverlay: true,
+    notifyOnErrors: false,
+    poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
+
+    // Use Eslint Loader?
+    // If true, your code will be linted during bundling and
+    // linting errors and warnings will be shown in the console.
+    useEslint: false,
+
+    // If true, eslint errors and warnings will also be shown in the error overlay
+    // in the browser.
+    showEslintErrorsInOverlay: false,
+
+    /**
+     * Source Maps
+     */
+
+    // https://webpack.js.org/configuration/devtool/#development
+    devtool: '#cheap-source-map',
+
+    // If you have problems debugging vue-files in devtools,
+    // set this to false - it *may* help
+    // https://vue-loader.vuejs.org/en/options.html#cachebusting
+    cacheBusting: true,
+
+    // CSS Sourcemaps off by default because relative paths are "buggy"
+    // with this option, according to the CSS-Loader README
+    // (https://github.com/webpack/css-loader#sourcemaps)
+    // In our experience, they generally work as expected,
+    // just be aware of this issue when enabling this option.
+    cssSourceMap: false,
+  },
+
+  build: {
+    // Template for index.html
+    index: path.resolve(__dirname, '../dist/index.html'),
+
+    // Paths
+    assetsRoot: path.resolve(__dirname, '../dist'),
+    assetsSubDirectory: 'static',
+
+    /**
+     * You can set by youself according to actual condition
+     * You will need to set this if you plan to deploy your site under a sub path,
+     * for example GitHub pages. If you plan to deploy your site to https://foo.github.io/bar/,
+     * then assetsPublicPath should be set to "/bar/".
+     * In most cases please use '/' !!!
+     */
+    // assetsPublicPath: '/vue-element-admin/', // If you are deployed on the root path, please use '/'
+    assetsPublicPath: './',
+
+    /**
+     * Source Maps
+     */
+    productionSourceMap: false,
+    // https://webpack.js.org/configuration/devtool/#production
+    devtool: '#source-map',
+
+    // Gzip off by default as many popular static hosts such as
+    // Surge or Netlify already gzip all static assets for you.
+    // Before setting to `true`, make sure to:
+    // npm install --save-dev compression-webpack-plugin
+    productionGzip: false,
+    productionGzipExtensions: ['js', 'css'],
+
+    // Run the build command with an extra argument to
+    // View the bundle analyzer report after build finishes:
+    // `npm run build --report`
+    // Set to `true` or `false` to always turn it on or off
+    bundleAnalyzerReport: process.env.npm_config_report
+  }
+}

src/api/advice.js

@@ -1,12 +1,22 @@
 import request from '@/utils/request'
 
-export function getAdviceConfig(){
+export function getAdviceConfig(type){
     return request({
-        url:'/api/getadviceconfigs',
+        url:'/api/getadviceconfigs?type='+type,
         method:'get',
     })
 }
 
+export function getAllAdviceConfig(){
+  return request({
+    url:'/api/getalladviceconfig',
+    method:'get',
+  })
+}
+
+
+
+
 
 export function CreateDoctorAdvice(id, advice){
     return request({
@@ -197,11 +207,22 @@ export function postAdviceTemplate(params,name,advice_type){
 }
 
 export function CreateGroupAdvice(id, groupno, advices){
-  return request({
+  if(advices.remind > 0){
+    return request({
       url:'/api/patients/advice/creategroup?id='+id + '&groupno=' + groupno,
       method:'post',
       data:advices,
-  })
+    })
+
+  }else{
+    return request({
+      url:'/api/patients/advice/creategroup?id='+id + '&groupno=' + groupno,
+      method:'post',
+      data:advices,
+    })
+
+  }
+
 }
 export function DeleteGroupAdvice(groupno){
   return request({

src/api/dialysis.js

@@ -244,4 +244,3 @@ export function postDelMonitorInfo(params) {
 
 
 
-

src/api/patient.js

@@ -286,6 +286,16 @@ export function GetRemind(params) {
 }
 
 
+export function PostRemind(params) {
+  return request({
+    url: '/api/remind/is_open',
+    method: 'Post',
+    params:params,
+  })
+}
+
+
+
 
 
 

src/store/getters.js

@@ -66,6 +66,7 @@ const getters = {
   good_unit: state => state.global_config.good_unit,
 
   temp_params: state => state.temp_params,
+  puncture_needle: state => state.global_config.puncture_needle,
 
 
 

src/store/modules/globalConfig.js

@@ -573,6 +573,12 @@ const global_config = {
       {id: 9, name: "皮下出血"},
     ],
 
+    puncture_needle: [
+      {id: 1, name: 'V钝针'},
+      {id: 2, name: 'V锐针'},
+      {id: 3, name: 'A锐针'},
+      {id: 4, name: 'A钝针'},
+    ],
 
   },
   mutations: {

src/xt_pages/data/druguseTemplate.vue

@@ -47,7 +47,7 @@
                 width="100"
               >
                 <template slot-scope="scope">
-                  <div>{{scope.row.advice_type == 1 ? "长期" : "临时"}}</div>
+                  <div>{{scope.row.advice_type == 1 ? '长期' : '临时'}}</div>
                 </template>
 
               </el-table-column>
@@ -90,16 +90,18 @@
                 </template>
               </el-table-column>
 
+
               <el-table-column
                 prop="amount1"
                 align="center"
-                label="规格">
-                <template slot-scope="scope">
+                label="药品规格">
                   <!-- {{drugDesc(scope.row)}} -->
-                  {{scope.row.advice_desc}}
-                </template>
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+                  </template>
               </el-table-column>
 
+
               <el-table-column
                 prop="amount2"
                 width="90"
@@ -142,6 +144,14 @@
               </el-table-column>
 
 
+              <el-table-column prop="blood_flow_volume" align="center" label="提醒频率">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.frequency_type == 1">每次必推</span>
+                  <span v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/1次</span>
+                  <span v-if="scope.row.frequency_type == 3">每周{{scope.row.week_days}}</span>
+                </template>
+              </el-table-column>
+
               <el-table-column
                 align="center"
                 label="操作"
@@ -184,8 +194,8 @@
 
                   <el-form-item label="模版类型" prop="advice_type">
                     <el-radio-group v-model="form.advice_type">
-                      <el-radio label="0">临时</el-radio>
-                      <el-radio label="1">长期</el-radio>
+                      <el-radio :label="0">临时</el-radio>
+                      <el-radio :label="1">长期</el-radio>
                     </el-radio-group>
                   </el-form-item>
 
@@ -209,11 +219,10 @@
                       {{scope.row.advice_name}}
                     </template>
                   </el-table-column>
-                  <el-table-column align="center" label="规格">
-                    <template slot-scope="scope">
-                      <!-- {{drugDescTwo(scope.row)}} -->
-                      {{scope.row.advice_desc}}
-                    </template>
+                  <el-table-column align="center" label="药品规格">
+                      <template slot-scope="scope">
+                        <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+                      </template>
                   </el-table-column>
                   <el-table-column prop="prescribing_number" align="center" label="开药数量">
                     <template slot-scope="scope" v-if="scope.row.prescribing_number != ''">
@@ -239,6 +248,14 @@
                     </template>
                   </el-table-column>
 
+                  <el-table-column prop="blood_flow_volume" align="center" label="提醒频率" v-if="form.advice_type == 1">
+                    <template slot-scope="scope">
+                      <span v-if="scope.row.frequency_type == 1">每次必推</span>
+                      <span v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/1次</span>
+                      <span v-if="scope.row.frequency_type == 3">每周{{scope.row.weekdays}}</span>
+                    </template>
+                  </el-table-column>
+
                 </el-table>
               </div>
               <div slot="footer" class="dialog-footer">
@@ -260,15 +277,13 @@
                       <el-input v-model="templateForm.advice_name"></el-input>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="规格 :">
-                      <el-input v-model="templateForm.advice_desc"></el-input>
-                    </el-form-item>
 
 
-                    <!-- <el-form-item label="药品规格 :" prop="drug_spec">
+
+                  <el-col :span="12">
+                    <el-form-item label="药品规格 :" prop="advice_desc">
                       <el-col :span="8">
-                        <el-input v-model="templateForm.drug_spec"  ></el-input>
+                        <el-input v-model="templateForm.advice_desc"></el-input>
                       </el-col>
                       <el-col class="line" :span="2">&nbsp;</el-col>
                       <el-col :span="14">
@@ -287,7 +302,7 @@
                           ></el-option>
                         </el-select>
                       </el-col>
-                    </el-form-item> -->
+                    </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="单次用量 :" prop="single_dose">
@@ -375,6 +390,39 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
+
+                  <el-col :span="24" v-if="form.advice_type&&!isAddChild">
+                    <el-form-item label="周期提醒 :">
+                      <el-radio-group v-model="templateForm.frequency_type">
+                        <el-radio :label="1">每次必推</el-radio>
+                        <el-radio :label="2">天数频率</el-radio>
+                        <el-radio :label="3">星期频率</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                  </el-col>
+
+
+                  <el-col :span="12" v-if="templateForm.frequency_type == 2">
+                    <el-form-item prop="day_count">
+                      <el-input style="width: 50px" v-model="templateForm.day_count"></el-input>&nbsp;
+                      天/一次
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="24" v-if="templateForm.frequency_type == 3">
+                    <el-form-item prop="weekday">
+                      <el-checkbox-group v-model="templateForm.weekday">
+                        <el-checkbox label="周一" name="type"></el-checkbox>
+                        <el-checkbox label="周二" name="type"></el-checkbox>
+                        <el-checkbox label="周三" name="type"></el-checkbox>
+                        <el-checkbox label="周四" name="type"></el-checkbox>
+                        <el-checkbox label="周五" name="type"></el-checkbox>
+                        <el-checkbox label="周六" name="type"></el-checkbox>
+                        <el-checkbox label="周日" name="type"></el-checkbox>
+                      </el-checkbox-group>
+                    </el-form-item>
+                  </el-col>
+
                 </el-row>
               </el-form>
               <div slot="footer" class="dialog-footer">
@@ -382,6 +430,9 @@
                 <el-button type="primary" @click="submitTemplate('templateForm')">保 存</el-button>
               </div>
             </el-dialog>
+            <!--TODO-->
+
+
             <el-dialog :title="editDialogTitle" :visible.sync="templateEditFormVisible" width="700px">
               <el-form
                 ref="templateFormEdit"
@@ -394,15 +445,12 @@
                     <el-form-item :label="edit_advice_name" required prop="advice_name">
                       <el-input v-model="templateFormEdit.advice_name"></el-input>
                     </el-form-item>
-
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="规格">
-                      <el-input v-model="templateFormEdit.advice_desc"></el-input>
-                    </el-form-item>
-                    <!-- <el-form-item label="药品规格 :" prop="drug_spec">
+
+                  <el-form-item label="药品规格 :" prop="advice_desc">
                       <el-col :span="8">
-                        <el-input v-model="templateFormEdit.drug_spec"></el-input>
+                        <el-input v-model="templateFormEdit.advice_desc"></el-input>
                       </el-col>
                       <el-col class="line" :span="1">&nbsp;</el-col>
                       <el-col :span="14">
@@ -421,7 +469,7 @@
                           ></el-option>
                         </el-select>
                       </el-col>
-                    </el-form-item> -->
+                    </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="单次用量 :" prop="single_dose">
@@ -510,6 +558,41 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
+
+
+                  <el-col :span="24">
+                    <el-form-item label="周期提醒 :">
+                      <el-radio-group v-model="templateFormEdit.frequency_type">
+                        <el-radio :label="1">每次必推</el-radio>
+                        <el-radio :label="2">天数频率</el-radio>
+                        <el-radio :label="3">星期频率</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                  </el-col>
+
+
+                  <el-col :span="12" v-if="templateFormEdit.frequency_type == 2">
+                    <el-form-item prop="day_count">
+                      <el-input style="width: 50px" v-model="templateFormEdit.day_count"></el-input>&nbsp;
+                      天/一次
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="24" v-if="templateFormEdit.frequency_type == 3">
+                    <el-form-item>
+                      <el-checkbox-group v-model="templateFormEdit.weekday">
+                        <el-checkbox label="周一" name="type"></el-checkbox>
+                        <el-checkbox label="周二" name="type"></el-checkbox>
+                        <el-checkbox label="周三" name="type"></el-checkbox>
+                        <el-checkbox label="周四" name="type"></el-checkbox>
+                        <el-checkbox label="周五" name="type"></el-checkbox>
+                        <el-checkbox label="周六" name="type"></el-checkbox>
+                        <el-checkbox label="周日" name="type"></el-checkbox>
+                      </el-checkbox-group>
+                    </el-form-item>
+                  </el-col>
+
+
                 </el-row>
               </el-form>
               <div slot="footer" class="dialog-footer">
@@ -544,34 +627,42 @@
                       <span v-if="scope.row.parent_id > 0"> &emsp;{{scope.row.advice_name}}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column align="center" label="规格">
-                    <template slot-scope="scope">
+                  <el-table-column align="center" label="药品规格">
                       <!-- {{drugDesc(scope.row)}} -->
-                      {{scope.row.advice_desc}}
-                    </template>
+                      <template slot-scope="scope">
+                        <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+                      </template>
                   </el-table-column>
                   <el-table-column prop="prescribing_number" align="center" label="开药数量">
                     <template slot-scope="scope" v-if="scope.row.prescribing_number != ''">
                       {{scope.row.prescribing_number}}{{scope.row.prescribing_number_unit}}
                     </template>
                   </el-table-column>
-                  <el-table-column prop="pulse_frequency" align="center" label="单次用量">
+                  <el-table-column align="center" label="单次用量">
                     <template slot-scope="scope" v-if="scope.row.single_dose != ''">
                       {{scope.row.single_dose}}{{scope.row.single_dose_unit}}
                     </template>
 
                   </el-table-column>
-                  <el-table-column prop="breathing_rate" align="center" label="给药途径">
+                  <el-table-column align="center" label="给药途径">
                     <template slot-scope="scope">
                       <span v-if="scope.row.parent_id == 0">{{scope.row.delivery_way}}</span>
                     </template>
 
                   </el-table-column>
-                  <el-table-column prop="blood_flow_volume" align="center" label="执行频率">
+                  <el-table-column align="center" label="执行频率">
                     <template slot-scope="scope">
                       <span v-if="scope.row.parent_id == 0">{{scope.row.execution_frequency}}</span>
                     </template>
                   </el-table-column>
+
+                  <el-table-column align="center" label="提醒频率" v-if="form.advice_type == 1">
+                    <template slot-scope="scope">
+                      <span v-if="scope.row.frequency_type == 1">每次必推</span>
+                      <span v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/1次</span>
+                      <span v-if="scope.row.frequency_type == 3">每周{{scope.row.week_days}}</span>
+                    </template>
+                  </el-table-column>
                 </el-table>
               </div>
               <div slot="footer" class="dialog-footer">
@@ -579,6 +670,8 @@
                 <el-button type="primary" @click="modifyTemplateName">保 存</el-button>
               </div>
             </el-dialog>
+
+
             <el-dialog title="新增医嘱" :visible.sync="templateFormTwoVisible" width="700px">
               <el-form
                 ref="templateForm"
@@ -593,12 +686,10 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="规格 :">
-                      <el-input v-model="templateForm.advice_desc"></el-input>
-                    </el-form-item>
-                    <!-- <el-form-item label="药品规格 :" prop="drug_spec">
+
+                <el-form-item label="药品规格 :" prop="advice_desc">
                       <el-col :span="9">
-                        <el-input v-model="templateForm.drug_spec"></el-input>
+                        <el-input v-model="templateForm.advice_desc"></el-input>
                       </el-col>
                       <el-col class="line" :span="1">&nbsp;</el-col>
                       <el-col :span="14">
@@ -617,7 +708,7 @@
                           ></el-option>
                         </el-select>
                       </el-col>
-                    </el-form-item> -->
+                    </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="单次用量 :" prop="single_dose">
@@ -705,7 +796,42 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
+
+
+                  <el-col :span="24" v-if="form.advice_type == 1">
+                    <el-form-item label="周期提醒 :">
+                      <el-radio-group v-model="templateForm.frequency_type">
+                        <el-radio :label="1">每次必推</el-radio>
+                        <el-radio :label="2">天数频率</el-radio>
+                        <el-radio :label="3">星期频率</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                  </el-col>
+
+
+                  <el-col :span="12" v-if="templateForm.frequency_type == 2">
+                    <el-form-item prop="day_count">
+                      <el-input style="width: 50px" v-model="templateForm.day_count"></el-input>&nbsp;
+                      天/一次
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="24" v-if="templateForm.frequency_type == 3">
+                    <el-form-item>
+                      <el-checkbox-group v-model="templateForm.weekday">
+                        <el-checkbox label="周一" name="type"></el-checkbox>
+                        <el-checkbox label="周二" name="type"></el-checkbox>
+                        <el-checkbox label="周三" name="type"></el-checkbox>
+                        <el-checkbox label="周四" name="type"></el-checkbox>
+                        <el-checkbox label="周五" name="type"></el-checkbox>
+                        <el-checkbox label="周六" name="type"></el-checkbox>
+                        <el-checkbox label="周日" name="type"></el-checkbox>
+                      </el-checkbox-group>
+                    </el-form-item>
+                  </el-col>
                 </el-row>
+
+
               </el-form>
               <div slot="footer" class="dialog-footer">
                 <el-button @click="cancelHandleTwo">取消</el-button>
@@ -1015,7 +1141,7 @@
     DeleteDrugWay,
     DeleteExecutionFrequency,
     DeleteParentAdviceTemplate,
-    getAdviceConfig,
+    getAllAdviceConfig,
     getAllAdviceTemplate,
     postAdviceTemplate,
     UpdateAdviceTemplate,
@@ -1033,6 +1159,8 @@
     components: { BreadCrumb },
     data() {
       return {
+        day_count: '',
+
         crumbs: [
           { path: false, name: '数据字典' },
           { path: 'data/druguse', name: '医嘱模版' }
@@ -1103,6 +1231,9 @@
           advice_name: [{ required: true, message: '请填写医嘱内容' }]
         },
         templateForm: {
+          frequency_type: 1,
+          day_count: '',
+          weekday: [],
           drug_spec: '',
           drug_spec_unit: '',
           advice_name: '',
@@ -1117,6 +1248,10 @@
         },
 
         templateFormEdit: {
+          frequency_type: 0,
+          day_count: '',
+          weekday: [],
+          week_days: '',
           drug_spec: '',
           drug_spec_unit: '',
           advice_name: '',
@@ -1139,7 +1274,7 @@
         },
         form: {
           name: '',
-          advice_type: '0'
+          advice_type: 0
 
         },
         drugwayForm: {
@@ -1225,6 +1360,7 @@
         }
       },
       handleCreateTemplate() {
+        this.form.advice_type = 0
         this.templateTableVisible = true
       },
       newRecordAction() {
@@ -1235,6 +1371,7 @@
         this.isAddChild = false
         this.templateTableVisible = false
         this.templateFormVisible = true
+
       }, deleteRecordAction: function() {
         if (this.table_current_index == -1) {
           this.$message.error('请选择一条医嘱记录')
@@ -1262,12 +1399,12 @@
         }
 
         this.isEdit = true
-
         const adviceTable = this.adviceTableData[this.table_current_index]
-
         for (var index in adviceTable) {
           this.templateForm[index] = adviceTable[index]
         }
+        this.templateForm.weekday = adviceTable.weekdays.split(',')
+
         this.templateFormVisible = true
         this.templateTableVisible = false
         this.dialogTitle = '编辑医嘱内容'
@@ -1280,7 +1417,6 @@
         }).then(() => {
           this.adviceTableData = []
           this.form.name = ''
-          this.form.advice_type = ''
           this.templateFormVisible = false
           this.templateTableVisible = false
         }).catch(() => {
@@ -1317,7 +1453,6 @@
             this.handleSpanTempArr()
 
             this.form.name = ''
-            this.form.advice_type = ''
             this.adviceTableData = []
             this.templateFormVisible = false
             this.templateTableVisible = false
@@ -1432,6 +1567,7 @@
           if (isNaN(this.templateForm.prescribing_number)) {
             this.templateForm.prescribing_number = 0
           }
+
           if (valid) {
             const templateFormTwo = {}
             templateFormTwo.template_id = this.current_template_id
@@ -1487,6 +1623,7 @@
                 }
               })
             } else {
+
               const templateFormTwo = {}
               templateFormTwo.advice_name = this.templateForm.advice_name
               templateFormTwo.advice_desc = this.templateForm.advice_desc
@@ -1500,6 +1637,33 @@
               templateFormTwo.execution_frequency = this.templateForm.execution_frequency
               templateFormTwo.parent_id = this.parent_id
 
+              if (this.templateForm.frequency_type == 1) {
+                templateFormTwo.frequency_type = this.templateForm.frequency_type
+                templateFormTwo.day_count = '0'
+                templateFormTwo.weekdays = ''
+
+              } else if (this.templateForm.frequency_type == 2) {
+
+                templateFormTwo.frequency_type = this.templateForm.frequency_type
+                templateFormTwo.day_count = this.templateForm.day_count
+                templateFormTwo.weekdays = ''
+
+              } else if (this.templateForm.frequency_type == 3) {
+                templateFormTwo.frequency_type = this.templateForm.frequency_type
+                templateFormTwo.day_count = '0'
+                templateFormTwo.weekdays = this.templateForm.weekday.filter(function(s) {
+                  return s && s.trim()
+                }).join(',')
+
+              }
+
+              this.templateForm.advice_name = ''
+              this.templateForm.advice_desc = ''
+              this.templateForm.frequency_type = 1
+              this.templateForm.day_count = ''
+              this.templateForm.weekday = []
+
+              console.log(templateFormTwo)
               if (this.isEdit) {
                 for (let i = 0; i < this.adviceTableData.length; i++) {
                   if (i == this.table_current_index) {
@@ -1513,10 +1677,14 @@
                     this.adviceTableData[i].prescribing_number_unit = templateFormTwo.prescribing_number_unit
                     this.adviceTableData[i].delivery_way = templateFormTwo.delivery_way
                     this.adviceTableData[i].execution_frequency = templateFormTwo.execution_frequency
+                    this.adviceTableData[i].frequency_type = templateFormTwo.frequency_type
+                    this.adviceTableData[i].day_count = templateFormTwo.day_count
+                    this.adviceTableData[i].weekdays = templateFormTwo.weekdays
                   }
                 }
               } else {
                 this.adviceTableData.unshift(templateFormTwo)
+                console.log(this.adviceTableData)
               }
               this.templateFormVisible = false
               this.templateTableVisible = true
@@ -1694,7 +1862,7 @@
 
       getAdviceConfig() {
         this.adviceTemplates = []
-        getAdviceConfig().then(response => {
+        getAllAdviceConfig().then(response => {
           if (response.data.state == 1) {
             this.drugways = response.data.data.drugways
             this.executionFrequencyOptions = response.data.data.efs
@@ -1752,6 +1920,24 @@
             this.templateFormEdit.prescribing_number = 0
           }
           if (valid) {
+            console.log(this.templateFormEdit)
+
+            if (this.templateFormEdit.frequency_type == 1) {
+
+              this.templateFormEdit.day_count = 0
+              this.templateFormEdit.week_days = ''
+
+            } else if (this.templateFormEdit.frequency_type == 2) {
+              this.templateFormEdit.day_count = parseInt(this.templateFormEdit.day_count)
+              this.templateFormEdit.week_days = ''
+
+            } else if (this.templateFormEdit.frequency_type == 3) {
+              this.templateFormEdit.day_count = 0
+              this.templateFormEdit.week_days = this.templateFormEdit.weekday.filter(function(s) {
+                return s && s.trim()
+              }).join(',')
+            }
+
             UpdateAdviceTemplate(this.templateFormEdit.id, this.templateFormEdit).then(
               response => {
                 if (response.data.state == 0) {
@@ -1772,6 +1958,9 @@
                   this.adviceTemplates[this.currentIndex].execution_frequency = template.execution_frequency
                   this.adviceTemplates[this.currentIndex].prescribing_number = template.prescribing_number
                   this.adviceTemplates[this.currentIndex].prescribing_number_unit = template.prescribing_number_unit
+                  this.adviceTemplates[this.currentIndex].day_count = template.day_count
+                  this.adviceTemplates[this.currentIndex].week_days = template.week_days
+                  this.adviceTemplates[this.currentIndex].frequency_type = template.frequency_type
                   this.currentIndex = -1
                   return false
                 }
@@ -1866,6 +2055,20 @@
         this.templateFormTwoVisible = false
       }, submitTemplateTwo(formName) {
         this.templateForm['template_id'] = this.current_template_id
+        this.templateForm['advice_type'] = this.form.advice_type
+
+        if (this.templateForm.frequency_type == 1) {
+          this.templateForm.day_count = 0
+          this.templateForm.week_days = ''
+        } else if (this.templateForm.frequency_type == 2) {
+          this.templateForm.day_count = parseInt(this.templateForm.day_count)
+          this.templateForm.week_days = ''
+        } else if (this.templateForm.frequency_type == 3) {
+          this.templateForm.day_count = 0
+          this.templateForm.week_days = this.templateForm.weekday.filter(function(s) {
+            return s && s.trim()
+          }).join(',')
+        }
         CreateSingleAdviceTemplate(this.templateForm).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -1880,14 +2083,13 @@
             objects['isNoSub'] = 2
 
             this.adviceTableDataTwo.unshift(response.data.data.template)
-            // this.adviceTemplates.unshift(objects)
-            // this.handleSpanTempArr()
-
             this.getAdviceConfig()
             this.resetForm(formName)
             this.templateFormTwoVisible = false
-
             this.$message.success('添加成功')
+            this.templateForm.day_count = ''
+            this.templateForm.weekday = []
+            this.templateForm.frequency_type = 1
 
             return false
           }
@@ -1952,7 +2154,7 @@
           }
         })
       }, merge({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex === 0 || columnIndex === 1 || columnIndex === 8) {
+        if (columnIndex === 0 || columnIndex === 1 || columnIndex === 9) {
           const _row = this.tempArr[rowIndex]
           const _col = _row > 0 ? 1 : 0
           return {
@@ -1986,6 +2188,7 @@
       }, cellMouseLeave: function(row, column, cell, event) {
         this.hoverOrderArr = []
       }, openEdit(index, row) {
+        console.log(row)
         this.hoverOrderArr = []
         this.currentIndex = index
         this.templateFormEdit.drug_spec_unit = row.drug_spec_unit
@@ -2000,6 +2203,10 @@
         this.templateFormEdit.single_dose_unit = row.single_dose_unit
         this.templateFormEdit.id = row.id
         this.templateFormEdit.parent_id = row.parent_id
+        this.templateFormEdit.day_count = row.day_count
+        this.templateFormEdit.frequency_type = row.frequency_type
+        this.templateFormEdit.weekday = row.week_days.split(',')
+
         this.templateEditFormVisible = true
         if (row.parent_id > 0) {
           this.editDialogTitle = '编辑子药'
@@ -2175,6 +2382,7 @@
         this.current_template_id = row.template_id
         this.current_template_name = row.name
         this.form.name = row.name
+        this.form.advice_type = row.advice_type
         this.templateTableTwoVisible = true
         this.adviceTableDataTwo = []
         for (let i = 0; i < this.adviceTemplates.length; i++) {

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -598,8 +598,7 @@
                           <div>▲</div>
                           <div>
                             <span>{{child.advice_name }}</span>
-                            <span>{{child.advice_desc}}</span>
-                            <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                            <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                             <span
                               v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                             <span
@@ -650,8 +649,7 @@
                           <div>▲</div>
                           <div>
                             <span>{{child.advice_name }}</span>
-                            <span>{{child.advice_desc}}</span>
-                            <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                            <span v-if="child.advice_desc">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
                             <span
                               v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                             <span

src/xt_pages/dialysis/batch_print/batch_print_order_five.vue

@@ -983,7 +983,7 @@
                     </td>
                     <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                       <span>{{advice.advice_name }}</span>
-                      <span>{{advice.advice_desc}}</span>
+                      <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
                       <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
                       <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                       <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
@@ -1085,7 +1085,9 @@
                       </td>
                       <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                         <span>{{advice.advice_name }}</span>
-                        <span>{{advice.advice_desc}}</span>
+                        <!--<span>{{advice.advice_desc}}</span>-->
+                        <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
+
                         <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
                         <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                         <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>

src/xt_pages/dialysis/batch_print/batch_print_order_five_two.vue

@@ -315,8 +315,8 @@
                     </td>
                     <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                       <span>{{advice.advice_name }}</span>
-                      <span>{{advice.advice_desc}}</span>
-                      <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
+                      <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
+                       <!--<span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
                       <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                       <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
                       <span v-if="advice.parent_id == 0  &&advice.children && advice.children.length == 0">{{advice.delivery_way}}</span>
@@ -417,7 +417,7 @@
                       </td>
                       <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                         <span>{{advice.advice_name }}</span>
-                        <span>{{advice.advice_desc}}</span>
+                        <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
                         <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
                         <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                         <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>

src/xt_pages/dialysis/batch_print/batch_print_order_other_two.vue

@@ -298,8 +298,7 @@
                     </td>
                     <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                       <span>{{advice.advice_name }}</span>
-                      <span>{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
-                      <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
+                      <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
                       <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                       <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
                       <span v-if="advice.parent_id == 0  &&advice.children && advice.children.length == 0">{{advice.delivery_way}}</span>
@@ -402,7 +401,7 @@
                     </td>
                     <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                       <span>{{advice.advice_name }}</span>
-                      <span>{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
+                      <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
                       <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
                       <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                       <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -92,6 +92,12 @@
           <span class="content" v-if="pulse_frequency!='0'">{{ pulse_frequency }}</span>
           <span class="unit" v-if="pulse_frequency!='0'">次/分</span>
         </li>
+        <li v-if="isShow('呼吸频率')">
+          <label>呼吸频率 : </label>
+          <span class="content" v-if="breathing_rate !='0'">{{ breathing_rate }}</span>
+          <span class="unit" v-if="breathing_rate !='0'">次/min</span>
+        </li>
+
         <li v-if="isShow('实际治疗时长')">
           <label>实际治疗时长 : </label>
           <span class="content" v-if="actual_treatment_hour!='0'">{{ actual_treatment_hour }}时</span>
@@ -366,6 +372,12 @@
           return '-'
           break
       }
+    },breathing_rate:function(){
+      if (this.record.id == 0) {
+        return '-'
+      }
+      return this.record.breathing_rate
+
     },
     temperature: function() {
       if (this.record.id == 0) {

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -93,6 +93,11 @@
           <span class="content">{{getBloodAccessNoise(this.record.blood_access_noise)}}</span>
         </li>
 
+        <li v-if="isShow('穿刺针')">
+          <label>穿刺针 : </label>
+          <span class="content">{{this.record.puncture_needle}}</span>
+        </li>
+
         <li v-if="isShow('穿刺方式')">
           <label>穿刺方式 : </label>
           <span class="content">{{getWay(this.record.puncture_way)}}</span>

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

@@ -42,6 +42,12 @@
               <el-input v-model="form.pulse_frequency"></el-input>
             </el-form-item>
           </el-col>
+
+          <el-col :span="8" v-if="isShow('呼吸频率')">
+            <el-form-item label="呼吸频率(次/min): " >
+              <el-input v-model="form.breathing_rate"></el-input>
+            </el-form-item>
+          </el-col>
         <!-- </el-row>
 
         <el-row :gutter="20"> -->
@@ -470,7 +476,8 @@
           disequilibrium_syndrome_option: '',
           arterial_tube: '',
           intravenous_tube: '',
-          dialyzer: ''
+          dialyzer: '',
+          breathing_rate:'',
 
         }
       }
@@ -512,6 +519,9 @@
           if (this.assessment_after_dislysis['pulse_frequency'] == 0) {
             this.form['pulse_frequency'] = ''
           }
+          if (this.assessment_after_dislysis['breathing_rate'] == 0) {
+            this.form['breathing_rate'] = ''
+          }
           if (this.assessment_after_dislysis['actual_ultrafiltration'] == 0) {
             this.form['actual_ultrafiltration'] = ''
           }
@@ -583,6 +593,8 @@
         data['remark'] = this.form.remark
         data['dialysis_order_id'] = this.form.dialysis_order_id ? parseFloat(this.form.dialysis_order_id) : 0
 
+        data['breathing_rate'] = this.form.breathing_rate ? parseFloat(this.form.breathing_rate) : 0
+
 
         data['dialysis_process'] = this.form.dialysis_process ? parseFloat(this.form.dialysis_process) : 0
         data['in_advance_minute'] = this.form.in_advance_minute ? parseFloat(this.form.in_advance_minute) : 0

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

@@ -142,7 +142,7 @@
         <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="药品规格：">
-              <el-input v-model="form.drug_spec" style="width: 40%;"></el-input>
+              <el-input v-model="form.advice_desc" style="width: 40%;"></el-input>
               <el-select v-model="form.drug_spec_unit" style="width: 56%;" filterable placeholder="选择">
                 <el-option v-for="item in unitsOption" :key="item.id" :label="item.name " :value="item.name">
                 </el-option>
@@ -746,7 +746,7 @@ export default {
           advice_date: this.record_date,
           start_time: uParseTime(
             this.currentRow.start_time,
-            '{y}-{m}-{d} {h}:{i}:{s}'
+            '{y}-{m}-{d} {h}:{i}'
           ),
           advice_name: '',
           drug_spec: '',
@@ -783,7 +783,7 @@ export default {
           advice_date: this.record_date,
           start_time: uParseTime(
             this.currentRow.start_time,
-            '{y}-{m}-{d} {h}:{i}:{s}'
+            '{y}-{m}-{d} {h}:{i}'
           ),
           advice_name: '',
           drug_spec: '',
@@ -820,7 +820,7 @@ export default {
           ),
           start_time: uParseTime(
             row.start_time,
-            '{y}-{m}-{d} {h}:{i}:{s}'
+            '{y}-{m}-{d} {h}:{i}'
           ),
           advice_name: row.advice_name,
           drug_spec: row.drug_spec != 0 ? '' + row.drug_spec : '',
@@ -1269,21 +1269,22 @@ export default {
         let tempSingleDoseDesc = ''
         const tempDrugSpecDesc = ''
         let tempPrescribingNumberDesc = ''
+        let tempDrugDesc = ''
+
+
 
         if (row.single_dose) {
           tempSingleDoseDesc = ' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
         }
-        // if(row.drug_spec){
-        //   tempDrugSpecDesc = "  "+row.drug_spec + "" + row.drug_spec_unit
-        // }
+
         if (row.prescribing_number) {
           tempPrescribingNumberDesc = '*' + row.prescribing_number + '' + row.prescribing_number_unit
         }
 
         if (isChild == 1) { // 不是子药
-          return row.advice_name + row.advice_desc + tempDrugSpecDesc + tempPrescribingNumberDesc + tempSingleDoseDesc + ' ' + row.delivery_way + ' ' + row.execution_frequency
+          return row.advice_name + row.advice_desc + row.drug_spec_unit + tempPrescribingNumberDesc + tempSingleDoseDesc + ' ' + row.delivery_way + ' ' + row.execution_frequency
         } else { // 是子药
-          return row.advice_name + row.advice_desc + tempDrugSpecDesc + tempPrescribingNumberDesc + tempSingleDoseDesc
+          return row.advice_name + row.advice_desc + row.drug_spec_unit +  tempPrescribingNumberDesc + tempSingleDoseDesc
         }
       }
 

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -91,11 +91,17 @@
               ></el-table-column>
 
               <el-table-column
-                label="规格"
-                property="advice_desc"
+                label="药品规格"
                 align="center"
 
-              ></el-table-column>
+              >
+                <template slot-scope="scope">
+                  <span
+                    v-if="scope.row.advice_desc"
+                  >{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+                </template>
+
+              </el-table-column>
               <!-- <el-table-column label="药品规格*数量" min-width="80" property="drug_spec" align="center">
                 <template slot-scope="scope">
                   <span
@@ -194,10 +200,16 @@
               align="center"
             ></el-table-column>
             <el-table-column
-              label="规格"
-              property="advice_desc"
+              label="药品规格"
               align="center"
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                  <span
+                    v-if="scope.row.advice_desc"
+                  >{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+              </template>
+
+            </el-table-column>
             <el-table-column label="开药数量" min-width="80" property="prescribing_number" align="center">
               <template slot-scope="scope">
                   <span
@@ -285,12 +297,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="规格 :" prop="advice_desc">
-              <el-input v-model="nameForm.advice_desc"></el-input>
-            </el-form-item>
-            <!-- <el-form-item label="药品规格 :" prop="drug_spec">
+            <!--<el-form-item label="规格 :" prop="advice_desc">-->
+              <!--<el-input v-model="nameForm.advice_desc"></el-input>-->
+            <!--</el-form-item>-->
+           <el-form-item label="药品规格 :" prop="advice_desc">
               <el-col :span="8">
-                <el-input v-model="nameForm.drug_spec"></el-input>
+                <el-input v-model="nameForm.advice_desc"></el-input>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
               <el-col :span="14">
@@ -309,7 +321,7 @@
                   ></el-option>
                 </el-select>
               </el-col>
-            </el-form-item> -->
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -90,11 +90,17 @@
                 style="word-break: keep-all;white-space:nowrap;"
               ></el-table-column>
               <el-table-column
-                label="规格"
+                label="药品规格"
                 property="advice_desc"
                 align="center"
 
-              ></el-table-column>
+              >
+                <template slot-scope="scope">
+                  <span
+                    v-if="scope.row.advice_desc"
+                  >{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+                </template>
+              </el-table-column>
               <!-- <el-table-column label="药品规格*数量" min-width="80" property="drug_spec" align="center">
                 <template slot-scope="scope">
                   <span
@@ -188,8 +194,14 @@
               label="规格"
               align="center"
 
-              property="advice_desc"
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                  <span
+                    v-if="scope.row.advice_desc"
+                  >{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+              </template>
+
+            </el-table-column>
             <el-table-column label="开药数量" min-width="80" property="prescribing_number" align="center">
               <template slot-scope="scope">
                   <span
@@ -277,12 +289,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="规格 :" prop="advice_desc">
-              <el-input v-model="nameForm.advice_desc"></el-input>
-            </el-form-item>
-            <!-- <el-form-item label="药品规格 :" prop="drug_spec">
+            <!--<el-form-item label="规格 :" prop="advice_desc">-->
+              <!--<el-input v-model="nameForm.advice_desc"></el-input>-->
+            <!--</el-form-item>-->
+            <el-form-item label="药品规格 :" prop="advice_desc">
               <el-col :span="8">
-                <el-input v-model="nameForm.drug_spec"></el-input>
+                <el-input v-model="nameForm.advice_desc"></el-input>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
               <el-col :span="14">
@@ -301,7 +313,7 @@
                   ></el-option>
                 </el-select>
               </el-col>
-            </el-form-item> -->
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>

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

@@ -161,6 +161,12 @@
             <el-input v-model="assessmentBeforeDislysis.complication" @focus="showInnerDialog('5')"></el-input>
           </el-form-item>
         </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="穿刺针： " v-if="isShow('穿刺针')">
+            <el-input v-model="assessmentBeforeDislysis.puncture_needle" @focus="showInnerDialog('11')"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="前次透析后：" v-if="isShow('前次透析后')">
             <el-input v-model="assessmentBeforeDislysis.last_post_dialysis" @focus="showInnerDialog('1')"></el-input>
@@ -431,6 +437,7 @@ export default {
         puncture_method:[],
         isVisibiltyForCruorDialog: false,
         assessmentBeforeDislysis: {
+          puncture_needle:'',
           catheter_bend: '',
           internal_fistula_skin: '',
           weight_before: '',
@@ -617,6 +624,14 @@ export default {
             this.InnerDialogProps.selected = this.assessmentBeforeDislysis.ductus_arantii
             this.InnerDialogProps.isShowTextArea = false
 
+            break
+          case '11': //
+            this.InnerDialogProps.values =  this.$store.getters.puncture_needle
+            this.InnerDialogProps.titles = '穿刺针'
+            this.InnerDialogProps.type = 'puncture_needle'
+            this.InnerDialogProps.selected = this.assessmentBeforeDislysis.puncture_needle
+            this.InnerDialogProps.isShowTextArea = false
+
             break
         }
       }, innerDialogComfirm: function(val) {
@@ -656,6 +671,9 @@ export default {
           case 'ductus_arantii':
             this.assessmentBeforeDislysis.ductus_arantii = val.value.join(',')
             break
+          case 'puncture_needle':
+            this.assessmentBeforeDislysis.puncture_needle = val.value.join(',')
+            break
 
 
 

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

@@ -198,7 +198,7 @@
         <el-row :gutter="20" > -->
 
         <el-col :span="8" v-if="isShows('体液过多其他症状')">
-          <el-form-item label="其他体液过多症状">
+          <el-form-item label="体液过多其他症状">
             <el-input v-model="dialysisPrescription.body_fluid_other"></el-input>
           </el-form-item>
         </el-col>

src/xt_pages/dialysis/details/statOrder.vue

@@ -21,7 +21,7 @@
           <span v-if="advice.parent_id>0">&nbsp;&nbsp;&nbsp;&nbsp;</span>
           <span >&nbsp;{{advice.advice_name }}</span>
           <span >{{advice.advice_desc}}</span>
-          <!-- <span v-if="advice.drug_spec">{{advice.drug_spec}}{{advice.drug_spec_unit}}</span> -->
+           <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
           <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
           <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
           <span >{{advice.delivery_way}}</span>

src/xt_pages/dialysis/template/DialysisPrintOrderFour.vue

@@ -907,7 +907,7 @@
                   <div>
                     <span>{{child.advice_name }}</span>
                     <span>{{child.advice_desc}}</span>
-                    <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                    <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                     <span
                       v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                     <span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>
@@ -974,7 +974,7 @@
                   <div>
                     <span>{{child.advice_name }}</span>
                     <span>{{child.advice_desc}}</span>
-                    <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                    <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                     <span
                       v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                     <span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -836,7 +836,7 @@
               <td class="advice-name">
                 <span v-if="advice[0].parent_id>0">└</span>
                 <span>{{advice[0].advice_name }}</span>
-                <span>{{advice[0].advice_desc}}{{advice[0].drug_spec_unit}}</span>
+                <span v-if="advice[0].advice_desc">{{advice[0].advice_desc}}{{advice[0].drug_spec_unit}}</span>
                 <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
                 <span v-if="advice[0].prescribing_number">* {{advice[0].prescribing_number}}{{advice[0].prescribing_number_unit}}</span>
                 <span
@@ -847,8 +847,8 @@
                   <div>▲</div>
                   <div>
                     <span>{{child.advice_name }}</span>
-                    <span>{{child.advice_desc}}</span>
-                    <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+
+                    <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                     <span
                       v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                     <span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>
@@ -915,7 +915,7 @@
                   <div>
                     <span>{{child.advice_name }}</span>
                     <span>{{child.advice_desc}}</span>
-                    <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                    <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                     <span
                       v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                     <span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>

src/xt_pages/dialysis/template/DialysisPrintOrderThree.vue

@@ -882,7 +882,7 @@
                   <div>
                     <span>{{child.advice_name }}</span>
                     <span>{{child.advice_desc}}</span>
-                    <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                    <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                     <span
                       v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                     <span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>
@@ -949,7 +949,7 @@
                   <div>
                     <span>{{child.advice_name }}</span>
                     <span>{{child.advice_desc}}</span>
-                    <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                    <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                     <span
                       v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                     <span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>

src/xt_pages/home/index.vue

@@ -218,15 +218,15 @@ export default {
       this.GetRemindPatientList(params)
     },
     GetRemindPatientList(params){
-      // GetRemind(params).then(response => {
-      //   if (response.data.state == 1) {
-      //     this.patientData = response.data.data.patients
-      //     this.total = response.data.data.total
-      //   } else {
-      //     this.$message.error(response.data.msg)
-      //   }
-      // }).catch(e => {
-      // })
+      GetRemind(params).then(response => {
+        if (response.data.state == 1) {
+          this.patientData = response.data.data.patients
+          this.total = response.data.data.total
+        } else {
+          this.$message.error(response.data.msg)
+        }
+      }).catch(e => {
+      })
     },
     GetPatientTotal() {
       GetPatientTotal().then(response => {

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -4,8 +4,8 @@
       <el-form ref="groupForm" :rules="groupRules" :model="groupForm" label-width="90px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="医嘱类型 :" required prop="advice_type">
-              <el-select v-model="groupForm.advice_type" placeholder="请选择">
+            <el-form-item label="医嘱类型 :" >
+              <el-select v-model="groupForm.advice_type" placeholder="请选择" disabled>
                 <el-option
                   :label="item.label"
                   :key="item.value"
@@ -19,14 +19,17 @@
             <el-form-item label="开始时间 :" required prop="start_time">
               <el-date-picker
                 type="datetime"
-                format="yyyy-MM-dd HH:mm:ss"
-                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择时间"
                 v-model="groupForm.start_time"
               ></el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
+
+
+
         <el-row>
           <el-col :span="12">
             <el-form-item label="开嘱医生 :">
@@ -41,14 +44,15 @@
         </el-row>
         <el-row style="margin-bottom: 20px">
           <el-col :span="2">&nbsp;</el-col>
-          <el-col :span="5">
-            <el-button
-              :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
-              @click="openAdviceTemplate()"
-              round
-            >选择医嘱模板
-            </el-button>
-          </el-col>
+          <!--<el-col :span="5">-->
+            <!--<el-button-->
+              <!--:disabled="$store.getters.xt_user.subscibe.state==3?true:false"-->
+              <!--@click="openAdviceTemplate()"-->
+              <!--round-->
+              <!---->
+            <!--&gt;选择医嘱模板-->
+            <!--</el-button>-->
+          <!--</el-col>-->
 
           <el-col :span="5">
             <el-button
@@ -99,19 +103,14 @@
                 style="word-break: keep-all;white-space:nowrap;"
               ></el-table-column>
               <el-table-column
-                label="规格"
+                label="药品规格"
                 property="advice_desc"
-              ></el-table-column>
-              <!-- <el-table-column label="药品规格*数量" min-width="80" property="drug_spec" align="center">
+              >
                 <template slot-scope="scope">
-                  <span
-                    v-if="scope.row.drug_spec!=0"
-                  >{{scope.row.drug_spec}}{{scope.row.drug_spec_unit}}</span>
-                  <span
-                    v-if="scope.row.prescribing_number!=0"
-                  >*{{scope.row.prescribing_number}}{{scope.row.prescribing_number_unit}}</span>
+                  <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
                 </template>
-              </el-table-column> -->
+              </el-table-column>
+
               <el-table-column label="开药数量" min-width="80" property="prescribing_number" align="center">
                 <template slot-scope="scope">
                   <span
@@ -141,6 +140,16 @@
                   <span v-if="scope.row.parent_row==0">{{scope.row.execution_frequency}}</span>
                 </template>
               </el-table-column>
+
+
+              <el-table-column label="提醒频率" min-width="80" property="execution_frequency" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.frequency_type == 1">每次必推</span>
+                  <span v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/1次</span>
+                  <span v-if="scope.row.frequency_type == 3">每周{{scope.row.week_day}}</span>
+                </template>
+              </el-table-column>
+
             </el-table>
           </el-col>
         </el-row>
@@ -189,9 +198,14 @@
               style="word-break: keep-all;white-space:nowrap;"
             ></el-table-column>
             <el-table-column
-              label="规格"
+              label="药品规格"
               property="advice_desc"
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+              </template>
+
+            </el-table-column>
             <el-table-column label="开药数量" min-width="80" property="prescribing_number" align="center">
               <template slot-scope="scope">
                   <span
@@ -279,12 +293,12 @@
           </el-col>
           <el-col :span="12">
 
-            <el-form-item label="规格 :" prop="advice_desc">
-              <el-input v-model="nameForm.advice_desc"></el-input>
-            </el-form-item>
-            <!-- <el-form-item label="药品规格 :" prop="drug_spec">
+            <!--<el-form-item label="规格 :" prop="advice_desc">-->
+              <!--<el-input v-model="nameForm.advice_desc"></el-input>-->
+            <!--</el-form-item>-->
+             <el-form-item label="药品规格 :" prop="advice_desc">
               <el-col :span="8">
-                <el-input v-model="nameForm.drug_spec"></el-input>
+                <el-input v-model="nameForm.advice_desc"></el-input>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
               <el-col :span="14">
@@ -303,7 +317,7 @@
                   ></el-option>
                 </el-select>
               </el-col>
-            </el-form-item> -->
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -397,6 +411,42 @@
               </el-select>
             </el-form-item>
           </el-col>
+
+
+          <el-col :span="24" v-if="groupForm.advice_type == 1&&!isChild">
+            <el-form-item label="周期提醒 :">
+              <el-radio-group v-model="nameForm.frequency_type">
+                <el-radio :label="1">每次必推</el-radio>
+                <el-radio :label="2">天数频率</el-radio>
+                <el-radio :label="3">星期频率</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="12" v-if="nameForm.frequency_type == 2">
+            <el-form-item prop="day_count">
+              <el-input style="width: 50px" v-model="nameForm.day_count"></el-input>&nbsp;
+              天/一次
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24" v-if="nameForm.frequency_type == 3">
+            <el-form-item prop="weekday">
+              <el-checkbox-group v-model="weeks">
+                <el-checkbox label="周一" name="type"></el-checkbox>
+                <el-checkbox label="周二" name="type"></el-checkbox>
+                <el-checkbox label="周三" name="type"></el-checkbox>
+                <el-checkbox label="周四" name="type"></el-checkbox>
+                <el-checkbox label="周五" name="type"></el-checkbox>
+                <el-checkbox label="周六" name="type"></el-checkbox>
+                <el-checkbox label="周日" name="type"></el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </el-col>
+
+
+
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -430,6 +480,7 @@
     name: 'EditGroupAdvice',
     data() {
       return {
+        weeks:[],
         editRowKey: 0,
         templateFormVisible: false,
         oldTemplateFormVisible: false,
@@ -463,7 +514,7 @@
           prescribing_number: "",
           prescribing_number_unit: "",
           delivery_way: "",
-          execution_frequency: "",
+          execution_frequency: 0,
           isEdit: 0,
           index: 0,
           id: 0,
@@ -495,6 +546,17 @@
           return []
         }
       },
+      weekList: [
+        { id: 1, name: '周一' },
+        { id: 2, name: '周二' },
+        { id: 3, name: '周三' },
+        { id: 4, name: '周四' },
+        { id: 5, name: '周五' },
+        { id: 6, name: '周六' },
+        { id: 7, name: '周日' }
+
+      ],
+      weekday:[],
       groupFormVisible: false,
       groupForm: {
         advice_type: "",
@@ -504,6 +566,10 @@
         advice_doctor: "",
         remark: "",
         parent_id: 0,
+        remind:0,
+        frequency_type:0,
+        day_count:'',
+
       },
       adviceTypeOptions: {
         type: Array,
@@ -643,7 +709,6 @@
                 start_time: _this.groupForm.start_time,
                 advice_name: _this.nameForm.advice_name,
                 advice_desc: _this.nameForm.advice_desc,
-
                 single_dose: '' + _this.nameForm.single_dose,
                 single_dose_unit: _this.nameForm.single_dose_unit,
                 drug_spec: '' + _this.nameForm.drug_spec,
@@ -658,7 +723,13 @@
                 remark: _this.groupForm.remark,
                 parent_id: _this.groupSelectRow.parent_id,
                 groupno: _this.groupForm.groupno,
+                frequency_type: _this.nameForm.frequency_type,
+                day_count:_this.nameForm.day_count.toString(),
+                week_days:this.weeks.filter(function(s) {
+                  return s && s.trim()
+                }).join(','),
               };
+              console.log( _this.adviceTableData)
               EditDoctorAdvice(this.patientID, this.groupSelectRow.id, submitForm).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg);
@@ -687,6 +758,11 @@
                       _this.adviceTableData[index].execution_frequency = advice.execution_frequency;
                       _this.adviceTableData[index].prescribing_number = advice.prescribing_number;
                       _this.adviceTableData[index].prescribing_number_unit = advice.prescribing_number_unit;
+
+                      _this.adviceTableData[index].frequency_type = advice.frequency_type;
+                      _this.adviceTableData[index].day_count = advice.day_count;
+                      _this.adviceTableData[index].week_day = advice.week_day;
+
                       break;
                     }
                   }
@@ -715,6 +791,7 @@
                       }
                     }
                   } else {
+
                     for (let index = 0; index < ale; index++) {
                       if (_this.groupSelectRow.row_key == _this.groupForm.adviceNames[index].row_key) {
                         _this.groupForm.adviceNames[index].advice_name = _this.nameForm.advice_name;
@@ -728,6 +805,11 @@
                         _this.groupForm.adviceNames[index].delivery_way = _this.nameForm.delivery_way;
                         _this.groupForm.adviceNames[index].execution_frequency = _this.nameForm.execution_frequency;
 
+
+                        _this.groupForm.adviceNames[index].frequency_type = _this.nameForm.frequency_type;
+                        _this.groupForm.adviceNames[index].day_count = _this.nameForm.day_count;
+                        _this.groupForm.adviceNames[index].week_day = _this.weeks.join(",");
+                          console.log(_this.weeks)
                         _this.$set(_this.groupForm.adviceNames, index, _this.groupForm.adviceNames[index]);
                         break;
                       }
@@ -735,6 +817,7 @@
                   }
                 }
               });
+              // this.weeks = []
 
             } else {
               if (_this.isChild) {
@@ -808,6 +891,9 @@
                 });
 
               } else {
+                _this.nameForm.week_days= this.weeks.filter(function(s) {
+                  return s && s.trim()
+                }).join(',')
                 _this.submitGroupForm = {
                   advice_type: _this.groupForm.advice_type,
                   advice_date: _this.groupForm.advice_date,
@@ -824,6 +910,12 @@
                       prescribing_number_unit: _this.nameForm.prescribing_number_unit,
                       delivery_way: _this.nameForm.delivery_way,
                       execution_frequency: _this.nameForm.execution_frequency,
+                      template_id:"D" + new Date().getTime() + this.getRandValue(),
+
+                      frequency_type: _this.nameForm.frequency_type,
+                      day_count: _this.nameForm.day_count.toString(),
+                      week_days: _this.nameForm.week_days,
+
                       isEdit: 0,
                       id: 0,
                       children: [],
@@ -834,6 +926,9 @@
                   remark: _this.groupForm.remark,
                   parent_id: 0,
                 };
+
+
+
                 CreateGroupAdvice(_this.patientID, _this.groupForm.groupno, _this.submitGroupForm).then(response => {
                   if (response.data.state == 0) {
                     _this.$message.error(response.data.msg);
@@ -845,6 +940,7 @@
                       type: "success",
                       duration: 2000
                     });
+                    this.weeks = []
                     if (_this.adviceType == _this.groupForm.advice_type || _this.adviceType == 0) {
 
                       // var alen = response.data.data.advices.length
@@ -907,6 +1003,11 @@
                           prescribing_number_unit: groups[index].prescribing_number_unit,
                           delivery_way: groups[index].delivery_way,
                           execution_frequency: groups[index].execution_frequency,
+
+                          frequency_type: groups[index].frequency_type,
+                          day_count: groups[index].day_count,
+                          week_day: groups[index].week_day,
+
                           isEdit: 0,
                           index: 0,
                           id: groups[index].id,
@@ -953,8 +1054,20 @@
             _this.nameFormVisible = false;
           }
         });
-      },
+      },getRandValue(){
+        var charactors="1234567890";
+
+        var value='',i;
 
+        for(let j=1;j<=4;j++){
+
+          i = parseInt(10*Math.random());
+
+          value = value + charactors.charAt(i);
+
+        }
+        return value
+      },
       openGroupChild() {
         if (this.groupSelectRow === null) {
 
@@ -1016,8 +1129,14 @@
             id: this.groupSelectRow.id,
             children: [],
             parent_row: this.groupSelectRow.parent_row,
-            // row_key:this.groupSelectRow.row_key,
+
+            day_count: this.groupSelectRow.day_count,
+            week_days: this.groupSelectRow.week_day,
+            frequency_type: this.groupSelectRow.frequency_type
+
           };
+          // console.log(this.nameForm.week_days)
+          this.weeks = this.groupSelectRow.week_day.split(",")
           this.nameFormTitle = '修改医嘱内容';
         } else {
           this.nameForm = {
@@ -1031,11 +1150,15 @@
             prescribing_number_unit: "",
             delivery_way: "",
             execution_frequency: "",
+            template_id:"",
             isEdit: 0,
             index: 0,
             id: 0,
             children: [],
             parent_row: 0,
+            day_count: '',
+            week_days: '',
+            frequency_type: 0,
           };
           this.nameFormTitle = '新增医嘱内容';
         }
@@ -1286,6 +1409,7 @@
             prescribing_number_unit: this.allSelectedTemplate[index].prescribing_number_unit,
             delivery_way: this.allSelectedTemplate[index].delivery_way,
             execution_frequency: this.allSelectedTemplate[index].execution_frequency,
+
             isEdit: 0,
             id: 0,
             children: [],

src/xt_pages/user/components/PatientDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container ">
-    <el-dialog title="新增甲肝乙肝丙肝梅毒HIV" :visible.sync="dialogFormVisible" width="1000px" id="user-inspection-form" >
+    <el-dialog title="查看传染病检查结果" :visible.sync="dialogFormVisible" width="1000px" id="user-inspection-form" >
       <el-form :model="form"  ref="form" label-position="top">
         <el-row >
           <el-col :span="1">&nbsp;</el-col>
@@ -153,11 +153,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="24">
-              <el-form-item label="响应结果 : " >
-                <el-input disabled type="textarea" :rows="3" v-model="form.response_result" resize="none" placeholder=""></el-input>
-              </el-form-item>
-            </el-col>
+
 
             <el-col :span="24">
               <el-form-item label="传染病周期提醒: " >
@@ -337,13 +333,7 @@
             <el-input type="textarea" :rows="3" v-model="form.remark" resize="none" placeholder="" readonly></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item label="传染病 : " prop="contagions">
-            <el-checkbox-group v-model="form.contagions">
-              <el-checkbox v-for="item in contagionList" v-if="item.type==2" :label="item.id" :key="item.id" :value="item.id" disabled>{{item.name}}</el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
-        </el-col>
+
         <el-col :span="24">
           <el-form-item label="慢性病 : " prop="diseases">
             <el-checkbox-group v-model="form.diseases">
@@ -653,6 +643,9 @@ export default {
       print_time: '',
 
       rules: {
+        contagions: [
+          { type: 'array', required: false, trigger: 'change' }
+        ],
         avatar: [{ required: true, message: '请上传头像', trigger: 'blur' }],
         patientType: [
           { required: true, message: '请选择患者类型', trigger: 'blur' }

src/xt_pages/user/components/PatientForm.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="main-contain">
-    <el-dialog title="新增甲肝乙肝丙肝梅毒HIV" :visible.sync="dialogFormVisible" width="1000px" id="user-inspection-form" v-loading="formLoading">
+    <el-dialog title="新增传染病检查" :visible.sync="dialogFormVisible" width="1000px" id="user-inspection-form" v-loading="formLoading">
       <el-form :model="form"  ref="form" label-position="top">
         <el-row >
           <el-col :span="1">&nbsp;</el-col>
@@ -201,11 +201,7 @@
 
               </el-col>
 
-              <el-col :span="24">
-                <el-form-item label="响应结果 : " >
-                  <el-input type="textarea" :rows="3" v-model="form.response_result" resize="none" placeholder=""></el-input>
-                </el-form-item>
-              </el-col>
+
 
               <el-col :span="24">
                 <el-form-item label="传染病周期提醒: " >

src/xt_pages/user/inspection.vue

@@ -86,8 +86,8 @@
 
       <el-form :model="form"  ref="form" label-position="top">
 
-        <el-row v-if="form.formItem[0].project_id == 14">
-          <el-col :span="24">
+        <el-row >
+          <el-col :span="24" v-if="form.formItem[0].project_id == 14">
             <el-form-item label="传染病周期提醒: " >
               <el-radio-group v-model="form.remind_cycle">
                 <el-radio :label="1">一月一次</el-radio>
@@ -304,6 +304,7 @@ export default {
           select_options: this.project.inspection_reference[index].range_options.split(","),
           unit: this.project.inspection_reference[index].unit,
         });
+
       }
 
       this.dialogFormVisible = true;
@@ -550,7 +551,7 @@ export default {
                 var range_max = parseFloat(item.range_max);
                 if (value < range_min) {
                   item.value_direction = "↓";
-                }else if (value > range_max) {
+                } else if (value > range_max) {
                   item.value_direction = "↑";
                 }
               }

src/xt_pages/workforce/components/tableWeeks.vue

@@ -26,49 +26,57 @@
       border
       :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
       style="width: 100%">
-      <el-table-column label="姓名" min-width="120" align="center">
+      <el-table-column label="姓名" min-width="100" align="center">
         <template slot-scope="scope">
           {{ scope.row.patient}}
         </template>
       </el-table-column>
-      <el-table-column label="分区" min-width="120" align="center">
+      <el-table-column label="分区" min-width="100" align="center">
         <template slot-scope="scope">
           {{scope.row.zone.name}}
         </template>
       </el-table-column>
-      <el-table-column label="班次" min-width="120" align="center">
+      <el-table-column label="班次" min-width="100" align="center">
         <template slot-scope="scope">
           {{getSchedulesType(scope.row.schedule_type)}}
         </template>
       </el-table-column>
-      <el-table-column label="机号" min-width="120" align="center">
+      <el-table-column label="机号" min-width="100" align="center">
         <template slot-scope="scope">
           {{scope.row.number.number}}
         </template>
       </el-table-column>
-      <el-table-column label="透析模式" min-width="120" align="center">
+      <el-table-column label="透析模式" min-width="100" align="center">
         <template slot-scope="scope">
           {{modeOptions[scope.row.mode_id].name}}
         </template>
       </el-table-column>
-      <el-table-column label="透析器" min-width="120" align="center">
+      <el-table-column label="透析器" min-width="100" align="center">
         <template slot-scope="scope">
           {{scope.row.prescription.dialyzer_perfusion_apparatus}}
         </template>
       </el-table-column>
-      <el-table-column label="抗凝剂" min-width="120" align="center">
+      <el-table-column label="抗凝剂" min-width="100" align="center">
         <template slot-scope="scope">
           {{ scope.row.prescription.anticoagulant ? anticoagulants_confit[scope.row.prescription.anticoagulant].name :
           ''}}
         </template>
       </el-table-column>
-      <el-table-column label="低分子肝素" min-width="120" align="center">
+      <el-table-column label="总量" min-width="100" align="center">
         <template slot-scope="scope">
-          {{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang:''}}
+          <span v-if="scope.row.prescription.anticoagulant == 1">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'mg':''}}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 2">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'mg':''}}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 3">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'IU':''}}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 4">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'mg':''}}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 5">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'mg':''}}</span>
+
         </template>
+
+
       </el-table-column>
-      <el-table-column label="长期医嘱" min-width="120" align="center">
+      <el-table-column label="长期医嘱" min-width="440" align="center">
         <template slot-scope="scope">
+           <span style="white-space: pre">{{getAdvice(scope.row.doctor_advice)}}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -238,6 +246,68 @@
             break
         }
         return type_name
+      },getAdvice:function(doctor_advice) {
+        console.log(doctor_advice)
+
+        let name = ""
+        for (let i = 0; i< doctor_advice.length; i++){
+
+          let prescribing_number = ''
+          let single_dose = ''
+          let drug_spec = ''
+
+          if (doctor_advice[i].prescribing_number > 0) {
+            prescribing_number = doctor_advice[i].prescribing_number + doctor_advice[i].prescribing_number_unit
+          }
+          if (doctor_advice[i].single_dose > 0) {
+            single_dose = ' 单次用量 ' + doctor_advice[i].single_dose + doctor_advice[i].single_dose_unit
+          }
+
+          if (doctor_advice[i].drug_spec > 0) {
+            drug_spec =  doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit
+          }
+
+
+          name = name + doctor_advice[i].advice_name +" "+ drug_spec+" "+ prescribing_number + " "+single_dose+" " + doctor_advice[i].delivery_way+" "+ doctor_advice[i].execution_frequency +" " + doctor_advice[i].remark +"\n"
+
+          // if (doctor_advice[i].child.length > 0){
+          //   for (let a = 0 ; a < doctor_advice[a].child.length; a++){
+          //     if(doctor_advice[i].child[a].prescribing_number > 0){
+          //       doctor_advice[i].child[a]['presc'] = doctor_advice[i].child[a].prescribing_number + doctor_advice[i].child[a].prescribing_number_unit
+          //     }else{
+          //       doctor_advice[i].child[a]['presc'] = ''
+          //     }
+          //
+          //     if(doctor_advice[i].child[a].single_dose > 0){
+          //       doctor_advice[i].child[a]['single'] = " "+' 单次用量 '+" "+doctor_advice[i].child[a].single_dose + doctor_advice[i].child[a].single_dose_unit
+          //     }else{
+          //       doctor_advice[i].child[a]['single'] = ''
+          //     }
+          //     name = name+"▲"+doctor_advice[i].child[a].advice_name+""
+          //       + doctor_advice[i].child[a].advice_desc
+          //       + doctor_advice[i].child[a].drug_spec_unit
+          //       + doctor_advice[i].child[a].presc
+          //       + doctor_advice[i].child[a].single
+          //
+          //
+          //   }
+          //   return  doctor_advice[i].advice_name +"  "+ doctor_advice[i].advice_desc+" "
+          //     + doctor_advice[i].drug_spec_unit
+          //     + prescribing_number
+          //     + " "+single_dose+" "+ " "+doctor_advice[i].delivery_way+" "+ doctor_advice[i].execution_frequency + doctor_advice[i].remark +name
+          //
+          // }else{
+          //
+          //
+          //
+          // }
+
+
+        }
+
+
+        return name
+
       }
     },
     components: {
@@ -248,6 +318,10 @@
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
 
       this.week_type = new Date().getDay()
+      if(this.week_type == 0){
+        this.week_type = 7
+
+      }
       let params = {
         week_type: this.week_type
       }

src/xt_pages/workforce/remind_print.vue

@@ -13,53 +13,56 @@
       <div id="print_content">
         <div class="print_main_content">
           <div class="order_title_panl">
-            <span class="main_title"></span>
+            <span class="main_title">{{day}}排班提醒</span>
           </div>
           <div class="table_panel">
             <table class="table">
               <thead>
               <tr>
                 <td :width="td_1_width">姓名</td>
-                <td :width="td_2_width">分区</td>
-                <td :width="td_3_width">班次</td>
-                <td :width="td_3_width">机号</td>
-                <td :width="td_3_width">透析模式</td>
-                <td :width="td_3_width">透析器</td>
-                <td :width="td_3_width">抗凝剂</td>
-                <td :width="td_3_width">低分子肝素</td>
-                <td :width="td_3_width">长期医嘱</td>
+                <td :width="td_1_width">分区</td>
+                <td :width="td_1_width">班次</td>
+                <td :width="td_1_width">机号</td>
+                <td :width="td_1_width">透析模式</td>
+                <td :width="td_1_width">透析器</td>
+                <td :width="td_1_width">抗凝剂</td>
+                <td :width="td_1_width">总量</td>
+                <td :width="td_4_width">长期医嘱</td>
               </tr>
               </thead>
               <tbody>
               <tr v-for="(main_collection, index) in scheduleData" :key="index">
                 <td :width="td_1_width">{{ main_collection.patient}}</td>
-                <td :width="td_2_width">{{ main_collection.zone.name }}</td>
-                <td :width="td_3_width">
+                <td :width="td_1_width">{{ main_collection.zone.name }}</td>
+                <td :width="td_1_width">
                   {{getSchedulesType(main_collection.schedule_type)}}
                 </td>
-                <td :width="td_3_width">
+                <td :width="td_1_width">
                   {{main_collection.number.number}}
 
                 </td>
-                <td :width="td_3_width">
+                <td :width="td_1_width">
                   {{modeOptions[main_collection.mode_id].name}}
                 </td>
-                <td :width="td_3_width">
+                <td :width="td_1_width">
                   {{main_collection.prescription.dialyzer_perfusion_apparatus}}
 
 
                 </td>
-                <td :width="td_3_width">
-                  {{main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name : ''}}
+                <td :width="td_1_width">
+                  {{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name : ''}}
 
                 </td>
-                <td :width="td_3_width">
-                  {{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang:''}}
+                <td :width="td_1_width">
+                  <span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 2">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 3">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'IU':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 4">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 5">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
                 </td>
                 <td :width="td_4_width" >
-
+                  <span style="white-space: pre">{{getAdvice(main_collection.doctor_advice)}}</span>
                 </td>
-
               </tr>
               </tbody>
             </table>
@@ -86,10 +89,11 @@
         ],
         scheduleData:[],
         week_type: 0,
+        day:'',
         td_1_width: '10%',
         td_2_width: '10%',
         td_3_width: '25%',
-        td_4_width: '35%',
+        td_4_width: '45%',
         modeOptions: null,
         anticoagulants_confit:null,
       }
@@ -109,6 +113,7 @@
         var resp = rs.data
         if (resp.state == 1) {
           this.scheduleData = resp.data.schdules
+          this.day = resp.data.day
         } else {
           this.$message.error(resp.msg)
         }
@@ -117,6 +122,63 @@
       })
     },
     methods: {
+      getAdvice:function(doctor_advice) {
+        let name = ""
+        for (let i = 0; i< doctor_advice.length; i++){
+
+          let prescribing_number = ''
+          let drug_spec = ''
+          let single_dose = ''
+
+          if (doctor_advice[i].prescribing_number > 0) {
+            prescribing_number = doctor_advice[i].prescribing_number + doctor_advice[i].prescribing_number_unit
+          }
+          if (doctor_advice[i].single_dose > 0) {
+            single_dose = ' 单次用量 ' + doctor_advice[i].single_dose + doctor_advice[i].single_dose_unit
+          }
+
+          if (doctor_advice[i].advice_desc > 0) {
+            drug_spec =  doctor_advice[i].advice_desc + doctor_advice[i].drug_spec_unit
+          }
+
+          name = name + doctor_advice[i].advice_name +" "+ drug_spec +" " + prescribing_number + single_dose + doctor_advice[i].delivery_way+" "+ doctor_advice[i].execution_frequency + doctor_advice[i].remark +"\n"
+          // if (doctor_advice[i].child.length > 0){
+          //   for (let a = 0 ; a < doctor_advice[a].child.length; a++){
+          //     if(doctor_advice[i].child[a].prescribing_number > 0){
+          //       doctor_advice[i].child[a]['presc'] = doctor_advice[i].child[a].prescribing_number + doctor_advice[i].child[a].prescribing_number_unit
+          //     }else{
+          //       doctor_advice[i].child[a]['presc'] = ''
+          //     }
+          //
+          //     if(doctor_advice[i].child[a].single_dose > 0){
+          //       doctor_advice[i].child[a]['single'] = " "+' 单次用量 '+" "+doctor_advice[i].child[a].single_dose + doctor_advice[i].child[a].single_dose_unit
+          //     }else{
+          //       doctor_advice[i].child[a]['single'] = ''
+          //     }
+          //     name = name+"▲"+doctor_advice[i].child[a].advice_name+""
+          //       + doctor_advice[i].child[a].advice_desc
+          //       + doctor_advice[i].child[a].drug_spec_unit
+          //       + doctor_advice[i].child[a].presc
+          //       + doctor_advice[i].child[a].single
+          //
+          //
+          //   }
+          //   return  doctor_advice[i].advice_name +"  "+ doctor_advice[i].advice_desc+" "
+          //     + doctor_advice[i].drug_spec_unit
+          //     + prescribing_number
+          //     + " "+single_dose+" "+ " "+doctor_advice[i].delivery_way+" "+ doctor_advice[i].execution_frequency + doctor_advice[i].remark +name
+          //
+          // }else{
+          //
+          //
+          //
+          // }
+
+        }
+
+        return name
+
+      },
       printAction: function() {
         const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'