云雀医后管新增字段

.env.development.local

@@ -17,4 +17,4 @@ VUE_APP_IS_LOCAL=true
 VUE_APP_APPID=wxf4e66242d31c81c2
 
 #本地token
-VUE_APP_TOKEN=03C47CD06EA14ADD8C5CB22332E88607
+VUE_APP_TOKEN=94F2E2E006D74C6EB5CCFC15F67DE31A

package.json

@@ -40,7 +40,7 @@
     "socket.io-client": "2.2.0",
     "storejs": "^1.1.0",
     "vant": "^2.12.27",
-    "vconsole": "^3.3.4",
+    "vconsole": "^3.15.1",
     "vue": "^2.6.11",
     "vue-fragment": "^1.5.1",
     "vue-router": "^3.3.1",
@@ -50,7 +50,7 @@
   "devDependencies": {
     "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
     "@pica-cli/pica-cli-framework": "^1.0.10",
-    "@pica-cli/vue-cli-plugin-pica-cli-plugin": "1.1.5",
+    "@pica-cli/vue-cli-plugin-pica-cli-plugin": "~1.1.64",
     "@pica-core/multiple-versions-plugin": "^1.0.16",
     "@pica-core/reset-pathfile-plugin": "^1.0.16",
     "@pica-core/web-buried-point": "^1.0.15",

src/api/diagnosis.js

@@ -331,3 +331,9 @@ export const savePCDayCount = async (data) => {
     method: 'post',
   });
 };
+export const personnelList = async () => {
+  return request({
+    url: '/contents/admin/homepage/floor/personnelList',
+    method: 'get',
+  });
+};

src/styles/global.scss

@@ -6,6 +6,9 @@
 .flex{
     display: flex;
 }
+.flex-1{
+    flex: 1;
+}
 .space-between{
     display: flex;
     justify-content: space-between;

src/utils/constants.js

@@ -677,4 +677,90 @@ export const DIAGNOSE_CHANNEL = [
     value: 3,
   },
 ];
-
+// 跟进状态
+export const FOLLOW_STATUS_LIST = [
+  {
+    label: '待跟进',
+    value: 1,
+  },
+  {
+    label: '跟进中',
+    value: 2,
+  },
+  {
+    label: '已完成',
+    value: 3,
+  },
+];
+// 药品跟进结果
+export const MEDICINE_FOLLOW_STATUS_LIST = [
+  {
+    label: '成交中药',
+    value: 1,
+  },
+  {
+    label: '成交西药',
+    value: 2,
+  },
+  {
+    label: '自备中药',
+    value: 3,
+  },
+  {
+    label: '自备西药',
+    value: 4,
+  },
+];
+// 治疗效果跟进状态
+export const HEALING_EFFECT_FOLLOW_STATUS = [
+  {
+    label: '待跟进',
+    value: 1,
+  },
+  {
+    label: '跟进中',
+    value: 2,
+  },
+  {
+    label: '跟进完成',
+    value: 3,
+  },
+  {
+    label: '长期跟进',
+    value: 4,
+  },
+];
+// 治疗效果跟进结果
+export const HEALING_EFFECT_FOLLOW_RESULT = [
+  {
+    label: '效果显著',
+    value: 1,
+  },
+  {
+    label: '有效果，不明显',
+    value: 2,
+  },
+  {
+    label: '无效果',
+    value: 3,
+  },
+  {
+    label: '治疗后更差了',
+    value: 4,
+  },
+];
+// 检查跟进结果
+export const CHECK_FOLLOW_RESULT = [
+  {
+    label: '成交',
+    value: 1,
+  },
+  {
+    label: '未成交',
+    value: 2,
+  },
+  {
+    label: '线下自己做',
+    value: 3,
+  },
+];
\ No newline at end of file

src/views/IM/diagnosis-admin/diagnosis-editor.vue

@@ -684,7 +684,7 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="确诊疾病">
+        <el-form-item label="诊断疾病(运营填)">
           <el-input
             v-model="formData.diagnoseDisease"
             placeholder="请输入确诊疾病名称"
@@ -748,6 +748,14 @@
             </div>
           </div>
         </el-form-item>
+        <el-form-item label="诊断疾病(医生填)">
+          <el-input
+            v-model="formData.diagnoseDisease"
+            placeholder="请输入确诊疾病名称"
+            :disabled="formData.status == 4 || editorType == 2"
+            class="set-width"
+          />
+        </el-form-item>
         <el-form-item
           label="诊断建议"
           prop="diagnoseAdvice"
@@ -938,34 +946,85 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="药品跟进状态">
+        <el-form-item label="跟进状态">
           <el-select
-            v-model="formData.drugFollowStatus"
-            placeholder="请跟进状态"
+            v-model="formData.followStatus"
+            placeholder="请选择跟进状态"
             class="set-width"
             :disabled="editorType == 2"
           >
             <el-option
-              v-for="item of followList"
+              v-for="item of followStatusList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="计划跟进时间">
+          <el-date-picker
+            v-model="formData.followDate"
+            :disabled="editorType == 2"
+            class="set-width"
+            type="datetime"
+            placeholder="创建时间"
+            format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
+          />
+        </el-form-item>
+        <el-form-item label="治疗效果跟进状态">
+          <el-select
+            v-model="formData.treatmentFollowStatus"
+            placeholder="请选择治疗效果跟进状态"
+            class="set-width"
+            :disabled="editorType == 2"
+          >
+            <el-option
+              v-for="item of healingStatusList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="治疗效果跟进点">
+          <el-input
+            v-model="formData.treatmentFollow"
+            placeholder="请输入治疗效果跟进点"
+            type="textarea"
+            maxlength="1000"
+            :disabled="editorType == 2"
+            show-word-limit
+          />
+        </el-form-item>
+        <el-form-item label="治疗效果跟进结果">
+          <el-select
+            v-model="formData.treatmentFollowResult"
+            placeholder="请选择治疗效果跟进结果"
+            class="set-width"
+            :disabled="editorType == 2"
+          >
+            <el-option
+              v-for="item of healingResultList"
               :key="item.value"
               :label="item.label"
               :value="item.value"
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="药品跟进">
+        <el-form-item label="药品跟进点">
           <el-input
             v-model="formData.drugFollow"
+            placeholder="请输入药品跟进点"
             type="textarea"
-            placeholder="请输入可跟进的事项"
             maxlength="1000"
             :disabled="editorType == 2"
             show-word-limit
           />
         </el-form-item>
-        <el-form-item label="检查跟进状态">
+        <el-form-item label="药品跟进状态">
           <el-select
-            v-model="formData.checkFollowStatus"
+            v-model="formData.drugFollowStatus"
             placeholder="请跟进状态"
             class="set-width"
             :disabled="editorType == 2"
@@ -978,16 +1037,89 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="检查跟进">
+        <el-form-item label="药品跟进结果">
+          <div class="flex">
+            <el-select
+              v-model="formData.drugFollowResult"
+              placeholder="请选择药品跟进结果"
+              class="set-width"
+              :disabled="editorType == 2"
+            >
+              <el-option
+                v-for="item of medicineFollowStatusList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+            <el-input
+              v-model="formData.drugFollowResultContent"
+              placeholder=""
+              class="set-width flex-1"
+              style="margin-left:30px"
+              :disabled="editorType == 2"
+              maxlength="1000"
+              show-word-limit
+            />
+          </div>
+        </el-form-item>
+        <el-form-item label="检查跟进点">
           <el-input
             v-model="formData.checkFollow"
+            placeholder="请输入检查跟进点"
             type="textarea"
-            placeholder="请输入可跟进的事项"
             maxlength="1000"
             :disabled="editorType == 2"
             show-word-limit
           />
         </el-form-item>
+        <el-form-item label="检查跟进状态">
+          <el-select
+            v-model="formData.checkFollowStatus"
+            placeholder="请跟进状态"
+            class="set-width"
+            :disabled="editorType == 2"
+          >
+            <el-option
+              v-for="item of followList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="检查跟进结果">
+          <div class="flex">
+            <el-select
+              v-model="formData.checkFollowResult"
+              placeholder="请选择检查跟进结果"
+              class="set-width"
+              :disabled="editorType == 2"
+            >
+              <el-option
+                v-for="item of checkFollowResultList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+            <span 
+              class="flex flex-1"
+              style="margin-left:30px"
+            >
+              检查结果
+              <el-input
+                v-model="formData.checkResult"
+                placeholder=""
+                show-word-limit
+                maxlength="1000"
+                class="set-width flex-1"
+                style="margin-left:12px"
+                :disabled="editorType == 2"
+              />
+            </span>
+          </div>
+        </el-form-item>
         <el-form-item label="其他跟进状态">
           <el-select
             v-model="formData.otherFollowStatus"
@@ -1109,7 +1241,12 @@ import {
   SOURCE_LIST,
   STATUS_LIST,
   TYPE_LIST,
-  DIAGNOSE_CHANNEL
+  DIAGNOSE_CHANNEL,
+  FOLLOW_STATUS_LIST,
+  MEDICINE_FOLLOW_STATUS_LIST,
+  HEALING_EFFECT_FOLLOW_STATUS,
+  HEALING_EFFECT_FOLLOW_RESULT,
+  CHECK_FOLLOW_RESULT
 } from '@/utils/constants';
 import { getBirth } from '@/utils/index';
 
@@ -1195,12 +1332,21 @@ export default {
         diagnoseAdvice: '',
         illnessAudioUrls: [],
         followFlag: 1,
-        drugFollow: '',
         drugFollowStatus: '',
-        checkFollow: '',
         checkFollowStatus: '',
         otherFollowStatus: '',
         otherFollow: '',
+        followStatus:'', // 跟进状态
+        followDate:'', // 计划跟进时间
+        drugFollow:'', // 药品跟进点
+        drugFollowResult:'', // 药品跟进结果
+        drugFollowResultContent:'', // 药品跟进结果描述
+        treatmentFollow:'', // 治疗效果跟进点
+        treatmentFollowStatus:'', // 治疗效果跟进状态
+        treatmentFollowResult:'', // 治疗效果跟进结果
+        checkFollow: '', // 检查跟进点
+        checkFollowResult: '', // 检查跟进结果
+        checkResult: '', // 检测结果
         remark: '',
         maritalStatus: 2,
         createType: 1, // //创建方式1.系统创建 2.手动创建
@@ -1237,6 +1383,11 @@ export default {
       relationList: RELATION_LIST,
       doctorSourceList: D_S_LIST,
       followList: FOLLW_LIST,
+      followStatusList: FOLLOW_STATUS_LIST,
+      medicineFollowStatusList: MEDICINE_FOLLOW_STATUS_LIST,
+      healingStatusList: HEALING_EFFECT_FOLLOW_STATUS,
+      healingResultList: HEALING_EFFECT_FOLLOW_RESULT,
+      checkFollowResultList: CHECK_FOLLOW_RESULT,
       doctorList: [],
       rules: {
         appointBeginTime: [

src/views/IM/diagnosis-admin/diagnosis-list-new.vue

@@ -119,6 +119,27 @@
                   </el-select>
                 </el-form-item>
               </div>
+              <div>
+                <el-form-item
+                  label="跟进运营"
+                  class="t-b"
+                >
+                  <el-select
+                    v-model="searchParam.followOperatorId"
+                    placeholder="请选择跟进运营"
+                    clearable
+                    filterable
+                    style="width: 220px"
+                  >
+                    <el-option
+                      v-for="item of allPersonnelList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                    />
+                  </el-select>
+                </el-form-item>
+              </div>
             </div>
             <div class="form-li">
               <div>
@@ -211,6 +232,27 @@
                   </el-select>
                 </el-form-item>
               </div>
+              <div>
+                <el-form-item
+                  label="跟进状态"
+                  class="t-b"
+                >
+                  <el-select
+                    v-model="searchParam.followStatusList"
+                    placeholder="请选择跟进状态"
+                    clearable
+                    multiple
+                    style="width: 220px"
+                  >
+                    <el-option
+                      v-for="item of followStatusLists"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </div>
             </div>
             <div class="form-li">
               <div>
@@ -295,6 +337,22 @@
                   />
                 </el-form-item>
               </div>
+              <div>
+                <el-form-item
+                  label="计划跟进时间"
+                  class="t-b"
+                >
+                  <el-date-picker
+                    v-model="followDateTime"
+                    type="daterange"
+                    value-format="yyyy-MM-dd"
+                    range-separator="-"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    style="width: 220px"
+                  />
+                </el-form-item>
+              </div>
             </div>
             <div class="form-li">
               <div>
@@ -612,6 +670,7 @@ import {
   getCountQuery,
   getDepartments,
   reMatchDoctor,
+  personnelList
 } from '@/api/diagnosis';
 import { DIAGNOS_LIST_NEW } from '@/utils/GeneralData/diagnosis-list-new';
 import {
@@ -625,7 +684,8 @@ import {
   SOURCE_LIST,
   TRIAGE_TAB_LIST,
   TYPE_LIST,
-  DIAGNOSE_CHANNEL
+  DIAGNOSE_CHANNEL,
+  FOLLOW_STATUS_LIST
 } from '@/utils/constants';
 import { outbounNote } from '../../../api/diagnosis';
 import { callAssistantDoctor, updateDiagnosis } from '../../../utils/diagnosis';
@@ -674,6 +734,7 @@ export default {
       orderRangeTime: '',
       completeRangeTime: '',
       assistantTime: '',
+      followDateTime:'',
       depList: [],
       tabrefresh: true,
       searchParam: {
@@ -695,6 +756,8 @@ export default {
         doneTimeEnd: '',
         assistantBeginTime: '',
         assistantEndTime: '',
+        followDateBegin:'',
+        followDateEnd:'',
         pageSize: 15,
         pageNo: 1,
         menuType: 1, // 菜单类型：1、all 2、运营 3、待分诊 4、待接诊 5、外呼
@@ -706,6 +769,8 @@ export default {
         consultRoadList: [],
         diagnoseChannelList: [],
         patientName: null,
+        followOperatorId:'', // 运营id
+        followStatusList:[], // 跟进状态
       },
       noteList: [],
       alltabslist: [],
@@ -714,6 +779,7 @@ export default {
       sourceList: SOURCE_LIST,
       priceList: ORDER_PRICE,
       matchingWayList: MATCHING_LIST,
+      followStatusLists: FOLLOW_STATUS_LIST,
       orderBusinessList: [
         {
           label: '中医实践',
@@ -790,6 +856,7 @@ export default {
       triageDepartment: '',
       departmentId: '',
       allTilst: [],
+      allPersonnelList:[],
       allList: {},
       consultationTypeList: [
         {
@@ -828,6 +895,7 @@ export default {
     this.setTableHeight();
     this.getOutboundNote();
     this.departmentAll();
+    this.personnelList();
   },
   destroyed() {
     clearInterval(this.timer);
@@ -841,6 +909,13 @@ export default {
         }
       });
     },
+    personnelList() {
+      personnelList().then((res) => {
+        if (res.code == '000000') {
+          this.allPersonnelList = res.data || {};
+        }
+      });
+    },
     showListALL() {
       const arr = [];
       const { departmentMapList, parentDepartmentList } = this.allList;
@@ -1089,12 +1164,14 @@ export default {
         orderRangeTime,
         completeRangeTime,
         assistantTime,
+        followDateTime
       } = this;
       this.setTime('createdTimeBegin', 'createdTimeEnd', createRangeTime);
       this.setTime('cancelTimeBegin', 'cancelTimeEnd', cancelRangeTime);
       this.setTime('appointBeginTime', 'appointEndTime', orderRangeTime);
       this.setTime('doneTimeBegin', 'doneTimeEnd', completeRangeTime);
       this.setTime('assistantBeginTime', 'assistantEndTime', assistantTime);
+      this.setTime('followDateBegin', 'followDateEnd', followDateTime);
     },
     /**
      * btime开始时间
@@ -1143,6 +1220,12 @@ export default {
         } else {
           this.searchParam.sort = 8;
         }
+      } else if (data.prop == 'followDateTime') {
+        if (data.order == 'ascending') {
+          this.searchParam.sort = 9;
+        } else {
+          this.searchParam.sort = 10;
+        }
       } else {
         this.searchParam.sort = null;
       }
@@ -1189,6 +1272,7 @@ export default {
       this.orderRangeTime = '';
       this.completeRangeTime = '';
       this.assistantTime = '';
+      this.followDateTime = '';
       this.searchParam = Object.assign(this.searchParam, {
         id: '',
         typeList: [],
@@ -1212,10 +1296,14 @@ export default {
         doneTimeEnd: '',
         assistantBeginTime: '',
         assistantEndTime: '',
+        followDateBegin:'',
+        followDateEnd:'',
         inNewTimeObj: {},
         consultRoadList: [],
         patientName: null,
-        diagnoseChannelList: []
+        diagnoseChannelList: [],
+        followStatusList:[],
+        followOperatorId:''
       });
       this.getsearch();
     },