新功能

config/index.js

@@ -20,7 +20,7 @@ module.exports = {
     // host: 'xt.test.sgjyun.com',
     // host: 'xt.kuyicloud.com',
     host: 'xt.test.sgjyun.com',
-    port: 9526, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    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,

src/api/advice.js

@@ -1,8 +1,8 @@
 import request from '@/utils/request'
 
-export function getAdviceConfig(){
+export function getAdviceConfig(type){
     return request({
-        url:'/api/getadviceconfigs',
+        url:'/api/getadviceconfigs?type='+type,
         method:'get',
     })
 }
@@ -197,11 +197,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/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>
@@ -142,6 +142,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 +192,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>
 
@@ -239,6 +247,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">
@@ -375,6 +391,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 +431,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"
@@ -510,6 +562,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">
@@ -555,23 +642,31 @@
                       {{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 +674,12 @@
                 <el-button type="primary" @click="modifyTemplateName">保 存</el-button>
               </div>
             </el-dialog>
+
+
+
+
+
+
             <el-dialog title="新增医嘱" :visible.sync="templateFormTwoVisible" width="700px">
               <el-form
                 ref="templateForm"
@@ -705,7 +806,43 @@
                       </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>
@@ -1033,6 +1170,8 @@
     components: { BreadCrumb },
     data() {
       return {
+        day_count: '',
+
         crumbs: [
           { path: false, name: '数据字典' },
           { path: 'data/druguse', name: '医嘱模版' }
@@ -1103,6 +1242,9 @@
           advice_name: [{ required: true, message: '请填写医嘱内容' }]
         },
         templateForm: {
+          frequency_type: 1,
+          day_count: '',
+          weekday: [],
           drug_spec: '',
           drug_spec_unit: '',
           advice_name: '',
@@ -1117,6 +1259,10 @@
         },
 
         templateFormEdit: {
+          frequency_type: '',
+          day_count: '',
+          weekday: [],
+          week_days:'',
           drug_spec: '',
           drug_spec_unit: '',
           advice_name: '',
@@ -1139,7 +1285,7 @@
         },
         form: {
           name: '',
-          advice_type: '0'
+          advice_type: 0
 
         },
         drugwayForm: {
@@ -1225,6 +1371,7 @@
         }
       },
       handleCreateTemplate() {
+        this.form.advice_type = 0
         this.templateTableVisible = true
       },
       newRecordAction() {
@@ -1235,6 +1382,7 @@
         this.isAddChild = false
         this.templateTableVisible = false
         this.templateFormVisible = true
+
       }, deleteRecordAction: function() {
         if (this.table_current_index == -1) {
           this.$message.error('请选择一条医嘱记录')
@@ -1262,12 +1410,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 +1428,6 @@
         }).then(() => {
           this.adviceTableData = []
           this.form.name = ''
-          this.form.advice_type = ''
           this.templateFormVisible = false
           this.templateTableVisible = false
         }).catch(() => {
@@ -1317,7 +1464,6 @@
             this.handleSpanTempArr()
 
             this.form.name = ''
-            this.form.advice_type = ''
             this.adviceTableData = []
             this.templateFormVisible = false
             this.templateTableVisible = false
@@ -1432,6 +1578,9 @@
           if (isNaN(this.templateForm.prescribing_number)) {
             this.templateForm.prescribing_number = 0
           }
+
+
+
           if (valid) {
             const templateFormTwo = {}
             templateFormTwo.template_id = this.current_template_id
@@ -1487,6 +1636,7 @@
                 }
               })
             } else {
+
               const templateFormTwo = {}
               templateFormTwo.advice_name = this.templateForm.advice_name
               templateFormTwo.advice_desc = this.templateForm.advice_desc
@@ -1500,6 +1650,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 +1690,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
@@ -1752,6 +1933,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 +1971,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 +2068,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)
@@ -1879,15 +2095,17 @@
             objects['name'] = this.current_template_name
             objects['isNoSub'] = 2
 
-            this.adviceTableDataTwo.unshift(response.data.data.template)
-            // this.adviceTemplates.unshift(objects)
-            // this.handleSpanTempArr()
 
+
+            this.adviceTableDataTwo.unshift(response.data.data.template)
             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 +2170,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 +2204,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 +2219,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 +2398,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/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
@@ -102,16 +106,7 @@
                 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>
-                </template>
-              </el-table-column> -->
+
               <el-table-column label="开药数量" min-width="80" property="prescribing_number" align="center">
                 <template slot-scope="scope">
                   <span
@@ -141,6 +136,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>
@@ -397,6 +402,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 +471,7 @@
     name: 'EditGroupAdvice',
     data() {
       return {
+        weeks:[],
         editRowKey: 0,
         templateFormVisible: false,
         oldTemplateFormVisible: false,
@@ -495,6 +537,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 +557,10 @@
         advice_doctor: "",
         remark: "",
         parent_id: 0,
+        remind:0,
+        frequency_type:0,
+        day_count:'',
+
       },
       adviceTypeOptions: {
         type: Array,
@@ -643,7 +700,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,6 +714,11 @@
                 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(','),
               };
               EditDoctorAdvice(this.patientID, this.groupSelectRow.id, submitForm).then(response => {
                 if (response.data.state == 0) {
@@ -672,7 +733,7 @@
                   });
                   var ale = _this.groupForm.adviceNames.length;
                   var atle = _this.adviceTableData.length;
-
+                  this.weeks = []
                   for (let index = 0; index < atle; index++) {
                     if (_this.groupSelectRow.id == _this.adviceTableData[index].id) {
                       var advice = response.data.data.advice;
@@ -687,6 +748,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;
                     }
                   }
@@ -728,6 +794,13 @@
                         _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.nameForm.week_day;
+
+
+
                         _this.$set(_this.groupForm.adviceNames, index, _this.groupForm.adviceNames[index]);
                         break;
                       }
@@ -808,6 +881,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 +900,11 @@
                       prescribing_number_unit: _this.nameForm.prescribing_number_unit,
                       delivery_way: _this.nameForm.delivery_way,
                       execution_frequency: _this.nameForm.execution_frequency,
+
+                      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 +915,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 +929,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 +992,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,
@@ -1016,8 +1106,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.groupSelectRow)
+          this.weeks = this.groupSelectRow.week_day.split(",")
           this.nameFormTitle = '修改医嘱内容';
         } else {
           this.nameForm = {
@@ -1036,6 +1132,9 @@
             id: 0,
             children: [],
             parent_row: 0,
+            day_count: '',
+            week_days: '',
+            frequency_type: '',
           };
           this.nameFormTitle = '新增医嘱内容';
         }

src/xt_pages/user/components/PatientForm.vue

@@ -975,27 +975,27 @@
               this.form.age = parseInt(this.form.age)
               createPatient(this.form)
                 .then(response => {
-                  // if (response.data.state == 0) {
-                  //   this.$message.error(response.data.msg)
-                  //   this.formSubmit = true
-                  //   return false
-                  // } else {
-                  //   this.formSubmit = true
-                  //   this.$notify({
-                  //     title: '成功',
-                  //     message: this.submitMsg,
-                  //     type: 'success',
-                  //     duration: 2000
-                  //   })
-                  //   this.$refs[formName].resetFields()
-                  //   this.$store.dispatch('SetSubscibePatients')
-                  //   var sub = this.$store.getters.xt_user.subscibe
-                  //   console.log(sub)
-                  //   if (action !== 'renew') {
-                  //     this.$router.back(-1)
-                  //   }
-                  //   return false
-                  // }
+                  if (response.data.state == 0) {
+                    this.$message.error(response.data.msg)
+                    this.formSubmit = true
+                    return false
+                  } else {
+                    this.formSubmit = true
+                    this.$notify({
+                      title: '成功',
+                      message: this.submitMsg,
+                      type: 'success',
+                      duration: 2000
+                    })
+                    this.$refs[formName].resetFields()
+                    this.$store.dispatch('SetSubscibePatients')
+                    var sub = this.$store.getters.xt_user.subscibe
+                    console.log(sub)
+                    if (action !== 'renew') {
+                      this.$router.back(-1)
+                    }
+                    return false
+                  }
                 })
                 .catch(err => {
                   this.$message.error('网络异常')

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 = "↑";
                 }
               }