Merge remote-tracking branch 'origin/dev1.0' into dev1.0

admin-ui/src/views/work/check/window.vue

@@ -165,7 +165,7 @@ export default {
     // 获取当前患者的所有检查项目，同时生成菜单栏需要的时间数据
     getObrAllListAndGenerateTime() {
       // this.testPatId要改为this.$props.param.id
-      this.$props.param.id = this.testPatId //后续数据库更新后需要把这行代码注释掉
+      // this.$props.param.id = this.testPatId //后续数据库更新后需要把这行代码注释掉
       service({
         url: `/work/request/patid/${this.$props.param.id}`,
       }).then((response) => {
@@ -177,7 +177,7 @@ export default {
     // 获取所有检查项目的所有检测结果，通过检测项目标识obrId来取出对应检测结果，默认获取第一页的数据
     getObxAllList() {
       // this.testPatId要改为this.$props.param.id
-      this.$props.param.id = this.testPatId //后续数据库更新后需要把这行代码注释掉
+      // this.$props.param.id = this.testPatId //后续数据库更新后需要把这行代码注释掉
       service({
         url: `/work/result/patid/${this.$props.param.id}`,
         params: {

admin-ui/src/views/work/visit/search.vue

@@ -21,7 +21,7 @@
                   <template slot="title">
                     <span>{{month}}月</span>
                   </template>
-                  <el-menu-item v-for="item in days" @click="getCard(item.id); activePatient(2); getDgList()" :key="item.id" :index="item.id.toString()">
+                  <el-menu-item v-for="item in days" @click="getCard(item.id)" :key="item.id" :index="item.id.toString()">
                     {{item.day}}日 {{item.HH}}:{{item.MM}}:{{item.SS}}
                   </el-menu-item>
                 </el-submenu>
@@ -207,6 +207,7 @@ export default {
     },
     /** 查询某一次的就诊信息 */
     getCard(id){
+      this.activePatient(2);
       if(id === this.pvList.id){
         return;
       }

app/pages.json

@@ -179,6 +179,18 @@
 			{
 				"navigationBarTitleText" : "选择患者"
 			}
+		},
+		{
+			"path": "pages/visit/doctor/selectUser",
+			"style": {
+				"navigationBarTitleText": "选择患者"
+			}
+		},
+		{
+			"path": "pages/visit/doctor/list",
+			"style": {
+				"navigationBarTitleText": "患者就诊记录"
+			}
 		}
 	],
 	"tabBar": {

app/pages/user/index.vue

@@ -39,6 +39,16 @@
 					<text class="title">我的知识库</text>
 					<text class="icon arrow">&#xe62b;</text>
 				</view>
+				<view class="s_item" @click="go('/pages/visit/doctor/selectUser')">
+					<text class="icon ic" style="color: #03a9f4">&#xe685;</text>
+					<text class="title">就诊记录</text>
+					<text class="icon arrow">&#xe62b;</text>
+				</view>
+				<view class="s_item" @click="go('/pages/detection/index')">
+					<text class="icon ic" style="color: #ff9800">&#xe63a;</text>
+					<text class="title">检测报告</text>
+					<text class="icon arrow">&#xe62b;</text>
+				</view>
 			</view>
 			<!--患者菜单-->
 			<view v-else>

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/DiagnosisController.java

@@ -35,7 +35,6 @@ public class DiagnosisController extends BaseController {
     private IDiagnosisService dgService;
 
     @ApiOperation(value = "获取诊断列表")
-    @PreAuthorize("@ss.hasPermi('work:diagnosis:list')")
     @GetMapping("/list")
     public TableDataInfo list(Diagnosis diagnosis){
         startPage();
@@ -44,14 +43,12 @@ public class DiagnosisController extends BaseController {
     }
 
     @ApiOperation(value = "根据id查询")
-    @PreAuthorize("@ss.hasPermi('work:diagnosis:query')")
     @GetMapping(value = "/detail/{id}")
     public AjaxResult detail(@PathVariable("id") Long id){
         return AjaxResult.success(dgService.getById(id));
     }
 
     @ApiOperation(value = "添加诊断信息")
-    @PreAuthorize("@ss.hasPermi('work:diagnosis:add')")
     @Log(title = "诊断", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public AjaxResult add(@RequestBody Diagnosis dg){
@@ -59,7 +56,6 @@ public class DiagnosisController extends BaseController {
     }
 
     @ApiOperation(value = "修改诊断信息")
-    @PreAuthorize("@ss.hasPermi('work:diagnosis:edit')")
     @Log(title = "诊断", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public AjaxResult edit(@RequestBody Diagnosis dg){
@@ -67,7 +63,6 @@ public class DiagnosisController extends BaseController {
     }
 
     @ApiOperation(value = "删除诊断信息")
-    @PreAuthorize("@ss.hasPermi('work:diagnosis:remove')")
     @Log(title = "诊断", businessType = BusinessType.DELETE)
     @GetMapping("/remove/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids){