Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis

openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/appservice/IOutpatientRegistrationAppService.java

@@ -73,4 +73,14 @@ public interface IOutpatientRegistrationAppService {
      */
     R<?> saveRegister(OutpatientRegistrationAddParam outpatientRegistrationAddParam);
 
+    /**
+     * 查询当日就诊数据
+     *
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @return 当日就诊数据
+     */
+    IPage<CurrentDayEncounterDto> getCurrentDayEncounter(String searchKey, Integer pageNo, Integer pageSize);
+
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/appservice/impl/IOutpatientRegistrationAppServiceImpl.java

@@ -7,8 +7,6 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
-import com.openhis.common.enums.*;
-import com.openhis.common.enums.PractitionerRole;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -26,6 +24,8 @@ import com.openhis.clinical.domain.ConditionDefinition;
 import com.openhis.clinical.mapper.ConditionDefinitionMapper;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.enums.PractitionerRole;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisPageUtils;
 import com.openhis.common.utils.HisQueryUtils;
@@ -268,4 +268,30 @@ public class IOutpatientRegistrationAppServiceImpl implements IOutpatientRegistr
         return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"挂号"}));
     }
 
+    /**
+     * 查询当日就诊数据
+     *
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @return 当日就诊数据
+     */
+    @Override
+    public IPage<CurrentDayEncounterDto> getCurrentDayEncounter(String searchKey, Integer pageNo, Integer pageSize) {
+        // 构建查询条件
+        QueryWrapper<CurrentDayEncounterDto> queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey,
+            new HashSet<>(Arrays.asList("patient_name", "organization_name", "practitioner_name", "healthcare_name")),
+            null);
+
+        IPage<CurrentDayEncounterDto> currentDayEncounter =
+            outpatientRegistrationAppMapper.getCurrentDayEncounter(new Page<>(pageNo, pageSize), queryWrapper);
+        currentDayEncounter.getRecords().forEach(e -> {
+            // 性别
+            e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
+            // 就诊状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(EncounterStatus.class, e.getStatusEnum()));
+        });
+        return currentDayEncounter;
+    }
+
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/controller/OutpatientRegistrationController.java

@@ -7,6 +7,8 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.validation.Valid;
+
 import org.springframework.web.bind.annotation.*;
 
 import com.core.common.core.domain.R;
@@ -20,8 +22,6 @@ import com.openhis.web.outpatientservice.dto.OutpatientRegistrationInitDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.validation.Valid;
-
 /**
  * 门诊挂号 controller
  */
@@ -134,4 +134,19 @@ public class OutpatientRegistrationController {
         return iOutpatientRegistrationAppService.saveRegister(outpatientRegistrationAddParam);
     }
 
+    /**
+     * 查询当日就诊数据
+     * 
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页
+     * @param pageSize 每页多少条
+     * @return 当日就诊数据
+     */
+    @GetMapping(value = "/current-day-encounter")
+    public R<?> getCurrentDayEncounter(@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return R.ok(iOutpatientRegistrationAppService.getCurrentDayEncounter(searchKey, pageNo, pageSize));
+    }
+
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/CurrentDayEncounterDto.java

@@ -0,0 +1,92 @@
+package com.openhis.web.outpatientservice.dto;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 当天就诊信息
+ */
+@Data
+@Accessors(chain = true)
+public class CurrentDayEncounterDto {
+
+    /** 租户ID */
+    private Integer tenantId;
+
+    /**
+     * 就诊ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /**
+     * 科室ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizationId;
+
+    /**
+     * 科室名称
+     */
+    private String organizationName;
+
+    /**
+     * 挂号类型
+     */
+    private String healthcareName;
+
+    /**
+     * 专家账号id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long practitionerUserId;
+
+    /**
+     * 专家
+     */
+    private String practitionerName;
+
+    /**
+     * 费用性质
+     */
+    private String contractName;
+
+    /**
+     * 患者id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+
+    /**
+     * 患者姓名
+     */
+    private String patientName;
+
+    /**
+     * 患者性别
+     */
+    private Integer genderEnum;
+    private String genderEnum_enumText;
+
+    /**
+     * 证件号
+     */
+    private String idCard;
+
+    /**
+     * 就诊状态
+     */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /**
+     * 挂号日期/时间
+     */
+    private Date registerTime;
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/mapper/OutpatientRegistrationAppMapper.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.outpatientservice.dto.CurrentDayEncounterDto;
 import com.openhis.web.outpatientservice.dto.PractitionerMetadata;
 
 /**
@@ -27,4 +28,14 @@ public interface OutpatientRegistrationAppMapper {
     Integer getNumByPatientIdAndOrganizationId(@Param("patientId") Long patientId,
         @Param("serviceTypeId") Long serviceTypeId);
 
+    /**
+     * 查询当日就诊数据
+     * 
+     * @param page 分页参数
+     * @param queryWrapper 查询条件
+     * @return 当日就诊数据
+     */
+    IPage<CurrentDayEncounterDto> getCurrentDayEncounter(@Param("page") Page<CurrentDayEncounterDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<CurrentDayEncounterDto> queryWrapper);
+
 }

openhis-server/openhis-application/src/main/resources/mapper/outpatientservice/OutpatientRegistrationAppMapper.xml

@@ -39,4 +39,49 @@
           AND create_time > CURRENT_DATE
     </select>
 
+    <select id="getCurrentDayEncounter" resultType="com.openhis.web.outpatientservice.dto.CurrentDayEncounterDto">
+        SELECT T9.tenant_id,
+               T9.encounter_id,
+               T9.organization_id,
+               T9.organization_name,
+               T9.healthcare_name,
+               T9.practitioner_user_id,
+               T9.practitioner_name,
+               T9.contract_name,
+               T9.patient_id,
+               T9.patient_name,
+               T9.gender_enum,
+               T9.id_card,
+               T9.status_enum,
+               T9.register_time
+        from (
+                 SELECT T1.tenant_id       AS tenant_id,
+                        T1.id              AS encounter_id,
+                        T1.organization_id AS organization_id,
+                        T2.NAME            AS organization_name,
+                        T3.NAME            AS healthcare_name,
+                        T5.user_id         AS practitioner_user_id,
+                        T5.NAME            AS practitioner_name,
+                        T7.contract_name   AS contract_name,
+                        T8.id              AS patient_id,
+                        T8.NAME            AS patient_name,
+                        T8.gender_enum     AS gender_enum,
+                        T8.id_card         AS id_card,
+                        T1.status_enum     AS status_enum,
+                        T1.create_time     AS register_time
+                 FROM adm_encounter AS T1
+                          LEFT JOIN adm_organization AS T2 ON T1.organization_id = T2.
+                     ID
+                          LEFT JOIN adm_healthcare_service AS T3 ON T1.service_type_id = T3.
+                     ID
+                          LEFT JOIN adm_encounter_participant AS T4 ON T1.ID = T4.encounter_id
+                          LEFT JOIN adm_practitioner AS T5 ON T5.ID = T4.practitioner_id
+                          LEFT JOIN adm_account AS T6 ON T1.ID = T6.encounter_id
+                          LEFT JOIN fin_contract AS T7 ON T6.contract_no = T7.bus_no
+                          LEFT JOIN adm_patient AS T8 ON T1.patient_id = T8.ID
+                 WHERE T1.delete_flag = '0'
+                   AND T1.create_time > CURRENT_DATE) AS T9
+            ${ew.customSqlSegment}
+    </select>
+
 </mapper>

openhis-ui-vue3/src/views/clinicManagement/skinRecord/component/api.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function listSkinRecord(query) {
+    return request({
+      url: '/patientmanage/records/outpatient-record-page',
+      method: 'get',
+      params: query
+    })
+  }

openhis-ui-vue3/src/views/clinicManagement/skinRecord/index.vue

@@ -0,0 +1,284 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+		   <el-form-item label="门诊号" prop="patientname">
+		      <el-input v-model="queryParams.patientname"  placeholder="身份证号/病人ID/门诊号/姓名" clearable style="width: 210px"
+		         @keyup.enter="handleQuery" />
+		   </el-form-item>
+		   <el-form-item label="处方号" prop="phone">
+		      <el-input v-model="queryParams.phone"  placeholder="请输入联系方式" clearable style="width: 200px"
+		         @keyup.enter="handleQuery" />
+		   </el-form-item>
+           <el-form-item label="病人ID" prop="phone">
+		      <el-input v-model="queryParams.phone"  placeholder="请输入联系方式" clearable style="width: 200px"
+		         @keyup.enter="handleQuery" />
+		   </el-form-item>
+           <el-form-item label="电话" prop="phone">
+		      <el-input v-model="queryParams.phone"  placeholder="请输入联系方式" clearable style="width: 200px"
+		         @keyup.enter="handleQuery" />
+		   </el-form-item>
+           <el-form-item label="查询时间" prop="patientname">
+            <el-date-picker v-model="dateRange"  value-format="YYYY-MM-DD" type="daterange" range-separator="-" 
+            start-placeholder="开始日期" end-placeholder="结束日期" ></el-date-picker>
+		   </el-form-item>
+		   <el-form-item label="状态" prop="patientid">
+				<el-select v-model="queryParams.bloodAbo" placeholder="请选择医生" clearable   @keyup.enter="handleQuery" style="width: 160px">
+					<el-option v-for="item in bloodtypeaboList"
+					:key="item.value" :label="item.info" :value="item.value" />
+				</el-select>
+		   </el-form-item>
+		   <el-form-item>
+		      <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+		      <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+		   </el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+		   <el-col :span="1.5">
+		      <!-- <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:menu:add']">确认项目</el-button> -->
+		   </el-col>
+		   <el-col :span="1.5">
+		      <el-button type="success" plain icon="EditPen" @click="handleUpdate" v-hasPermi="['system:menu:add']">修改</el-button>
+		   </el-col>
+		   <el-col :span="1.5">
+		      <el-button type="danger" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:menu:add']">取消修改</el-button>
+		   </el-col>
+		   <el-col :span="1.5">
+		      <!-- <el-button type="warning" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:menu:add']">保存</el-button> -->
+		   </el-col>
+		   <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+        <el-table :data="skinRecordList" border style="width: 100%">
+		    <el-table-column prop="idCard" label="处方号" width="150" />
+		    <el-table-column prop="busNo" label="门诊号" width="150" />
+			<el-table-column prop="name" label="病人" width="120" />
+			<el-table-column prop="genderEnum" label="药品信息" width="150" />
+			<el-table-column prop="maritalStatusEnum" label="药品" width="160" />
+			<el-table-column prop="nationalityCode" label="药品批号" width="160" />
+			<el-table-column prop="age" label="状态" width="80" />
+			<el-table-column prop="phone" label="皮试结果" width="120" />
+			<el-table-column prop="address" label="执行护士" width="130" />
+			<el-table-column prop="workCompany" label="核对护士" width="130" />
+			<el-table-column prop="organizationName" label="开始时间" width="180" />
+			<el-table-column prop="organizationName" label="结束时间" width="180" />
+			<el-table-column prop="organizationName" label="开单医生" width="180" />
+			<el-table-column prop="organizationName" label="发药状态" width="180" />
+			<el-table-column prop="organizationName" label="备注" width="180" />
+            <el-table-column label="操作" align="center" width="210" fixed="right" class-name="small-padding fixed-width">
+			   <template #default="scope">
+			      <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:menu:edit']">修改</el-button>
+			      <el-button link type="primary" icon="Finished" @click="submitForm(scope.row)" v-hasPermi="['system:menu:add']">确认</el-button>
+			      <el-button link type="primary" icon="Finished" @click="sign(scope.row)" v-hasPermi="['system:menu:add']">签名</el-button>
+			   </template>
+			</el-table-column>
+		  </el-table>
+		  <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+		<el-dialog title="查看" v-model="open" width="900px" append-to-body>
+			<el-form ref="skinRecordRef" :model="form" :rules="rules" label-width="100px">
+				<el-row>
+					<el-col :span="7">
+						<el-form-item label="处方号" prop="name">
+					  		<el-input v-model="form.name" clearable  disabled/>
+					  	</el-form-item>
+					</el-col>
+					<el-col :span="7">
+						<el-form-item label="门诊号" prop="name">
+					  		<el-input v-model="form.name" clearable  disabled/>
+					  	</el-form-item>
+					</el-col>
+					<el-col :span="7">
+						<el-form-item label="病人" prop="name">
+					  		<el-input v-model="form.name" clearable  disabled/>
+					  	</el-form-item>
+					</el-col>
+				</el-row><br>
+				<el-row>
+					<el-col :span="8">
+						<el-form-item label="药品信息" prop="name">
+					  		<el-input v-model="form.name" clearable  disabled/>
+					  	</el-form-item>
+					</el-col>
+					<el-col :span="10">
+						<el-form-item label="药品" prop="name">
+					  		<el-input v-model="form.name"  disabled/>
+					  	</el-form-item>
+					</el-col>
+				</el-row><br>
+				<el-row>
+					<el-col :span="7">
+						<el-form-item label="药品批号" prop="name">
+					  		<el-input v-model="form.name" clearable  disabled/>
+					  	</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="状态" prop="name">
+							<el-select v-model="form.linkRelationCode" placeholder="联系人关系" clearable >
+						      <el-option v-for="item in statusList"
+						         :key="item.value" :label="item.info" :value="item.value" />
+						   </el-select>
+					  	</el-form-item>
+					</el-col>
+					<el-col :span="7">
+						<el-form-item label="皮试结果" prop="name">
+							<el-select v-model="form.linkRelationCode" placeholder="" clearable :disabled="isViewMode">
+						      <el-option v-for="item in skinResultList"
+						         :key="item.value" :label="item.info" :value="item.value" />
+						   </el-select>
+					  	</el-form-item>
+					</el-col>
+				</el-row><br>
+				<el-row>
+					<el-col :span="7">
+						<el-form-item label="执行护士" prop="name">
+					  		<el-input v-model="form.name" clearable  disabled/>
+					  	</el-form-item>
+					</el-col>
+					<el-col :span="7">
+						<el-form-item label="核对护士" prop="name">
+					  		<el-input v-model="form.name" clearable  disabled/>
+					  	</el-form-item>
+					</el-col>
+				</el-row><br>
+				<el-row>
+					<el-col :span="7">
+						<el-form-item label="开始时间" prop="name">
+							<el-date-picker v-model="form.startTime" type="datetime" placeholder="开始时间" />
+					  	</el-form-item>
+					</el-col>
+					<el-col :span="7">
+						<el-form-item label="结束时间" prop="name">
+							<el-date-picker v-model="form.endTime" type="datetime" placeholder="结束时间" />
+					  	</el-form-item>
+					</el-col>
+					<el-col :span="7">
+						<el-form-item label="开单医生" prop="name">
+					  		<el-input v-model="form.name" clearable  disabled/>
+					  	</el-form-item>
+					</el-col>
+				</el-row><br>
+				<el-row>
+					<el-col :span="7">
+						<el-form-item label="发药状态" prop="name">
+							<el-input v-model="form.name" clearable  disabled/>
+					  	</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="备注" prop="name">
+							<el-input v-model="form.name" clearable />
+					  	</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<template #footer>
+            <div class="dialog-footer">
+               <el-button type="primary" @click="saveForm">确 定</el-button>
+               <el-button @click="cancel">取 消</el-button>
+            </div>
+         </template>
+		</el-dialog>
+	
+	
+	</div>
+</template>
+
+<script  setup name="skinRecord">
+import { ref, computed } from 'vue';
+
+import { listSkinRecord } from './component/api'; 
+
+const showSearch = ref(true);
+const total = ref(1);
+const dateRange = ref([]);
+const skinRecordList = ref([]);
+const skinResultList = ref([]);
+const statusList = ref([]);
+
+const open = ref(false);
+
+
+const { proxy } = getCurrentInstance();
+
+const data = reactive({
+  form: {},
+  queryParams: {
+	pageNo: 1,
+    pageSize: 10,
+    patientname: undefined,
+    patientid: undefined
+  },
+});
+const { queryParams,form } = toRefs(data);
+/** 表单重置 */
+function reset() {
+  form.value = {
+    name: undefined,
+    nameJson: undefined,
+    menuName: undefined,
+    age: undefined,
+    genderEnum: 0,
+    idType: undefined,
+	idCard: undefined,
+	phone: undefined,
+	prfsEnum: undefined,
+	address: undefined,
+	tempFlag: undefined,
+  };
+  proxy.resetForm("skinRecordRef");
+}
+
+/** 查询门诊记录列表 */
+function getList() {
+  listSkinRecord(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
+    jobLogList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNo = 1;
+  getList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+function cancel() {
+  open.value = false;
+  reset();
+}
+function handleUpdate() {
+	open.value = true;
+}
+function sign(row){
+	row.sign = nurse;
+}
+
+function saveForm() {
+  const index = skinRecordList.value.findIndex(item => item.id === form.id);
+  if (index !== -1) {
+    tableData.value[index].name = form.name;
+    tableData.value[index].age = form.age;
+  }
+  open.value = false;
+}
+
+function submitForm() {
+  proxy.$refs["patientRef"].validate(valid => {
+    if (valid) {
+        updatePatient(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+    }
+  });
+}
+
+// getList();
+
+</script>

openhis-ui-vue3/src/views/patientManagement/outpatienRecords/index.vue

@@ -31,6 +31,7 @@
 			<el-table-column prop="idCard" label="身份证" width="180" />
 			<el-table-column prop="description" label="疾病" width="180" />
 			<el-table-column prop="patientBusNo" label="病人ID" width="180" />
+			<el-table-column prop="encounterBusNo" label="门诊号" width="180" />
 			<el-table-column prop="genderEnum_enumText" label="性别" width="80" />
 			<el-table-column prop="phone" label="电话" width="120" />
 			<el-table-column prop="encounterTime" label="就诊时间" width="180" />

openhis-ui-vue3/src/views/patientManagement/patientManagement/index.vue

@@ -413,6 +413,20 @@ function cancel() {
   open.value = false;
   reset();
 }
+// 获取完整地址字符串
+function getAddress(form) {
+  const addressParts = [
+    form.value.addressProvince,
+    form.value.addressCity,
+    form.value.addressDistrict,
+    form.value.addressStreet,
+    form.value.address,
+  ];
+  // 使用 reduce 方法拼接地址
+  return addressParts.reduce((acc, part) => {
+    return part ? acc + part : acc;
+  }, "");
+}
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs["patientRef"].validate(valid => {
@@ -420,7 +434,7 @@ function submitForm() {
       if (form.value.busNo != undefined) {
 		const newAddress = form.value.addressProvince+form.value.addressCity +  form.value.addressDistrict + form.value.addressStreet + form.value.address
 		if (addressCom.value !== newAddress) {
-    		form.value.address = newAddress;
+    		form.value.address = getAddress(form);
 		}
         updatePatient(form.value).then(response => {
           proxy.$modal.msgSuccess("修改成功");
@@ -428,7 +442,8 @@ function submitForm() {
           getList();
         });
       } else {
-		form.value.address = form.value.addressProvince+form.value.addressCity +  form.value.addressDistrict + form.value.addressStreet + form.value.address
+		form.value.address = getAddress(form);
+		// form.value.address = form.value.addressProvince+form.value.addressCity +  form.value.addressDistrict + form.value.addressStreet + form.value.address
         addPatient(form.value).then(response => {
           proxy.$modal.msgSuccess("新增成功");
           open.value = false;