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

config/dev.env.js

@@ -7,11 +7,12 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
-  // BASE_API: '"http://localhost:9529"',
+  // BASE_API: '"http://api.xt.test.sgjyun.com"',
+  BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://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

@@ -29,8 +29,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    host: 'xt.test.sgjyun.com',
-    // host: 'localhost',
+    // host: 'xt.test.sgjyun.com',
+    host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/xt_pages/hospitalStation/components/chargeDialog.vue

@@ -120,6 +120,8 @@
           {value: 2, label: '银行卡'},
           {value: 3, label: '微信'},
           {value: 4, label: '支付宝'},
+          {value: 5, label: '医保卡'},
+
         ],
         total:"",
 

src/xt_pages/hospitalStation/components/registerDialog.vue

@@ -122,6 +122,26 @@
                 </el-select>
             </el-form-item>
 
+            <el-form-item label="医生：" prop="doctor">
+                <el-select v-model="form.doctor" placeholder="请选择">
+                    <el-option
+                            v-for="(item,index) in doctors"
+                            :key="index"
+                            :label="item.user_name"
+                            :value="item.admin_user_id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="科室：" prop="department">
+                <el-select v-model="form.department" placeholder="请选择">
+                    <el-option
+                            v-for="(item,index) in departments"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
 
             <el-form-item label="社保类型：">
                 <el-select v-model="form.social_type" placeholder="请选择" style="width:100%;">
@@ -172,27 +192,6 @@
                 <el-input v-model="form.medical_expenses"></el-input>
             </el-form-item>
 
-            <el-form-item label="医生：" prop="doctor">
-                <el-select v-model="form.doctor" placeholder="请选择">
-                    <el-option
-                            v-for="(item,index) in doctors"
-                            :key="index"
-                            :label="item.user_name"
-                            :value="item.admin_user_id">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-
-            <el-form-item label="科室：" prop="department">
-                <el-select v-model="form.department" placeholder="请选择">
-                    <el-option
-                            v-for="(item,index) in departments"
-                            :key="index"
-                            :label="item.name"
-                            :value="item.id">
-                    </el-option>
-                </el-select>
-            </el-form-item>
         </el-form>
 
 

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -121,6 +121,8 @@
           {value: 2, label: '银行卡'},
           {value: 3, label: '微信'},
           {value: 4, label: '支付宝'},
+          {value: 5, label: '医保卡'},
+
         ],
         total:"",
 

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue

@@ -1,20 +1,33 @@
 <template>
+
     <div class="prescriptionTable">
-        <el-table v-if="prescription.advices && prescription.advices.length > 0" :data="prescription.advices" border style="width: 99%;" :row-style="{ color: '#303133' }"
+        <el-table v-if="prescription.advices && prescription.advices.length > 0" :data="prescription.advices" border
+                  style="width: 99%;" :row-style="{ color: '#303133' }"
                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-            <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+            <el-table-column align="center" width="70" label="序号">
+                <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;">
+                        <el-input v-model="scope.row.groupno" placeholder=""></el-input>
+                    </div>
+                </template>
+            </el-table-column>
             <el-table-column align="center" prop="drug_name" label="名称">
-                <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span></template>
+                <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span>
+                </template>
             </el-table-column>
 
             <el-table-column align="center" prop="single_dose" width="120" label="单次用量">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                        <el-input v-model="scope.row.single_dose" @input="getSingleDose(scope)" style="width:50%;"></el-input>
+                        <el-input v-model="scope.row.single_dose" @input="getSingleDose(scope)"
+                                  style="width:50%;"></el-input>
                         <!-- <div>{{scope.row.single_dose_unit}}</div> -->
-                        <el-select v-model="scope.row.single_dose_unit" placeholder="请选择" style="width:50%;" @change="getAllChange(scope)">
-                          <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
-                          <el-option :label="scope.row.drug.dose_unit" v-if="scope.row.drug.dose_unit != scope.row.drug.min_unit" :value="scope.row.drug.dose_unit"></el-option>
+                        <el-select v-model="scope.row.single_dose_unit" placeholder="请选择" style="width:50%;"
+                                   @change="getAllChange(scope)">
+                            <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
+                            <el-option :label="scope.row.drug.dose_unit"
+                                       v-if="scope.row.drug.dose_unit != scope.row.drug.min_unit"
+                                       :value="scope.row.drug.dose_unit"></el-option>
                         </el-select>
                     </div>
                 </template>
@@ -48,7 +61,8 @@
             <el-table-column align="center" prop="day" width="70" label="天数">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                        <el-input v-model="scope.row.day" @input="getAllChange(scope)" placeholder=""></el-input>{{'天'}}
+                        <el-input v-model="scope.row.day" @input="getAllChange(scope)" placeholder=""></el-input>
+                        {{'天'}}
                     </div>
                 </template>
             </el-table-column>
@@ -56,11 +70,15 @@
             <el-table-column align="center" prop="prescribing_number" width="120" label="总量">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                        <el-input v-model="scope.row.prescribing_number" style="width:50%" @input="changePrescribingNumber(scope)" placeholder=""></el-input>
+                        <el-input v-model="scope.row.prescribing_number" style="width:50%"
+                                  @input="changePrescribingNumber(scope)" placeholder=""></el-input>
                         <!-- <div> {{scope.row.prescribing_number_unit}}</div> -->
-                        <el-select v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;" @change="getAllChange(scope)">
-                          <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
-                          <el-option :label="scope.row.drug.max_unit" v-if="scope.row.drug.min_unit != scope.row.drug.max_unit" :value="scope.row.drug.max_unit"></el-option>
+                        <el-select v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;"
+                                   @change="getAllChange(scope)">
+                            <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
+                            <el-option :label="scope.row.drug.max_unit"
+                                       v-if="scope.row.drug.min_unit != scope.row.drug.max_unit"
+                                       :value="scope.row.drug.max_unit"></el-option>
                         </el-select>
                     </div>
                 </template>
@@ -79,28 +97,46 @@
                     <el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>
                 </template>
             </el-table-column>
+
+            <el-table-column align="center" prop="remark" width="50" label="推送频率">
+                <template slot-scope="scope">
+                    <div v-if="scope.row.frequency_type == 1">{{'每次必推'}}</div>
+                    <div v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/次</div>
+                    <div v-if="scope.row.frequency_type == 3">{{scope.row.week_day}}</div>
+
+                </template>
+            </el-table-column>
+
+
             <el-table-column align="center" width="40" prop="name" label="操作">
                 <template slot-scope="scope">
-                    <i class="el-icon-delete" @click="deleteDrug(scope.$index, scope.row)"></i>
+                    <!--<i class="el-icon-delete" @click="deleteDrug(scope.$index, scope.row)"></i>-->
+                    <el-button size="mini" type="primary" @click="handleEdit(scope.row,scope.$index)">推送</el-button>
+                    <el-button size="mini" type="danger" @click="deleteDrug(scope.row.id,scope.$index)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
 
-        <el-table v-if="prescription.project &&prescription.project.length > 0" :data="prescription.project" border style="width: 99%;" :row-style="{ color: '#303133' }"
+        <el-table v-if="prescription.project &&prescription.project.length > 0" :data="prescription.project" border
+                  style="width: 99%;" :row-style="{ color: '#303133' }"
                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
             <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
             <el-table-column align="center" prop="project_name" label="名称">
-                <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span></template>
+                <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span>
+                </template>
             </el-table-column>
             <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-                <template slot-scope="scope">{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</template>
+                <template slot-scope="scope">{{scope.row.type ==
+                    2?getGroup(scope.row.statistical_classification):'耗材'}}
+                </template>
             </el-table-column>
             <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
                 <template slot-scope="scope">
-                  <div style="display:flex;align-items:center;">
-                    <el-input v-model="scope.row.single_dose" @input="getProjectSingleDose(scope)" placeholder=""></el-input>
-                    <div>{{scope.row.unit}}</div>
-                  </div>
+                    <div style="display:flex;align-items:center;">
+                        <el-input v-model="scope.row.single_dose" @input="getProjectSingleDose(scope)"
+                                  placeholder=""></el-input>
+                        <div>{{scope.row.unit}}</div>
+                    </div>
 
                 </template>
             </el-table-column>
@@ -123,7 +159,8 @@
             <el-table-column align="center" prop="number_days" width="70" label="天数">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                        <el-input v-model="scope.row.number_days" @input="getProjectDay(scope)" placeholder=""></el-input>
+                        <el-input v-model="scope.row.number_days" @input="getProjectDay(scope)"
+                                  placeholder=""></el-input>
                         <div>{{'天'}}</div>
                     </div>
                 </template>
@@ -140,8 +177,8 @@
             <el-table-column align="center" prop="name" width="70" label="单价">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                      <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
-                      <div>{{'元'}}</div>
+                        <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
+                        <div>{{'元'}}</div>
                     </div>
 
                 </template>
@@ -151,9 +188,22 @@
                     <el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>
                 </template>
             </el-table-column>
+            <el-table-column align="center" prop="remark" width="50" label="推送频率">
+                <template slot-scope="scope">
+                    <div v-if="scope.row.frequency_type == 1">{{'每次必推'}}</div>
+                    <div v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/次</div>
+                    <div v-if="scope.row.frequency_type == 3">{{scope.row.week_day}}</div>
+
+                </template>
+            </el-table-column>
             <el-table-column align="center" width="40" prop="name" label="操作">
                 <template slot-scope="scope">
-                    <i class="el-icon-delete" @click="deleteProject(scope.row,scope.$index)"></i>
+                    <el-button size="mini" type="primary" @click="handleEdit(scope.row,scope.$index)">推送</el-button>
+                    <el-button size="mini" type="danger" @click="deleteProject(scope.row.id,scope.$index)">删除
+                    </el-button>
+                    <!--<i class="el-icon-delete" @click="deleteProject(scope.row,scope.$index)"></i>-->
+                    <!--<button class="el-icon-delete" @click="deleteProject(scope.row,scope.$index)">删除</>-->
+
                 </template>
             </el-table-column>
         </el-table>
@@ -170,36 +220,91 @@
         </div>
 
 
+        <div>
+            <el-dialog title="推送频率设置" :visible.sync="templateFormVisible" width="854px">
+                <el-form
+                        ref="templateForm"
+                        label-width="90px"
+                >
+                    <el-row>
+                        <el-col :span="24" >
+                            <el-form-item label="周期提醒 :">
+                                <el-radio-group v-model="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="frequency_type == 2">
+                            <el-form-item prop="day_count">
+                                <el-input style="width: 50px" v-model="day_count"></el-input>&nbsp;
+                                天/一次
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="24" v-if="frequency_type == 3">
+                            <el-form-item prop="weekday">
+                                <el-checkbox-group v-model="week_days">
+                                    <el-checkbox label="周一" name="周一" key="1">周一</el-checkbox>
+                                    <el-checkbox label="周二" name="周二" key="2">周二</el-checkbox>
+                                    <el-checkbox label="周三" name="周三" key="3">周三</el-checkbox>
+                                    <el-checkbox label="周四" name="周四" key="4">周四</el-checkbox>
+                                    <el-checkbox label="周五" name="周五" key="5">周五</el-checkbox>
+                                    <el-checkbox label="周六" name="周六" key="6">周六</el-checkbox>
+                                    <el-checkbox label="周日" name="周日" key="7">周日</el-checkbox>
+                                </el-checkbox-group>
+                            </el-form-item>
+                        </el-col>
+
+                    </el-row>
+                </el-form>
+                <div slot="footer" class="dialog-footer">
+                    <el-button @click="templateFormVisible = false">取消</el-button>
+                    <el-button type="primary" @click="submitTemplate()">保 存</el-button>
+                </div>
+            </el-dialog>
+        </div>
+
 
     </div>
 </template>
 
 <script>
-  import { getDictionaryDataConfig} from "@/utils/data";
-  import { getInitData,delHisAdvice,delHisProject,delHisAddition } from '@/api/his/his'
-  import { delHisPrescriptionAdviceTemplate,delHisPrescriptionProjectTemplate } from '@/api/his/his_config'
+  import { getDictionaryDataConfig } from '@/utils/data'
+  import { delHisAddition, delHisAdvice, delHisProject, getInitData } from '@/api/his/his'
+  import { delHisPrescriptionAdviceTemplate, delHisPrescriptionProjectTemplate } from '@/api/his/his_config'
 
   export default {
     props: {
       preDrugs: Array,
       activeType: Number,
-      addtions_charge:Array,
-      prescription:{
-        type:Object,
-        default: function () {
+      addtions_charge: Array,
+      prescription: {
+        type: Object,
+        default: function() {
           return {
-            name:"",
-            advices:[],
-            project:[],
-            drugways:[],
-            efs:[],
-          };
+            name: '',
+            advices: [],
+            project: [],
+            drugways: [],
+            efs: []
+          }
         }
-      },
+      }
     },
     data() {
       return {
-        advices:[],
+        week_days: [],
+
+        current_row: null,
+        current_index: 0,
+        templateFormVisible: false,
+        frequency_type: 1,
+        day_count: 0,
+        advices: [],
         tableData: [],
         newoptions: [{
           value: '1',
@@ -218,18 +323,46 @@
           label: '5'
         }],
         value: '1',
-        input: 1,
+        input: 1
       }
     },
 
-    methods:{
+    methods: {
+      submitTemplate() {
+        console.log(this.current_index)
+
+        console.log( this.prescription.project[this.current_index])
+        if (this.prescription.advices && this.prescription.advices.length > 0 && this.prescription.project && this.prescription.project.length == 0) {
+          this.prescription.advices[this.current_index].frequency_type = this.frequency_type
+          this.prescription.advices[this.current_index].day_count = this.day_count
+          this.prescription.advices[this.current_index].week_day = this.week_days.join(",")
+
+        }
+
+        if (this.prescription.advices && this.prescription.advices.length == 0 && this.prescription.project && this.prescription.project.length > 0) {
+          this.prescription.project[this.current_index].frequency_type = this.frequency_type
+          this.prescription.project[this.current_index].day_count = this.day_count
+          this.prescription.project[this.current_index].week_day =this.week_days.join(",")
+        }
+        this.templateFormVisible = false
+      },
+      handleEdit(row, index) {
+        this.current_row = row
+        this.current_index = index
+        this.frequency_type = this.current_row.frequency_type
+        this.day_count = this.current_row.day_count
+        this.week_days = this.current_row.week_day.split(",")
+        this.templateFormVisible = true
+
+
+      },
       createFilter(queryString) {
         return (restaurant) => {
           return (restaurant.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
         }
       },
       querySearch2(queryString, cb) {
-        var restaurants = this.getDictionaryDataConfig("system","project_use")
+        var restaurants = this.getDictionaryDataConfig('system', 'project_use')
         restaurants.map(item => {
           item.value = item.name
         })
@@ -237,18 +370,18 @@
         // 调用 callback 返回建议列表的数据
         cb(results)
       },
-      delAddition(index, addition){
-        this.$confirm("附加费删除后不可恢复，是否确认删除", "删除", {
-          confirmButtonText: "确 定",
-          cancelButtonText: "取 消",
-          type: "warning"
+      delAddition(index, addition) {
+        this.$confirm('附加费删除后不可恢复，是否确认删除', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
         }).then(() => {
-          this.$nextTick(function(){
-            if(addition.id == 0){
+          this.$nextTick(function() {
+            if (addition.id == 0) {
               this.prescription.addition.splice(index, 1)
-            }else{
+            } else {
               let params = {
-                'id': addition.id,
+                'id': addition.id
               }
               delHisAddition(params).then(response => {
                 if (response.data.state == 0) {
@@ -262,13 +395,14 @@
                 }
               })
             }
-          });
+          })
 
         })
-          .catch(() => {});
+          .catch(() => {
+          })
 
       },
-      getInitData(){
+      getInitData() {
         getInitData().then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -279,19 +413,19 @@
           }
         })
 
-      },deleteDrug:function(index, row){
+      }, deleteDrug: function(index, row) {
 
-        this.$confirm("药品删除后不可恢复，是否确认删除", "删除", {
-          confirmButtonText: "确 定",
-          cancelButtonText: "取 消",
-          type: "warning"
+        this.$confirm('药品删除后不可恢复，是否确认删除', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
         }).then(() => {
-          this.$nextTick(function(){
-            if(row.advice_id == 0){
+          this.$nextTick(function() {
+            if (row.advice_id == 0) {
               this.prescription.advices.splice(index, 1)
-            }else{
+            } else {
               let params = {
-                'id': row.advice_id,
+                'id': row.advice_id
               }
               delHisPrescriptionAdviceTemplate(params).then(response => {
                 if (response.data.state == 0) {
@@ -305,20 +439,15 @@
                 }
               })
 
-
             }
 
-          });
-
+          })
 
         })
-          .catch(() => {});
-
-
+          .catch(() => {
+          })
 
-
-
-      },deepClone(source) {
+      }, deepClone(source) {
         if (!source && typeof source !== 'object') {
           throw new Error('error arguments', 'shallowClone')
         }
@@ -333,7 +462,7 @@
         return targetObj
       },
 
-      setNewData:function(data){
+      setNewData: function(data) {
         this.prescription = data
 
         // this.prescription.advices = data.advices
@@ -341,41 +470,41 @@
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },
-      getGroup(id){
-        var name = ""
-        var statistics_category =  getDictionaryDataConfig('system','statistics_category')
-        console.log("2235",statistics_category)
-        for(let i=0;i<statistics_category.length;i++){
-          if(id == statistics_category[i].id){
+      getGroup(id) {
+        var name = ''
+        var statistics_category = getDictionaryDataConfig('system', 'statistics_category')
+        console.log('2235', statistics_category)
+        for (let i = 0; i < statistics_category.length; i++) {
+          if (id == statistics_category[i].id) {
             name = statistics_category[i].name
           }
         }
         return name
       },
-      deleteProject(row,i){
-        if(this.prescription.order_status == 2){
+      deleteProject(row, i) {
+        if (this.prescription.order_status == 2) {
           this.$message.error('该处方已经结算，无法删除')
           return
         }
-        this.$confirm("项目删除后不可恢复，是否确认删除", "删除", {
-          confirmButtonText: "确 定",
-          cancelButtonText: "取 消",
-          type: "warning"
+        this.$confirm('项目删除后不可恢复，是否确认删除', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
         }).then(() => {
-          if(row.id == 0){
+          if (row.id == 0) {
             this.prescription.project.splice(i, 1)
 
-          }else{
+          } else {
             let params = {
-              'id': row.id,
+              'id': row.id
             }
             delHisPrescriptionProjectTemplate(params).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
               } else {
-                for (let i = 0; i < this.prescription.project.length; i++){
-                  if(this.prescription.project[i].id == row.id){
+                for (let i = 0; i < this.prescription.project.length; i++) {
+                  if (this.prescription.project[i].id == row.id) {
                     this.prescription.project.splice(i, 1)
                   }
                 }
@@ -384,28 +513,29 @@
             })
           }
         })
-          .catch(() => {});
+          .catch(() => {
+          })
 
       },
-      getAllChange(scope){
-        if(scope.row.drug.min_unit == scope.row.single_dose_unit){
-          if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+      getAllChange(scope) {
+        if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
+          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
             console.log(1)
             scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
-          }else{
+          } else {
             console.log(12)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number) 
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number)
           }
-        }else{
-          if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+        } else {
+          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
             console.log(123)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose) 
-          }else{
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose)
+          } else {
             console.log(1234)
             scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose / scope.row.drug.min_number)
           }
         }
-        if(scope.row.prescribing_number == 0){
+        if (scope.row.prescribing_number == 0) {
           scope.row.prescribing_number = 1
         }
         // if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
@@ -419,9 +549,9 @@
         //   }
         //   // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
         // }
-        
+
       },
-      changePrescribingNumber(scope){
+      changePrescribingNumber(scope) {
         // if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
         //   if(parseInt(scope.row.prescribing_number) > scope.row.drug.total){
         //     this.$message.error(scope.row.drug_name + '库存不足')
@@ -432,29 +562,29 @@
         //   }
         // }
       },
-      getSingleDose(scope){
+      getSingleDose(scope) {
         this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
       },
-      getDay(scope){
+      getDay(scope) {
         this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
       },
-      getProjectSingleDose(scope){
+      getProjectSingleDose(scope) {
         this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
-        if(this.prescription.project[scope.$index].total == 0){
+        if (this.prescription.project[scope.$index].total == 0) {
           this.prescription.project[scope.$index].total = 1
         }
       },
-      getProjectDay(scope){
+      getProjectDay(scope) {
         this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
-        if(this.prescription.project[scope.$index].total == 0){
+        if (this.prescription.project[scope.$index].total == 0) {
           this.prescription.project[scope.$index].total = 1
         }
       }
-    },mounted(){
+    }, mounted() {
       this.getInitData()
 
     },
-    watch:{
+    watch: {
       // "prescription.advices":{
       //   handler(newVal,oldVal){
       //     newVal.map(item => {
@@ -463,7 +593,6 @@
       //         item.total = item.single_dose * item.number_days
       //       }
 
-
       //     })
       //   },
       //   deep:true
@@ -486,31 +615,37 @@
 
 <style lang="scss">
     .prescriptionTable {
-    .el-input__inner{
+
+    .el-input__inner {
         padding: 0 5px;
     }
-    .additionalBox{
+
+    .additionalBox {
         margin-top: 20px;
         display: flex;
         flex-wrap: wrap;
-    .additionalOne{
-        margin-right:20px;
-        margin-bottom:10px;
+
+    .additionalOne {
+        margin-right: 20px;
+        margin-bottom: 10px;
         display: flex;
         align-items: center;
-    >span{
+
+    > span {
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
-        width:80px;
+        width: 80px;
         display: inline-block;
         font-size: 14px;
     }
+
     }
-    .deleteIcon{
-        color:red;
-        margin-left:5px;
+    .deleteIcon {
+        color: red;
+        margin-left: 5px;
     }
+
     }
     .el-table th .cell, .el-table td .cell {
         padding: 0 2px;

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -862,12 +862,10 @@
               let obj = {
                 id: month_prescriptions[i].advices[a].drug_id,
                 price: month_prescriptions[i].advices[a].price
-
               }
               drug_ids.push(obj)
               drug_month_prescriptions.advices.push(month_prescriptions[i].advices[a])
             }
-
           } else if (month_prescriptions[i].type == 2) { //项目
             for (let a = 0; a < month_prescriptions[i].project.length; a++) {
               let obj = {
@@ -888,9 +886,7 @@
             }
             additions_ids.push(obj)
             addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
-
           }
-
         }
 
         const obj = {}
@@ -946,28 +942,23 @@
           let count = 0
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
             if (project_ids[i].price == project_month_prescriptions.project[a].price) {
-
               if (project_month_prescriptions.project[a].type == 2) {
                 obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
                 obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
                 obj['project_name'] = project_month_prescriptions.project[a].project.project_name
                 obj['project'] =  project_month_prescriptions.project[a].project
 
-
               } else if (project_month_prescriptions.project[a].type == 3) {
                 obj['statistical_classification'] = ''
                 obj['medical_code'] = project_month_prescriptions.project[a].good_info.medical_insurance_number
                 obj['project_name'] = project_month_prescriptions.project[a].good_info.good_name
                 obj['good_info'] =  project_month_prescriptions.project[a].good_info
-
-
               }
 
               // obj['project_name'] = project_month_prescriptions.project[a].project.project_name
               // obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
               obj['single_dose'] = project_month_prescriptions.project[a].single_dose
               obj['type'] = project_month_prescriptions.project[a].type
-
               obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way
               obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency
               obj['number_days'] = project_month_prescriptions.project[a].day
@@ -1317,6 +1308,19 @@
 
             return false
           } else {
+            if(response.data.data.sch_prescriptions== null){
+
+              response.data.data.sch_prescriptions = []
+            }
+            for(let i = 0;i < response.data.data.sch_prescriptions.length; i++){
+              if(response.data.data.sch_prescriptions[i].advices == null){
+                response.data.data.sch_prescriptions[i].advices = []
+              }
+              if(response.data.data.sch_prescriptions[i].project == null){
+                response.data.data.sch_prescriptions[i].project = []
+              }
+            }
+
             this.patientid = val.id
             this.isloading = false
 
@@ -1705,6 +1709,20 @@
                   this.$message.error(response.data.msg)
                   return false
                 } else {
+                  if(response.data.data.sch_prescriptions== null){
+
+                    response.data.data.sch_prescriptions = []
+                  }
+                  for(let i = 0;i < response.data.data.sch_prescriptions.length; i++){
+                    if(response.data.data.sch_prescriptions[i].advices == null){
+                      response.data.data.sch_prescriptions[i].advices = []
+                    }
+
+                    if(response.data.data.sch_prescriptions[i].project == null){
+                      response.data.data.sch_prescriptions[i].project = []
+                    }
+
+                  }
                   this.prescriptions = []
 
                   this.month_prescriptions = []
@@ -2189,6 +2207,20 @@
                   this.$message.error(response.data.msg)
                   return false
                 } else {
+                  if(response.data.data.sch_prescriptions== null){
+
+                    response.data.data.sch_prescriptions = []
+                  }
+                  for(let i = 0;i < response.data.data.sch_prescriptions.length; i++){
+                    if(response.data.data.sch_prescriptions[i].advices == null){
+                      response.data.data.sch_prescriptions[i].advices = []
+                    }
+
+                    if(response.data.data.sch_prescriptions[i].project == null){
+                      response.data.data.sch_prescriptions[i].project = []
+                    }
+
+                  }
                   this.prescriptions = []
 
                   this.month_prescriptions = []
@@ -2652,6 +2684,20 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
+                if(response.data.data.sch_prescriptions== null){
+
+                  response.data.data.sch_prescriptions = []
+                }
+                for(let i = 0;i < response.data.data.sch_prescriptions.length; i++){
+                  if(response.data.data.sch_prescriptions[i].advices == null){
+                    response.data.data.sch_prescriptions[i].advices = []
+                  }
+
+                  if(response.data.data.sch_prescriptions[i].project == null){
+                    response.data.data.sch_prescriptions[i].project = []
+                  }
+
+                }
                 this.prescriptions = []
 
                 this.month_prescriptions = []
@@ -3173,6 +3219,20 @@
                   this.$message.error(response.data.msg)
                   return false
                 } else {
+                  if(response.data.data.sch_prescriptions== null){
+
+                    response.data.data.sch_prescriptions = []
+                  }
+                  for(let i = 0;i < response.data.data.sch_prescriptions.length; i++){
+                    if(response.data.data.sch_prescriptions[i].advices == null){
+                      response.data.data.sch_prescriptions[i].advices = []
+                    }
+
+                    if(response.data.data.sch_prescriptions[i].project == null){
+                      response.data.data.sch_prescriptions[i].project = []
+                    }
+
+                  }
                   for (let i = 0; i < this.all_data.length; i++) {
                     if (this.all_data[i].id == val.id) {
                       this.oldCurrentRow = this.all_data[i]
@@ -3731,6 +3791,20 @@
                   this.$message.error(response.data.msg)
                   return false
                 } else {
+                  if(response.data.data.sch_prescriptions== null){
+
+                    response.data.data.sch_prescriptions = []
+                  }
+                  for(let i = 0;i < response.data.data.sch_prescriptions.length; i++){
+                    if(response.data.data.sch_prescriptions[i].advices == null){
+                      response.data.data.sch_prescriptions[i].advices = []
+                    }
+
+                    if(response.data.data.sch_prescriptions[i].project == null){
+                      response.data.data.sch_prescriptions[i].project = []
+                    }
+
+                  }
                   this.prescriptions = []
 
                   this.month_prescriptions = []

src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue

@@ -92,10 +92,11 @@
         data: [],
         all_data:[],
         page: 1,
-        limit: 10,
+        limit: 20,
         patient_id: 0,
         total:0,
-        patient_name:''
+        patient_name:'',
+        mode_str:"",
       }
     },
     methods: {
@@ -133,7 +134,7 @@
         })
       },
       jumpDetail(row) {
-        this.$router.push('/outpatientDoctorStation/prescriptionTemplatedetail?id=' + row.id + '&patient_id=' + this.patient_id + '&patient_name=' + this.patient_name)
+        this.$router.push('/outpatientDoctorStation/prescriptionTemplatedetail?id=' + row.id + '&patient_id=' + this.patient_id + '&patient_name=' + this.patient_name +"&modes="+this.mode_str)
       },
       getMode(id) {
         let name = ''
@@ -162,6 +163,12 @@
         getPrescriptionTemplateList(params).then(response => {
           if (response.data.state == 1) {
             this.templates = response.data.data.list
+            let modes = []
+            for(let i =0; i< this.templates.length; i++){
+              modes.push(this.templates[i].mode)
+            }
+            this.mode_str = modes.join(",")
+
             this.total = response.data.data.total
           }
         })
@@ -180,6 +187,12 @@
         getPrescriptionTemplateList(params).then(response => {
           if (response.data.state == 1) {
             this.templates = response.data.data.list
+            let modes = []
+            for(let i =0; i< this.templates.length; i++){
+              modes.push(this.templates[i].mode)
+            }
+            this.mode_str = modes.join(",")
+
             this.total = response.data.data.total
           }
         })
@@ -210,7 +223,7 @@
           this.$message.error('请选择病人')
           return
         }
-        this.$router.push('/outpatientDoctorStation/prescriptionTemplatedetail?id=' + 0 + '&patient_id=' + this.patient_id+ '&patient_name=' + this.patient_name)
+        this.$router.push('/outpatientDoctorStation/prescriptionTemplatedetail?id=' + 0 + '&patient_id=' + this.patient_id+ '&patient_name=' + this.patient_name+"&modes="+this.mode_str)
 
       }
     },

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -16,7 +16,8 @@
                         </el-form-item>
 
                         <el-form-item label="透析模式: " prop="mode_id" label-position="right">
-                            <el-select v-model="tempForm.mode_id" style="width:100%;" placeholder="请选择">
+                            <el-select v-model="tempForm.mode_id" style="width:100%;" placeholder="请选择"
+                                       :disabled="this.$route.query.id > 0 ?true:false" v-if="this.$route.query.id == 0">
                                 <el-option
                                         v-for="item in modeOptions"
                                         :key="item.id"
@@ -24,6 +25,15 @@
                                         :value="item.id"
                                 ></el-option>
                             </el-select>
+                            <el-select v-model="tempForm.mode_id" style="width:100%;" placeholder="请选择"
+                                       :disabled="this.$route.query.id > 0 ?true:false" v-if="this.$route.query.id > 0">
+                                <el-option
+                                        v-for="item in modeOptionsTwo"
+                                        :key="item.id"
+                                        :label="item.name"
+                                        :value="item.id"
+                                ></el-option>
+                            </el-select>
                         </el-form-item>
                     </el-form>
                     <div class="tabsBox">
@@ -239,6 +249,7 @@
   import { uParseTime } from '@/utils/tools'
   import PrescriptionTemplateTable from './components/prescriptionTemplateTable'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
+
   const moment = require('moment')
   export default {
     props: {
@@ -281,7 +292,7 @@
           { value: 11, label: '普通门诊' },
           // { value: 12, label: '门诊挂号' },
           // { value: 13, label: '急诊' },
-          { value: 14, label: '门诊特殊病' },
+          { value: 14, label: '门诊特殊病' }
           // { value: 15, label: '门诊统筹' },
           // { value: 16, label: '门诊慢性病' },
           // { value: 21, label: '普通住院' }
@@ -296,7 +307,9 @@
           name: '',
           mode_id: ''
         },
-        modeOptions: this.$store.getters.treatment_mode,
+        modeOptions:{},
+        modeOptionsTwo: {},
+
         start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
         end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
         isLastOrNextVisible: false,
@@ -400,34 +413,28 @@
           }
         }
 
-
         for (let i = 0; i < this.prescriptions.length; i++) {
-          for(let b = 0; b < this.prescriptions[i].advices.length; b++){
+          for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
             if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].advices[b].drug.is_special_diseases != 1) {
-              this.$message.error("处方" + (i+1).toString() +"属于特病类型处方，开非特病类型的药")
+              this.$message.error('处方' + (i + 1).toString() + '属于特病类型处方，开非特病类型的药')
               return
             }
 
           }
 
-          for(let c = 0; c < this.prescriptions[i].project.length; c++){
-            if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].project[c].type == 2  && this.prescriptions[i].project[c].project.disease_directory != 1) {
-              this.$message.error("处方" + (i+1).toString() +"属于特病类型处方，请开特病类型的项目")
+          for (let c = 0; c < this.prescriptions[i].project.length; c++) {
+            if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].project[c].type == 2 && this.prescriptions[i].project[c].project.disease_directory != 1) {
+              this.$message.error('处方' + (i + 1).toString() + '属于特病类型处方，请开特病类型的项目')
               return
             }
 
-            if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].project[c].type == 3  && this.prescriptions[i].project[c].good_info.is_special_diseases != 1) {
-              this.$message.error("处方" + (i+1).toString() +"属于特病类型处方，请开特病类型的耗材")
-              return　
+            if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].project[c].type == 3 && this.prescriptions[i].project[c].good_info.is_special_diseases != 1) {
+              this.$message.error('处方' + (i + 1).toString() + '属于特病类型处方，请开特病类型的耗材')
+              return
             }
           }
         }
 
-
-
-
-
-
         let params = {
           name: this.tempForm.name,
           mode_id: this.tempForm.mode_id,
@@ -452,6 +459,11 @@
             this.prescriptions[i].advices[b].prescribing_number = this.prescriptions[i].advices[b].prescribing_number.toString()
             this.prescriptions[i].advices[b].retail_price = this.prescriptions[i].advices[b].retail_price.toString()
             this.prescriptions[i].advices[b].day = parseInt(this.prescriptions[i].advices[b].day)
+            this.prescriptions[i].advices[b].groupno = parseInt(this.prescriptions[i].advices[b].groupno)
+
+            this.prescriptions[i].advices[b].day_count = parseInt(this.prescriptions[i].advices[b].day_count)
+            this.prescriptions[i].advices[b].frequency_type = parseInt(this.prescriptions[i].advices[b].frequency_type)
+            this.prescriptions[i].advices[b].week_day = this.prescriptions[i].advices[b].week_day.toString()
 
           }
 
@@ -459,6 +471,11 @@
             this.prescriptions[i].project[b].price = this.prescriptions[i].project[b].price.toString()
             this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
             this.prescriptions[i].project[b].delivery_way = this.prescriptions[i].project[b].delivery_way.toString()
+
+            this.prescriptions[i].project[b].day_count = parseInt(this.prescriptions[i].project[b].day_count)
+            this.prescriptions[i].project[b].frequency_type = parseInt(this.prescriptions[i].project[b].frequency_type)
+            this.prescriptions[i].project[b].week_day = this.prescriptions[i].project[b].week_day.toString()
+
           }
         }
         let data = {
@@ -467,6 +484,11 @@
         createdTemplate(params, data).then(response => {
           if (response.data.state == 1) {
             this.$message.success('保存成功')
+            for (const mkey in this.modeOptions) {
+              if (mkey == this.tempForm.mode_id) {
+                delete this.modeOptions[mkey]
+              }
+            }
           } else {
             this.$message.error(response.data.msg)
           }
@@ -931,6 +953,10 @@
                 this.prescriptions[i].advices[b].retail_price = this.prescriptions[i].advices[b].retail_price.toString()
                 this.prescriptions[i].advices[b].day = parseInt(this.prescriptions[i].advices[b].day)
 
+                this.prescriptions[i].advices[b].day_count = parseInt(this.prescriptions[i].advices[b].day_count)
+                this.prescriptions[i].advices[b].frequency_type = parseInt(this.prescriptions[i].advices[b].frequency_type)
+                this.prescriptions[i].advices[b].week_day = this.prescriptions[i].advices[b].week_day.toString()
+
               }
 
               for (let b = 0; b < this.prescriptions[i].project.length; b++) {
@@ -938,6 +964,10 @@
                 this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
                 this.prescriptions[i].project[b].delivery_way = this.prescriptions[i].project[b].delivery_way.toString()
 
+                this.prescriptions[i].project[b].day_count = parseInt(this.prescriptions[i].project[b].day_count)
+                this.prescriptions[i].project[b].frequency_type = parseInt(this.prescriptions[i].project[b].frequency_type)
+                this.prescriptions[i].project[b].week_day = this.prescriptions[i].project[b].week_day.toString()
+
               }
 
               for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
@@ -1087,11 +1117,7 @@
 
         }
 
-
-
-          obj.med_type = 14
-
-
+        obj.med_type = 14
 
         this.prescriptions.push(obj)
 
@@ -1305,30 +1331,30 @@
         //   this.$refs.multipleTable.clearSelection()
         //   return
         // }
-      //  if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
-      //     if (this.$store.getters.xt_user.org_id == 10138) {
-      //       for (let i = 0; i < this.curDrugs.length; i++) {
-      //         if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
-      //           this.$message.error('该处方属于特病类型处方，开非特病类型的药')
-      //           return
-      //         }
-
-      //       }
-      //     }
-      //   }
-
-      //   if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
-      //     if (this.$store.getters.xt_user.org_id == 10138) {
-      //       for (let i = 0; i < this.curDrugs.length; i++) {
-      //         if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
-      //           this.$message.error('该处方属于特病类型处方，开非特病类型的药')
-      //           return
-      //         }
-
-      //       }
-      //     }
-      //   }
-      if (this.curDrugs.length > 0) {
+        //  if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
+        //     if (this.$store.getters.xt_user.org_id == 10138) {
+        //       for (let i = 0; i < this.curDrugs.length; i++) {
+        //         if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
+        //           this.$message.error('该处方属于特病类型处方，开非特病类型的药')
+        //           return
+        //         }
+
+        //       }
+        //     }
+        //   }
+
+        //   if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
+        //     if (this.$store.getters.xt_user.org_id == 10138) {
+        //       for (let i = 0; i < this.curDrugs.length; i++) {
+        //         if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
+        //           this.$message.error('该处方属于特病类型处方，开非特病类型的药')
+        //           return
+        //         }
+
+        //       }
+        //     }
+        //   }
+        if (this.curDrugs.length > 0) {
           for (let i = 0; i < this.curDrugs.length; i++) {
             if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
               this.$message.error('该处方属于特病类型处方，开非特病类型的药')
@@ -1351,18 +1377,16 @@
           let arr = this.teamList
           let newArr = []
           arr.map(item => {
-            if(this.curPrescriptions.med_type != 14){
+            if (this.curPrescriptions.med_type != 14) {
               newArr.push(item)
             }
-            if(this.curPrescriptions.med_type == 14 && item.is_special_diseases == 1){
+            if (this.curPrescriptions.med_type == 14 && item.is_special_diseases == 1) {
               newArr.push(item)
             }
           })
           this.teamList = newArr
         }
 
-
-
         if (this.curDrugs.length == 0) {
           for (let i = 0; i < this.curDrugs.length; i++) {
             if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
@@ -1399,7 +1423,6 @@
           }
         }
 
-
         for (let i = 0; i < this.curDrugs.length; i++) {
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
             if (this.curDrugs[i].id == this.curPrescriptions.advices[a].id) {
@@ -1461,8 +1484,15 @@
               this.curStatus = 1
             }
 
+            let index = 0
+
+            if (this.prescriptions[i].advices.length > 0) {
+              index = this.prescriptions[i].advices.length
+            }
+
             if (temp.length > 0) {
               for (let b = 0; b < temp.length; b++) {
+                let temp_index = b + 1
                 let obj = {
                   advice_id: 0,
                   id: temp[b].id,
@@ -1477,7 +1507,11 @@
                   single_dose_unit: temp[b].dose_unit,
                   prescribing_number_unit: temp[b].prescribing_number_unit,
                   medical_insurance_number: temp[b].medical_insurance_number,
-                  drug: temp[b]
+                  drug: temp[b],
+                  groupno: index + temp_index,
+                  frequency_type: 1,
+                  day_count: 0,
+                  week_day: ''
                 }
 
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
@@ -1488,17 +1522,6 @@
               this.curStatus = 1
             }
 
-            // if(this.activeName == 2){
-            //
-            //    for(let i = 0; i<temp2.length;i++){
-            //     for(let j=0;j<this.hisList.length;j++){
-            //         if(temp2[i].id == this.hisList[j].project_id){
-            //            temp2[i].total =  this.hisList[j].number
-            //         }
-            //     }
-            //    }
-            //  }
-
             if (temp2.length > 0) {
               for (let b = 0; b < temp2.length; b++) {
                 let obj = {
@@ -1516,11 +1539,14 @@
                   medical_code: temp2[b].medical_code,
                   unit: temp2[b].unit,
                   type: temp2[b].type,
+                  frequency_type: 1,
+                  day_count: 0,
+                  week_day: ''
                 }
-                if (temp2[b].type == 2){
+                if (temp2[b].type == 2) {
                   obj['project'] = temp2[b].project
 
-                }else if(temp2[b].type == 3){
+                } else if (temp2[b].type == 3) {
 
                   obj['good_info'] = temp2[b].good_info
 
@@ -1591,7 +1617,12 @@
                     prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                     medical_insurance_number: prescription.advices[b].med_list_codg,
                     id: prescription.advices[b].drug_id,
-                    drug: prescription.advices[b].drug
+                    drug: prescription.advices[b].drug,
+                    groupno: prescription.advices[b].groupno,
+                    frequency_type: prescription.advices[b].frequency_type,
+                    day_count: prescription.advices[b].day_count,
+                    week_day: prescription.advices[b].week_day
+
                   }
                   tempAdvice.push(obj)
                 }
@@ -1613,6 +1644,10 @@
                     medical_code: prescription.project[b].project.medical_code,
                     unit: prescription.project[b].project.unit,
                     type: prescription.project[b].type,
+                    frequency_type: prescription.project[b].frequency_type,
+                    day_count: prescription.project[b].day_count,
+                    week_day: prescription.project[b].week_day
+
                   }
 
                   if (prescription.project[b].type == 2) {
@@ -1621,9 +1656,6 @@
                     obj['project_name'] = prescription.project[b].project.project_name
                     obj['project'] = prescription.project[b].project
 
-
-
-
                   } else if (prescription.project[b].type == 3) {
                     obj['statistical_classification'] = ''
                     obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
@@ -1671,10 +1703,7 @@
                 med_type: ''
               }
 
-
-                obj.med_type = 14
-
-
+              obj.med_type = 14
 
               this.prescriptions.push(obj)
               this.curPrescriptions = this.prescriptions[0]
@@ -1704,7 +1733,7 @@
                 unit: project[i].unit,
                 type: 2,
                 is_special_diseases: project[i].disease_directory,
-                project: project[i],
+                project: project[i]
               }
 
               this.tabProject.push(obj)
@@ -1726,7 +1755,7 @@
                 unit: this.getGoodUnit(good_info[i].good_unit),
                 type: 3,
                 is_special_diseases: good_info[i].is_special_diseases,
-                good_info: good_info[i],
+                good_info: good_info[i]
               }
               this.tabProject.push(obj)
             }
@@ -1820,7 +1849,7 @@
                   unit: project[i].project.unit,
                   type: project[i].type,
                   is_special_diseases: project[i].project.disease_directory,
-                  project:project[i].project,
+                  project: project[i].project
                 }
                 if (obj.total == 0 || obj.total == undefined) {
                   obj.total = 1
@@ -1843,7 +1872,7 @@
                   unit: project[i].good_info.unit,
                   type: project[i].type,
                   is_special_diseases: project[i].good_info.is_special_diseases,
-                  good_info:project[i].good_info,
+                  good_info: project[i].good_info
                 }
                 if (obj.total == 0 || obj.total == undefined) {
                   obj.total = 1
@@ -1889,6 +1918,25 @@
         this.$refs.tabProjectTeam.clearSelection()
       }
     }, created() {
+      for(let key in this.$store.getters.treatment_mode){
+        this.modeOptions[key] = this.$store.getters.treatment_mode[key]
+        this.modeOptionsTwo[key]=  this.$store.getters.treatment_mode[key]
+
+      }
+      var modes = this.$route.query.modes.split(',')
+      console.log('~~~~~~~~~~')
+
+      console.log(modes)
+
+      for (const mkey in this.modeOptions) {
+        console.log(mkey)
+        for (let b = 0; b < modes.length; b++) {
+          if (mkey == parseInt(modes[b])) {
+            delete this.modeOptions[mkey]
+          }
+        }
+      }
+
       this.getPrescriptionTemplateInfo()
       this.getInitData()
       //获取所有项目

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

@@ -8,7 +8,7 @@
                 <span v-if="patient.gender == 1">男</span>
                 <span v-if="patient.gender == 2">女</span>
             </div>
-            <div>年龄：{{patient.age?patient.age:''}}岁</div>
+            <div>年龄：{{getAge(patient)?getAge(patient):""}}岁</div>
         </div>
         <div class="infoTitle">
             <div>婚姻状况：
@@ -105,6 +105,7 @@
 </div>
 </template>
 <script>
+  import { jsGetAge, uParseTime } from '@/utils/tools'
 
 import { getDataConfig } from "@/utils/data";
 import { getAllDoctorList,getPatientCaseHistory } from "@/api/project/project"
@@ -122,11 +123,28 @@ export default {
             orgname:'',
             history:{},
             printDate:''
-        }                   
+        }
     },
     methods:{
+      getAge(patient){
+        var thisLen = patient.id_card_no.length
+        var birth = ''
+        if (thisLen == 15) {
+          birth = '19' + patient.id_card_no.substr(6, 6)
+        } else {
+          birth = patient.id_card_no.substr(6, 8)
+        }
+        var births =
+          birth.substr(0, 4) +
+          '-' +
+          birth.substr(4, 2) +
+          '-' +
+          birth.substr(6, 2)
+        return jsGetAge(births, '-')
+
+      },
       show(val){
-       
+
         this.patientid = val
         this.getAllDoctorList()
         this.getPatientCaseHistory()
@@ -150,7 +168,7 @@ export default {
                console.log("department",department)
                this.departmentList = department
              }
-           })   
+           })
        },
       getDoctor(id){
         var name = ""
@@ -182,7 +200,7 @@ export default {
       })
     },
     getDeparment(id){
-  
+
      var name = ''
      for(let i=0;i<this.departmentList.length;i++){
          if(id == this.departmentList[i].id){
@@ -191,7 +209,7 @@ export default {
       }
       return name
     },
-  
+
 
     },
     created(){
@@ -218,7 +236,7 @@ export default {
 <style lang="scss" scoped>
 .prescription-print{
     -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     margin-bottom: 20px;
     padding:20px 10px;

src/xt_pages/outpatientDoctorStation/template/printFour.vue

@@ -9,7 +9,7 @@
                 <span v-if="item.patient.gender == 1">男</span>
                 <span v-if="item.patient.gender == 2">女</span>
               </p>
-              <p>年龄：{{item.patient.age?item.patient.age:""}}岁</p>
+              <p>年龄：{{getAge(item.patient)?getAge(item.patient):""}}岁</p>
           </div>
           <div class="infoMain">
               <div style="margin-bottom: 10px;">门诊号：{{hisPatient.number?hisPatient.number:""}}</div>
@@ -29,7 +29,7 @@
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
                </div>
-               
+
               <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
                   <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{getProjectName(it.project_id)?getProjectName(it.project_id):""}}&nbsp;&nbsp;<span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
                   <div style="margin-left:100px;"><span>{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</span></div>
@@ -60,10 +60,10 @@
           <div style="page-break-after:always"></div>
       </div>
     </div>
-    
+
   </div>
 
-    
+
 </template>
 <script>
 import { jsGetAge, uParseTime } from '@/utils/tools'
@@ -75,7 +75,7 @@ export default {
       record_date:String,
       prescription_id:Number,
       ids:String
-    }, 
+    },
     data(){
       return {
         doctorList:[],
@@ -92,15 +92,32 @@ export default {
       }
     },
    methods:{
-     
+     getAge(patient){
+       var thisLen = patient.id_card_no.length
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + patient.id_card_no.substr(6, 6)
+       } else {
+         birth = patient.id_card_no.substr(6, 8)
+       }
+       var births =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+        return jsGetAge(births, '-')
+
+     },
+
      getAllDoctorList(){
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
 
       getDoctor(id){
@@ -194,7 +211,7 @@ export default {
             }
               addtotal =  Math.floor(addtotal * 100) / 100
         }
-       
+
        }
 
       for (let i = 0; i < this.prescriptions.length; i++) {
@@ -204,7 +221,7 @@ export default {
                 total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
               }
             }
-          
+
             if (this.prescriptions[i].additionalcharge != null) {
               for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
                 addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
@@ -216,7 +233,7 @@ export default {
 
         return total + addtotal
       },
-      
+
      getProjectName(id){
         var project_name = ""
         for(let i=0;i<this.projectList.length;i++){
@@ -245,7 +262,7 @@ export default {
       this.getHisPatientDetail()
       var xtuser = this.$store.getters.xt_user;
       this.orgname = xtuser.org.org_name;
-     
+
    },
    watch:{
      ids:function(val){
@@ -260,7 +277,7 @@ export default {
 <style lang="scss" scoped>
 .prescription-print{
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     margin-bottom: 20px;
     padding:20px 10px;
@@ -320,7 +337,7 @@ export default {
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -9,7 +9,7 @@
                 <span v-if="item.patient.gender == 1">男</span>
                 <span v-if="item.patient.gender == 2">女</span>
               </p>
-              <p>年龄：{{item.patient.age?item.patient.age:""}}岁</p>
+              <p>年龄：{{getAge(item.patient)?getAge(item.patient):""}}岁</p>
           </div>
           <div class="infoMain">
               <div style="margin-bottom: 10px;">门诊号：{{hisPatient.number?hisPatient.number:""}}</div>
@@ -92,6 +92,23 @@ export default {
       }
     },
    methods:{
+     getAge(patient){
+       var thisLen = patient.id_card_no.length
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + patient.id_card_no.substr(6, 6)
+       } else {
+         birth = patient.id_card_no.substr(6, 8)
+       }
+       var births =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+       return jsGetAge(births, '-')
+
+     },
 
      getAllDoctorList(){
       getAllDoctorList().then(response=>{

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -22,7 +22,7 @@
                 <span v-if="item.patient.gender == 1">男</span>
                 <span v-if="item.patient.gender == 2">女</span>
               </div>
-              <div>年龄：{{item.patient.age?item.patient.age:""}}岁</div>
+              <div>年龄：{{getAge(item.patient)?getAge(item.patient):""}}岁</div>
           </div>
           <div class="infoMain">
               <div style="margin-bottom: 10px;display:flex;">门诊号码：<span class="under_line" v-if="hisPatient.number">{{hisPatient.number?hisPatient.number:""}}</span></div>
@@ -45,7 +45,7 @@
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
               </div>
-              
+
               <!-- <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
                   <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{ it.type == 2 ? it.project.project_name : it.good_info.good_name }}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
                   <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
@@ -86,10 +86,10 @@
           <div style="page-break-after:always"></div>
       </div>
     </div>
-    
+
   </div>
 </div>
-    
+
 </template>
 <script>
 import { jsGetAge, uParseTime } from '@/utils/tools'
@@ -101,7 +101,7 @@ export default {
       record_date:String,
       prescription_id:Number,
       ids:String
-    }, 
+    },
     data(){
       return {
         doctorList:[],
@@ -120,15 +120,32 @@ export default {
       }
     },
    methods:{
-     
+     getAge(patient){
+       var thisLen = patient.id_card_no.length
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + patient.id_card_no.substr(6, 6)
+       } else {
+         birth = patient.id_card_no.substr(6, 8)
+       }
+       var births =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+       return jsGetAge(births, '-')
+
+     },
+
      getAllDoctorList(){
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
 
       getDoctor(id){
@@ -171,11 +188,11 @@ export default {
             var projectlist =  response.data.data.projectlist
             console.log("所有项目列表",projectlist)
             this.projectList = projectlist
-            
+
             let outputlist1Name = response.data.data.his.patient_info ? JSON.parse(response.data.data.his.patient_info) : {};
             this.faber = outputlist1Name
 
-            
+
           }
        })
      },
@@ -228,7 +245,7 @@ export default {
             }
               addtotal =  Math.floor(addtotal * 100) / 100
         }
-       
+
        }
 
       for (let i = 0; i < this.prescriptions.length; i++) {
@@ -238,7 +255,7 @@ export default {
                 total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
               }
             }
-          
+
             if (this.prescriptions[i].additionalcharge != null) {
               for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
                 addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
@@ -250,7 +267,7 @@ export default {
 
         return total + addtotal
       },
-      
+
      getProjectName(id){
         var project_name = ""
         for(let i=0;i<this.projectList.length;i++){
@@ -271,7 +288,7 @@ export default {
           // if(id == this.diagnoses[i].id){
           //    name = this.diagnoses[i].class_name
           // }
-          
+
           if(newIds.indexOf(this.diagnoses[i].id.toString()) > -1){
             // name += diagnoses[i].class_name + ' '
             nameArr.push(this.diagnoses[i].class_name)
@@ -281,7 +298,7 @@ export default {
         nameArr.map((item,index) => {
           if(item == '尿毒症'){
             newNameArr.push(item)
-            nameArr.splice(index,1,'') 
+            nameArr.splice(index,1,'')
           }
         })
         newNameArr.push(...nameArr)
@@ -305,7 +322,7 @@ export default {
             this.page = 1
             arr.push(item.advices.length)
             item.pageArr.push(arr)
-            
+
           }else if(item.advices.length > 5){
             this.page = parseInt(item.advices.length / 5)
             let num = item.advices.length % 5
@@ -398,11 +415,11 @@ export default {
       this.getPrescriptionPrint()
       this.getAllDoctorList()
       this.getInitData()
-      
+
       this.getHisPatientDetail()
       var xtuser = this.$store.getters.xt_user;
       this.orgname = xtuser.org.org_name;
-     
+
    },
    watch:{
      ids:function(val){
@@ -418,7 +435,7 @@ export default {
 <style lang="scss" scoped>
 .prescription-print{
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     margin-bottom: 20px;
     padding:20px 10px;
@@ -476,7 +493,7 @@ export default {
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/outpatientDoctorStation/template/printTwo.vue

@@ -7,7 +7,7 @@
                <span v-if="patient.gender == 1">男</span>
                <span v-if="patient.gender == 2">女</span>
             </p>
-            <p>年龄：{{patient.age}}岁</p>
+            <p>年龄：{{getAge(item.patient)?getAge(item.patient):""}}岁</p>
         </div>
         <div class="infoMain">
             <div style="margin-bottom: 10px;">门诊号：{{this.hisPatient.number?this.hisPatient.number:""}}</div>
@@ -24,7 +24,7 @@
                 <div style="margin-left:100px;"><span>用法：{{item.single_dose}}{{item.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{item.execution_frequency}}</span>&nbsp;&nbsp;<span>{{item.advice_desc}}</span></div>
             </div>
 
-            
+
         </div>
         <div class="doctorBox">
             <p>医师：{{getDoctor(advicePrint[0].advice_doctor)?getDoctor(advicePrint[0].advice_doctor):""}}</p>
@@ -48,7 +48,7 @@ export default {
       patient_id:Number,
       record_date:String,
       prescription_id:Number
-    }, 
+    },
     data(){
       return {
         doctorList:[],
@@ -62,15 +62,32 @@ export default {
       }
     },
    methods:{
-     
+     getAge(patient){
+       var thisLen = patient.id_card_no.length
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + patient.id_card_no.substr(6, 6)
+       } else {
+         birth = patient.id_card_no.substr(6, 8)
+       }
+       var births =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+       return jsGetAge(births, '-')
+
+     },
+
      getAllDoctorList(){
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
 
       getDoctor(id){
@@ -104,7 +121,7 @@ export default {
             console.log("patient",patient)
             this.patient = patient
             var doctorPorject = response.data.data.doctorPorject
-          
+
             var arr = doctorPorject.project
               console.log("我的中谷歌",arr)
             for(let i=0;i<arr.length;i++){
@@ -134,7 +151,7 @@ export default {
        getInitData().then(response=>{
           if(response.data.state == 1){
             this.department = response.data.data.department
-           
+
           }
        })
      },
@@ -221,7 +238,7 @@ export default {
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -28,7 +28,7 @@
                     <span v-if="item.patient.gender == 2">女</span>
                 </div>
                 <div style="margin-bottom: 10px;width:25%">年龄：
-                    <span>{{item.patient.age}}</span>
+                    <span>{{getAge(item.patient)?getAge(item.patient):""}}</span>
                 </div>
                 <div style="margin-bottom: 10px;width:25%">参保类型：{{hisPatient.social_type?hisPatient.social_type:''}}
                 </div>
@@ -257,6 +257,23 @@
       }
     },
     methods: {
+      getAge(patient){
+        var thisLen = patient.id_card_no.length
+        var birth = ''
+        if (thisLen == 15) {
+          birth = '19' + patient.id_card_no.substr(6, 6)
+        } else {
+          birth = patient.id_card_no.substr(6, 8)
+        }
+        var births =
+          birth.substr(0, 4) +
+          '-' +
+          birth.substr(4, 2) +
+          '-' +
+          birth.substr(6, 2)
+        return jsGetAge(births, '-')
+
+      },
       printThisPage() {
         var ptime = Math.round(new Date().getTime() / 1000)
         this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -20,7 +20,7 @@
             <span v-if="item.patient.gender == 1">男</span>
             <span v-if="item.patient.gender == 2">女</span>
             </div>
-            <div>年龄：{{item.patient.age?item.patient.age:""}}岁</div>
+            <div>年龄：{{getAge(item.patient)?getAge(item.patient):""}}岁</div>
         </div>
         <div class="infoMain">
             <div style="margin-bottom: 10px;display:flex;">门诊号码：<span class="under_line">{{hisPatient.number?hisPatient.number:""}}</span></div>
@@ -238,6 +238,23 @@ export default {
       }
     },
    methods:{
+     getAge(patient){
+       var thisLen = patient.id_card_no.length
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + patient.id_card_no.substr(6, 6)
+       } else {
+         birth = patient.id_card_no.substr(6, 8)
+       }
+       var births =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+       return jsGetAge(births, '-')
+
+     },
      printThisPage() {
       var ptime = Math.round(new Date().getTime() / 1000);
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
@@ -398,14 +415,14 @@ export default {
         let newIds = ids.split(',').sort(function(a,b){
           return a-b;
         })
-        
+
         var name = ""
         let nameArr = []
         for(let i=0;i<this.diagnoses.length;i++){
           // if(id == this.diagnoses[i].id){
           //    name = this.diagnoses[i].class_name
           // }
-          
+
           if(newIds.indexOf(this.diagnoses[i].id.toString()) > -1){
             // name += diagnoses[i].class_name + ' '
             nameArr.push(this.diagnoses[i].class_name)
@@ -415,7 +432,7 @@ export default {
         nameArr.map((item,index) => {
           if(item == '尿毒症'){
             newNameArr.push(item)
-            nameArr.splice(index,1,'') 
+            nameArr.splice(index,1,'')
           }
         })
         newNameArr.push(...nameArr)
@@ -528,7 +545,7 @@ export default {
 <style lang="scss" scoped>
 .prescription-print{
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     margin-bottom: 20px;
     padding:20px 10px;
@@ -586,7 +603,7 @@ export default {
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }