y1

ruoyi-admin/src/main/java/com/ruoyi/web/controller/care/CareApplicationsController.java

@@ -200,7 +200,7 @@ public class CareApplicationsController extends BaseController
     {
         startPage();
         Long userId=getUserId();
-        careApplications.setCompanyId(userId);
+        careApplications.setCompanyUserId(userId);
         List<CareApplications> list = careApplicationsService.selectCareApplicationsList(careApplications);
         return getDataTable(list);
     }
@@ -214,7 +214,22 @@ public class CareApplicationsController extends BaseController
     {
         startPage();
         Long userId=getUserId();
-        careApplications.setNurseId(userId);
+        careApplications.setNurseUserId(userId);
+        List<CareApplications> list = careApplicationsService.selectCareApplicationsList(careApplications);
+        return getDataTable(list);
+    }
+
+    /**
+     * 评分列表
+     */
+    @PreAuthorize("@ss.hasPermi('care:applications:scoreList')")
+    @GetMapping("/scoreList")
+    @DataScope(deptAlias = "u", userAlias = "u")
+    public TableDataInfo scoreList(CareApplications careApplications)
+    {
+        startPage();
+        careApplications.setDealStatus("complete");
+        careApplications.setStatus("assigned");
         List<CareApplications> list = careApplicationsService.selectCareApplicationsList(careApplications);
         return getDataTable(list);
     }

ruoyi-system/src/main/java/com/ruoyi/care/domain/CareApplications.java

@@ -85,6 +85,16 @@ public class CareApplications extends BaseEntity
     private String dieTime;
     private String dieImg;
 
+    private Long companyUserId;
+    private Long nurseUserId;
+    public Long getCompanyUserId() {
+        return companyUserId;
+    }
+
+    public void setCompanyUserId(Long companyUserId) {
+        this.companyUserId = companyUserId;
+    }
+
     public String getDieTime() {
         return dieTime;
     }
@@ -350,4 +360,12 @@ public class CareApplications extends BaseEntity
             .append("remark", getRemark())
             .toString();
     }
+
+    public void setNurseUserId(Long nurseUserId) {
+        this.nurseUserId = nurseUserId;
+    }
+
+    public Long getNurseUserId() {
+        return nurseUserId;
+    }
 }

ruoyi-system/src/main/resources/mapper/care/CareApplicationsMapper.xml

@@ -70,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN care_nurses n ON n.nurse_id = s.nurse_id
                 LEFT JOIN care_hospital h ON h.hospital_id = a.hospital
                 LEFT JOIN sys_user u ON u.user_id = a.create_by
+                LEFT JOIN care_companies c ON c.company_id=s.company_id
     </sql>
 
     <select id="selectCareApplicationsList" parameterType="CareApplications" resultMap="CareApplicationsResult">
@@ -84,7 +85,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="careDays != null  and careDays != ''"> and a.care_days = #{careDays}</if>
             <if test="applyDate != null  and applyDate != ''"> and a.apply_date = #{applyDate}</if>
             <if test="companyId != null  and companyId != ''"> and s.company_id = #{companyId}</if>
+            <if test="companyUserId != null  and companyUserId != ''"> and c.user_id = #{companyUserId}</if>
+
             <if test="nurseId != null  and nurseId != ''"> and s.nurse_id = #{nurseId}</if>
+            <if test="nurseUserId != null  and nurseUserId != ''"> and n.user_id = #{nurseUserId}</if>
             <if test="status != null  and status != ''">
              and
              <choose>

ruoyi-ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.8.8",
-  "description": "若依管理系统",
+  "description": "特困户看护平台",
   "author": "若依",
   "license": "MIT",
   "scripts": {

ruoyi-ui/src/views/index.vue

@@ -41,7 +41,7 @@
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
         <h2>若依后台管理框架</h2>
         <p>
-          一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
+          一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了特困户看护平台，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
         </p>
         <p>
           <b>当前版本:</b> <span>v{{ version }}</span>
@@ -120,9 +120,9 @@
             <p>
               <i class="el-icon-user-solid"></i> QQ群：<s> 满937441 </s> <s> 满887144332 </s>
               <s> 满180251782 </s> <s> 满104180207 </s> <s> 满186866453 </s> <s> 满201396349 </s>
-              <s> 满101456076 </s> <s> 满101539465 </s> <s> 满264312783 </s> <s> 满167385320 </s> 
-              <s> 满104748341 </s> <s> 满160110482 </s> <s> 满170801498 </s> <s> 满108482800 </s> 
-              <s> 满101046199 </s> <s> 满136919097 </s> <s> 满143961921 </s> <s> 满174951577 </s> 
+              <s> 满101456076 </s> <s> 满101539465 </s> <s> 满264312783 </s> <s> 满167385320 </s>
+              <s> 满104748341 </s> <s> 满160110482 </s> <s> 满170801498 </s> <s> 满108482800 </s>
+              <s> 满101046199 </s> <s> 满136919097 </s> <s> 满143961921 </s> <s> 满174951577 </s>
               <s> 满161281055 </s> <s> 满138988063 </s> <a href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=SUc-msaypcqB2UTFif4eqGlBHkKcvMNP&authKey=JdQBouY2PG%2BS%2BCzAfIgbCGNgxyahpfh24IW%2F03rPxGilhqVbisLma%2FFFnt79DHNh&noverify=0&group_code=151450850" target="_blank">151450850</a>
             </p>
             <p>

ruoyi-ui/src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">特困户看护平台</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"

ruoyi-vue/src/api/care/applications.js

@@ -95,4 +95,13 @@ export function clocklistApplications(query) {
     method: 'get',
     params: query
   })
+}
+
+// 打卡列表
+export function scorelistApplications(query) {
+  return request({
+    url: '/care/applications/scoreList',
+    method: 'get',
+    params: query
+  })
 }

ruoyi-vue/src/views/care/applications/index.vue

@@ -537,6 +537,9 @@ const data = reactive({
     applyDate: [
       { required: true, message: "申请日期不能为空", trigger: "blur" }
     ],
+    leaveTime: [
+      { required: true, message: "出院日期不能为空", trigger: "blur" }
+    ],
     status: [
       { required: true, message: "申请状态(待审核、同意、不同意、待指派、已指派)不能为空", trigger: "change" }
     ],

ruoyi-vue/src/views/care/clocks/index_task.vue

@@ -217,6 +217,7 @@ import {
   clocklistApplications,
   completeApplications
 } from "@/api/care/applications";
+import { listAllHospital } from "@/api/care/hospital";
 import clockIndex from './index.vue';
 import {dieSubmit} from "@/api/care/clocks";
 import {Plus} from "@element-plus/icons-vue";
@@ -399,7 +400,13 @@ function submitForm() {
     }
   });
 }
-
+/** 查询医院列表 */
+function listHispital() {
+  listAllHospital().then(response => {
+    hispitalList.value = response;
+  });
+}
+listHispital();
 getList();
 
 </script>

ruoyi-vue/src/views/care/scores/index.vue

@@ -1,29 +1,23 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="护理业务数据id" prop="applyId">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="88px">
+      <el-form-item label="申请人姓名" prop="personName">
         <el-input
-          v-model="queryParams.applyId"
-          placeholder="请输入护理业务数据id"
-          clearable
-          @keyup.enter="handleQuery"
+            v-model="queryParams.personName"
+            placeholder="请输入申请人姓名"
+            clearable
+            @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="评分人id" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入评分人id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="评价" prop="assess">
-        <el-input
-          v-model="queryParams.assess"
-          placeholder="请输入评价"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+      <el-form-item label="所在医院" prop="hospital">
+        <el-select v-model="queryParams.hospital" placeholder="请选择所在医院" clearable>
+          <el-option
+              v-for="dict in hispitalList"
+              :key="dict.name"
+              :label="dict.name"
+              :value="dict.name"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -75,15 +69,18 @@
 
     <el-table v-loading="loading" :data="scoresList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="业务评分表的唯一标识符" align="center" prop="scoreId" />
-      <el-table-column label="护理业务数据id" align="center" prop="applyId" />
-      <el-table-column label="评分人id" align="center" prop="userId" />
-      <el-table-column label="评价" align="center" prop="assess" show-overflow-tooltip/>
-      <el-table-column label="得此评价原因" align="center" prop="reason" show-overflow-tooltip/>
+      <el-table-column label="申请人姓名" align="center" prop="personName" />
+      <el-table-column label="护理需求详情" align="center" prop="careNeeds" />
+      <el-table-column label="所在医院" align="center" prop="hospital" />
+      <el-table-column label="科室具体楼层房间床号" align="center" prop="address" />
+      <el-table-column label="预计天数" align="center" prop="careDays" />
+      <el-table-column label="申请日期" align="center" prop="applyDate" />
+      <el-table-column label="评分" align="center" prop="assess" show-overflow-tooltip/>
+      <el-table-column label="得此评分原因" align="center" prop="reason" show-overflow-tooltip/>
       <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['care:scores:edit']">修改</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['care:scores:edit']">评分</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['care:scores:remove']">删除</el-button>
         </template>
       </el-table-column>
@@ -130,8 +127,12 @@
 </template>
 
 <script setup name="Scores">
-import { listScores, getScores, delScores, addScores, updateScores } from "@/api/care/scores";
-
+import {  getScores, delScores, addScores, updateScores } from "@/api/care/scores";
+import { listAllHospital } from "@/api/care/hospital";
+import {
+  scorelistApplications
+} from "@/api/care/applications";
+import {ref} from "vue";
 const { proxy } = getCurrentInstance();
 
 const scoresList = ref([]);
@@ -143,16 +144,14 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
-
+const hispitalList=ref([]);
 const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    applyId: null,
-    userId: null,
-    assess: null,
-    reason: null,
+    personName: null,
+    hospital: null,
   },
   rules: {
     applyId: [
@@ -172,7 +171,7 @@ const { queryParams, form, rules } = toRefs(data);
 /** 查询业务评分列表 */
 function getList() {
   loading.value = true;
-  listScores(queryParams.value).then(response => {
+  scorelistApplications(queryParams.value).then(response => {
     scoresList.value = response.rows;
     total.value = response.total;
     loading.value = false;
@@ -278,6 +277,12 @@ function handleExport() {
     ...queryParams.value
   }, `scores_${new Date().getTime()}.xlsx`)
 }
-
+/** 查询医院列表 */
+function listHispital() {
+  listAllHospital().then(response => {
+    hispitalList.value = response;
+  });
+}
+listHispital();
 getList();
 </script>