diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java index 5b1e6c55d..71c2f66bd 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java @@ -39,7 +39,7 @@ public interface IInHospitalRegisterAppService { */ IPage getRegisterInfo(InHospitalRegisterQueryDto inHospitalRegisterQueryDto, String searchKey, String registeredFlag, Integer pageNo, Integer pageSize, - Date startTime, Date endTime, Long organizationId, HttpServletRequest request); + Date startTime, Date endTime, Long organizationId, String idCard, HttpServletRequest request); /** * 查询患者基本信息 diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java index c0579990b..7b14e5062 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java @@ -174,16 +174,19 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS @Override public IPage getRegisterInfo(InHospitalRegisterQueryDto inHospitalRegisterQueryDto, String searchKey, String registeredFlag, Integer pageNo, Integer pageSize, - Date startTime, Date endTime, Long organizationId, HttpServletRequest request) { + Date startTime, Date endTime, Long organizationId, String idCard, HttpServletRequest request) { Integer encounterStatus = EncounterZyStatus.TO_BE_REGISTERED.getValue(); // 待登记 + // startTime/endTime 直接传给 Mapper XML 参数，不通过 QueryWrapper + inHospitalRegisterQueryDto.setStartTime(null); + inHospitalRegisterQueryDto.setEndTime(null); // 构建查询条件 QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(inHospitalRegisterQueryDto, searchKey, - new HashSet<>(Arrays.asList("registrar", "source_name", "patient_name", "id_card")), request); + new HashSet<>(Arrays.asList("registrar", "source_name", "patient_name")), request); IPage inHospitalRegisterInfo = inHospitalRegisterAppMapper .getInHospitalRegisterInfo(new Page<>(pageNo, pageSize), EncounterClass.IMP.getValue(), encounterStatus, - registeredFlag, LocationForm.WARD.getValue(), startTime, endTime, organizationId, + registeredFlag, LocationForm.WARD.getValue(), startTime, endTime, organizationId, idCard, queryWrapper); inHospitalRegisterInfo.getRecords().forEach(e -> { // 性别 diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/controller/InHospitalRegisterController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/controller/InHospitalRegisterController.java index c01d80520..dadd2d6ed 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/controller/InHospitalRegisterController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/controller/InHospitalRegisterController.java @@ -8,6 +8,7 @@ import com.healthlink.his.web.inhospitalcharge.appservice.IInHospitalRegisterApp import com.healthlink.his.web.inhospitalcharge.dto.*; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; import java.util.Date; @@ -67,12 +68,13 @@ public class InHospitalRegisterController { @RequestParam(value = "registeredFlag") String registeredFlag, @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, - @RequestParam(value = "startTime", required = false) Date startTime, - @RequestParam(value = "endTime", required = false) Date endTime, + @RequestParam(value = "startTime", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime, + @RequestParam(value = "endTime", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime, @RequestParam(value = "organizationId", required = false) Long organizationId, + @RequestParam(value = "idCard", required = false) String idCard, HttpServletRequest request) { return R.ok(iInHospitalRegisterAppService.getRegisterInfo(inHospitalRegisterQueryDto, searchKey, registeredFlag, - pageNo, pageSize, startTime, endTime, organizationId, request)); + pageNo, pageSize, startTime, endTime, organizationId, idCard, request)); } /** diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java index aca7511a4..88b57dab9 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java @@ -93,4 +93,9 @@ public class AdvancePaymentInfoDto { */ private BigDecimal balanceAmount; + /** + * 费用类型（医保类型，如：职工医保） + */ + private String feeType; + } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java index ba27ad257..aa6952b9d 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java @@ -120,4 +120,14 @@ public class InHospitalRegisterQueryDto { */ @JsonSerialize(using = ToStringSerializer.class) private Long organizationId; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 入院科室名称 + */ + private String organizationName; } \ No newline at end of file diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java index 9302e5c64..275de9e25 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java @@ -39,6 +39,7 @@ public interface InHospitalRegisterAppMapper { @Param("registeredFlag") String registeredFlag, @Param("formEnum") Integer formEnum, @Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("organizationId") Long organizationId, + @Param("idCard") String idCard, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); /** diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/IDeathDiscussionAppService.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/IDeathDiscussionAppService.java new file mode 100644 index 000000000..bc733943f --- /dev/null +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/IDeathDiscussionAppService.java @@ -0,0 +1,14 @@ +package com.healthlink.his.web.mrhomepage.appservice; + +import com.healthlink.his.mrhomepage.domain.MrDeathDiscussion; + +import java.util.List; + +public interface IDeathDiscussionAppService { + + MrDeathDiscussion saveDiscussion(MrDeathDiscussion discussion); + + List getDiscussions(Long homepageId); + + List checkDeadline(); +} diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/IMrTrackingAppService.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/IMrTrackingAppService.java new file mode 100644 index 000000000..f7ece352a --- /dev/null +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/IMrTrackingAppService.java @@ -0,0 +1,15 @@ +package com.healthlink.his.web.mrhomepage.appservice; + +import com.healthlink.his.mrhomepage.domain.MrBorrowing; +import com.healthlink.his.mrhomepage.domain.MrTracking; + +import java.util.Map; + +public interface IMrTrackingAppService { + + Map trackStatus(Long homepageId); + + MrBorrowing borrowRecord(MrBorrowing borrowing); + + void returnRecord(Long borrowingId); +} diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/impl/DeathDiscussionAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/impl/DeathDiscussionAppServiceImpl.java new file mode 100644 index 000000000..3173cb0fb --- /dev/null +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/impl/DeathDiscussionAppServiceImpl.java @@ -0,0 +1,64 @@ +package com.healthlink.his.web.mrhomepage.appservice.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.healthlink.his.mrhomepage.domain.MrDeathDiscussion; +import com.healthlink.his.mrhomepage.service.IMrDeathDiscussionService; +import com.healthlink.his.web.mrhomepage.appservice.IDeathDiscussionAppService; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +@Service +public class DeathDiscussionAppServiceImpl implements IDeathDiscussionAppService { + + @Resource + private IMrDeathDiscussionService mrDeathDiscussionService; + + @Override + @Transactional + public MrDeathDiscussion saveDiscussion(MrDeathDiscussion discussion) { + if (discussion.getId() == null) { + if (discussion.getDeathDate() != null) { + Calendar cal = Calendar.getInstance(); + cal.setTime(discussion.getDeathDate()); + cal.add(Calendar.DAY_OF_MONTH, 7); + discussion.setDeadlineDate(cal.getTime()); + } + discussion.setIsOverdue(false); + discussion.setStatus(0); + } + mrDeathDiscussionService.saveOrUpdate(discussion); + return discussion; + } + + @Override + public List getDiscussions(Long homepageId) { + return mrDeathDiscussionService.list( + new LambdaQueryWrapper() + .eq(MrDeathDiscussion::getEncounterId, homepageId) + .orderByDesc(MrDeathDiscussion::getDiscussionDate) + ); + } + + @Override + public List checkDeadline() { + Date now = new Date(); + List overdue = mrDeathDiscussionService.list( + new LambdaQueryWrapper() + .le(MrDeathDiscussion::getDeadlineDate, now) + .eq(MrDeathDiscussion::getIsOverdue, false) + .eq(MrDeathDiscussion::getStatus, 0) + ); + for (MrDeathDiscussion d : overdue) { + d.setIsOverdue(true); + } + if (!overdue.isEmpty()) { + mrDeathDiscussionService.updateBatchById(overdue); + } + return overdue; + } +} diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/impl/MrTrackingAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/impl/MrTrackingAppServiceImpl.java new file mode 100644 index 000000000..ba4194772 --- /dev/null +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/appservice/impl/MrTrackingAppServiceImpl.java @@ -0,0 +1,105 @@ +package com.healthlink.his.web.mrhomepage.appservice.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.healthlink.his.mrhomepage.domain.MrBorrowing; +import com.healthlink.his.mrhomepage.domain.MrTracking; +import com.healthlink.his.mrhomepage.service.IMrBorrowingService; +import com.healthlink.his.mrhomepage.service.IMrTrackingService; +import com.healthlink.his.web.mrhomepage.appservice.IMrTrackingAppService; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class MrTrackingAppServiceImpl implements IMrTrackingAppService { + + @Resource + private IMrTrackingService trackingService; + + @Resource + private IMrBorrowingService borrowingService; + + @Override + public Map trackStatus(Long homepageId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MrTracking::getMedicalRecordId, homepageId) + .orderByDesc(MrTracking::getMoveTime); + List records = trackingService.list(wrapper); + + Map result = new HashMap<>(); + result.put("records", records); + + long inShelf = records.stream().filter(r -> "IN_SHELF".equals(r.getStatus())).count(); + long borrowed = records.stream().filter(r -> "BORROWED".equals(r.getStatus())).count(); + long archived = records.stream().filter(r -> "ARCHIVED".equals(r.getStatus())).count(); + long lost = records.stream().filter(r -> "LOST".equals(r.getStatus())).count(); + + Map stats = new HashMap<>(); + stats.put("inShelf", inShelf); + stats.put("borrowed", borrowed); + stats.put("archived", archived); + stats.put("lost", lost); + result.put("stats", stats); + + MrTracking current = records.isEmpty() ? null : records.get(0); + result.put("currentStatus", current != null ? current.getStatus() : "UNKNOWN"); + result.put("currentLocation", current != null ? current.getLocation() : null); + + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public MrBorrowing borrowRecord(MrBorrowing borrowing) { + borrowing.setStatus(0); + borrowing.setBorrowDate(new Date()); + borrowing.setCreateTime(new Date()); + borrowingService.save(borrowing); + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MrTracking::getMedicalRecordId, borrowing.getMedicalRecordId()) + .eq(MrTracking::getStatus, "IN_SHELF"); + MrTracking track = trackingService.getOne(wrapper); + if (track != null) { + track.setStatus("BORROWED"); + track.setLocation(borrowing.getBorrowerDept() != null ? borrowing.getBorrowerDept() : "借出"); + track.setLocationType("BORROWED"); + track.setMovedBy(borrowing.getBorrowerName()); + track.setMoveTime(new Date()); + trackingService.updateById(track); + } + + return borrowing; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void returnRecord(Long borrowingId) { + MrBorrowing borrowing = borrowingService.getById(borrowingId); + if (borrowing == null) { + throw new RuntimeException("借阅记录不存在"); + } + borrowing.setActualReturnDate(new Date()); + borrowing.setStatus(3); + borrowing.setUpdateTime(new Date()); + borrowingService.updateById(borrowing); + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MrTracking::getMedicalRecordId, borrowing.getMedicalRecordId()) + .eq(MrTracking::getStatus, "BORROWED"); + MrTracking track = trackingService.getOne(wrapper); + if (track != null) { + track.setStatus("IN_SHELF"); + track.setLocation("病案室"); + track.setLocationType("STORAGE"); + track.setMovedBy("系统自动归还"); + track.setMoveTime(new Date()); + trackingService.updateById(track); + } + } +} diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/controller/DeathDiscussionController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/controller/DeathDiscussionController.java new file mode 100644 index 000000000..365fc297d --- /dev/null +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/controller/DeathDiscussionController.java @@ -0,0 +1,42 @@ +package com.healthlink.his.web.mrhomepage.controller; + +import com.core.common.core.domain.R; +import com.healthlink.his.mrhomepage.domain.MrDeathDiscussion; +import com.healthlink.his.web.mrhomepage.appservice.IDeathDiscussionAppService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/api/v1/mr-homepage/death-discussion") +@Tag(name = "死亡病例讨论记录") +public class DeathDiscussionController { + + @Resource + private IDeathDiscussionAppService deathDiscussionAppService; + + @PostMapping("/save") + @PreAuthorize("hasAuthority('inpatient:mrhomepage:edit')") + @Operation(summary = "保存死亡病例讨论记录") + public R saveDiscussion(@RequestBody MrDeathDiscussion discussion) { + return R.ok(deathDiscussionAppService.saveDiscussion(discussion)); + } + + @GetMapping("/list/{homepageId}") + @PreAuthorize("hasAuthority('inpatient:mrhomepage:list')") + @Operation(summary = "查询死亡病例讨论记录列表") + public R> getDiscussions(@PathVariable Long homepageId) { + return R.ok(deathDiscussionAppService.getDiscussions(homepageId)); + } + + @GetMapping("/pending-deadline") + @PreAuthorize("hasAuthority('inpatient:mrhomepage:list')") + @Operation(summary = "查询7日到期未讨论记录") + public R> checkDeadline() { + return R.ok(deathDiscussionAppService.checkDeadline()); + } +} diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/controller/MrTrackingController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/controller/MrTrackingController.java new file mode 100644 index 000000000..82bdbf6d1 --- /dev/null +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/controller/MrTrackingController.java @@ -0,0 +1,43 @@ +package com.healthlink.his.web.mrhomepage.controller; + +import com.core.common.core.domain.R; +import com.healthlink.his.mrhomepage.domain.MrBorrowing; +import com.healthlink.his.web.mrhomepage.appservice.IMrTrackingAppService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +@RestController +@RequestMapping("/api/v1/mr-homepage/tracking") +@Tag(name = "病案示踪管理") +public class MrTrackingController { + + @Resource + private IMrTrackingAppService mrTrackingAppService; + + @GetMapping("/{homepageId}") + @PreAuthorize("hasAuthority('inpatient:mrhomepage:list')") + @Operation(summary = "查询病案示踪状态") + public R> trackStatus(@PathVariable Long homepageId) { + return R.ok(mrTrackingAppService.trackStatus(homepageId)); + } + + @PostMapping("/borrow") + @PreAuthorize("hasAuthority('inpatient:mrhomepage:edit')") + @Operation(summary = "病案借阅") + public R borrowRecord(@RequestBody MrBorrowing borrowing) { + return R.ok(mrTrackingAppService.borrowRecord(borrowing)); + } + + @PostMapping("/return") + @PreAuthorize("hasAuthority('inpatient:mrhomepage:edit')") + @Operation(summary = "病案归还") + public R returnRecord(@RequestParam Long borrowingId) { + mrTrackingAppService.returnRecord(borrowingId); + return R.ok(); + } +} diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/AdvancePaymentManageAppMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/AdvancePaymentManageAppMapper.xml index 13eb8ba83..a84a977e9 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/AdvancePaymentManageAppMapper.xml +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/AdvancePaymentManageAppMapper.xml @@ -18,7 +18,8 @@ api.inHospital_org_name, api.account_id, api.total_amount, - api.balance_amount + api.balance_amount, + api.fee_type from (SELECT ae.tenant_id, ae.ID AS encounter_id, ae.bus_no AS bus_no, @@ -34,7 +35,8 @@ aa.id AS account_id, COALESCE(payment.total_amount, 0) AS total_amount, COALESCE(payment.total_amount, 0) - COALESCE(consumption.consumption_amount, 0) + - COALESCE(return_pay.return_amount, 0) AS balance_amount + COALESCE(return_pay.return_amount, 0) AS balance_amount, + fee_info.fee_type AS fee_type FROM adm_encounter AS ae LEFT JOIN adm_patient AS ap ON ap.ID = ae.patient_id AND ap.delete_flag = '0' @@ -83,6 +85,14 @@ AND aci.status_enum IN (#{status3}) AND aci.encounter_id = ae.ID ) AS return_pay ON TRUE + LEFT JOIN LATERAL ( + SELECT fc.contract_name AS fee_type + FROM adm_account AS aa2 + LEFT JOIN fin_contract AS fc ON fc.bus_no = aa2.contract_no AND fc.delete_flag = '0' + WHERE aa2.encounter_id = ae.ID AND aa2.delete_flag = '0' + AND aa2.type_code != #{accountTypeCode} + LIMIT 1 + ) AS fee_info ON TRUE WHERE ae.delete_flag = '0' AND ae.status_enum != #{registeredFlag} AND ae.class_enum = #{classEnum} diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml index 2cb8459b9..38ed6edf6 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml @@ -53,6 +53,9 @@ AND ae.organization_id = #{organizationId} + + AND ap.id_card LIKE concat('%', #{idCard}, '%') + AND ae.status_enum = #{encounterStatus} diff --git a/healthlink-his-ui/src/api/mrhomepage.js b/healthlink-his-ui/src/api/mrhomepage.js index c7e750a91..42b95f211 100644 --- a/healthlink-his-ui/src/api/mrhomepage.js +++ b/healthlink-his-ui/src/api/mrhomepage.js @@ -6,3 +6,6 @@ export function getQualityResults(homepageId) { return request({ url: "/api/v1/m export function submitHqmsReport(homepageId, reportType) { return request({ url: "/api/v1/mr-homepage/hqms/report", method: "post", params: { homepageId, reportType } }) } export function getHqmsReportStatus(homepageId) { return request({ url: "/api/v1/mr-homepage/hqms/status/" + homepageId, method: "get" }) } export function listHqmsReports(homepageId) { return request({ url: "/api/v1/mr-homepage/hqms/list/" + homepageId, method: "get" }) } +export function trackStatus(homepageId) { return request({ url: "/api/v1/mr-homepage/tracking/" + homepageId, method: "get" }) } +export function borrowRecord(data) { return request({ url: "/api/v1/mr-homepage/tracking/borrow", method: "post", data }) } +export function returnRecord(borrowingId) { return request({ url: "/api/v1/mr-homepage/tracking/return", method: "post", params: { borrowingId } }) } diff --git a/healthlink-his-ui/src/api/mrhomepage/index.js b/healthlink-his-ui/src/api/mrhomepage/index.js index 7ed3eab61..1d3f5ecd4 100644 --- a/healthlink-his-ui/src/api/mrhomepage/index.js +++ b/healthlink-his-ui/src/api/mrhomepage/index.js @@ -11,3 +11,6 @@ export function getQualityResults(homepageId) { return request({ url: '/api/v1/m export function submitHqmsReport(homepageId, reportType) { return request({ url: '/api/v1/mr-homepage/hqms/report', method: 'post', params: { homepageId, reportType } }) } export function getHqmsReportStatus(homepageId) { return request({ url: '/api/v1/mr-homepage/hqms/status/' + homepageId, method: 'get' }) } export function listHqmsReports(homepageId) { return request({ url: '/api/v1/mr-homepage/hqms/list/' + homepageId, method: 'get' }) } +export function saveDeathDiscussion(data) { return request({ url: '/api/v1/mr-homepage/death-discussion/save', method: 'post', data }) } +export function listDeathDiscussions(homepageId) { return request({ url: '/api/v1/mr-homepage/death-discussion/list/' + homepageId, method: 'get' }) } +export function getPendingDeadline() { return request({ url: '/api/v1/mr-homepage/death-discussion/pending-deadline', method: 'get' }) } diff --git a/healthlink-his-ui/src/assets/icons.svg b/healthlink-his-ui/src/assets/icons.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/amethyst.svg b/healthlink-his-ui/src/assets/icons/svg/amethyst.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/amethyst.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/analyze.svg b/healthlink-his-ui/src/assets/icons/svg/analyze.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/analyze.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/approve-check.svg b/healthlink-his-ui/src/assets/icons/svg/approve-check.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/approve-check.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/ash.svg b/healthlink-his-ui/src/assets/icons/svg/ash.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/ash.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/assess.svg b/healthlink-his-ui/src/assets/icons/svg/assess.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/assess.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/audit-check.svg b/healthlink-his-ui/src/assets/icons/svg/audit-check.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/audit-check.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/aurora.svg b/healthlink-his-ui/src/assets/icons/svg/aurora.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/aurora.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/authorize-check.svg b/healthlink-his-ui/src/assets/icons/svg/authorize-check.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/authorize-check.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/basalt.svg b/healthlink-his-ui/src/assets/icons/svg/basalt.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/basalt.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/beryl.svg b/healthlink-his-ui/src/assets/icons/svg/beryl.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/beryl.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/blessed.svg b/healthlink-his-ui/src/assets/icons/svg/blessed.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/blessed.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/brilliance.svg b/healthlink-his-ui/src/assets/icons/svg/brilliance.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/brilliance.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/celestial.svg b/healthlink-his-ui/src/assets/icons/svg/celestial.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/celestial.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/certify-check.svg b/healthlink-his-ui/src/assets/icons/svg/certify-check.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/certify-check.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/chalk.svg b/healthlink-his-ui/src/assets/icons/svg/chalk.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/chalk.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/citrine.svg b/healthlink-his-ui/src/assets/icons/svg/citrine.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/citrine.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/clay.svg b/healthlink-his-ui/src/assets/icons/svg/clay.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/clay.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/cloud-rain.svg b/healthlink-his-ui/src/assets/icons/svg/cloud-rain.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/cloud-rain.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/cloud-sun.svg b/healthlink-his-ui/src/assets/icons/svg/cloud-sun.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/cloud-sun.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/compost.svg b/healthlink-his-ui/src/assets/icons/svg/compost.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/compost.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/conclude.svg b/healthlink-his-ui/src/assets/icons/svg/conclude.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/conclude.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/condensation.svg b/healthlink-his-ui/src/assets/icons/svg/condensation.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/condensation.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/confirm-check.svg b/healthlink-his-ui/src/assets/icons/svg/confirm-check.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/confirm-check.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/consecrate.svg b/healthlink-his-ui/src/assets/icons/svg/consecrate.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/consecrate.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/consecrated.svg b/healthlink-his-ui/src/assets/icons/svg/consecrated.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/consecrated.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/consider.svg b/healthlink-his-ui/src/assets/icons/svg/consider.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/consider.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/contemplate.svg b/healthlink-his-ui/src/assets/icons/svg/contemplate.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/contemplate.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/coral.svg b/healthlink-his-ui/src/assets/icons/svg/coral.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/coral.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/crystal.svg b/healthlink-his-ui/src/assets/icons/svg/crystal.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/crystal.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/current.svg b/healthlink-his-ui/src/assets/icons/svg/current.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/current.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/cyclone.svg b/healthlink-his-ui/src/assets/icons/svg/cyclone.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/cyclone.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/dazzling.svg b/healthlink-his-ui/src/assets/icons/svg/dazzling.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/dazzling.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/dedicate.svg b/healthlink-his-ui/src/assets/icons/svg/dedicate.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/dedicate.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/dedication.svg b/healthlink-his-ui/src/assets/icons/svg/dedication.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/dedication.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/deduce.svg b/healthlink-his-ui/src/assets/icons/svg/deduce.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/deduce.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/deliberate.svg b/healthlink-his-ui/src/assets/icons/svg/deliberate.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/deliberate.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/devote.svg b/healthlink-his-ui/src/assets/icons/svg/devote.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/devote.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/dew.svg b/healthlink-his-ui/src/assets/icons/svg/dew.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/dew.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/diamond.svg b/healthlink-his-ui/src/assets/icons/svg/diamond.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/diamond.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/divine.svg b/healthlink-his-ui/src/assets/icons/svg/divine.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/divine.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/drop.svg b/healthlink-his-ui/src/assets/icons/svg/drop.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/drop.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/drought.svg b/healthlink-his-ui/src/assets/icons/svg/drought.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/drought.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/dust.svg b/healthlink-his-ui/src/assets/icons/svg/dust.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/dust.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/earthquake.svg b/healthlink-his-ui/src/assets/icons/svg/earthquake.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/earthquake.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/emerald.svg b/healthlink-his-ui/src/assets/icons/svg/emerald.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/emerald.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/endorse-check.svg b/healthlink-his-ui/src/assets/icons/svg/endorse-check.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/endorse-check.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/evaluate.svg b/healthlink-his-ui/src/assets/icons/svg/evaluate.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/evaluate.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/examine.svg b/healthlink-his-ui/src/assets/icons/svg/examine.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/examine.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/fertilizer.svg b/healthlink-his-ui/src/assets/icons/svg/fertilizer.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/fertilizer.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/fire.svg b/healthlink-his-ui/src/assets/icons/svg/fire.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/fire.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/flood.svg b/healthlink-his-ui/src/assets/icons/svg/flood.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/flood.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/fog.svg b/healthlink-his-ui/src/assets/icons/svg/fog.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/fog.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/frost.svg b/healthlink-his-ui/src/assets/icons/svg/frost.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/frost.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/garnet.svg b/healthlink-his-ui/src/assets/icons/svg/garnet.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/garnet.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/gem.svg b/healthlink-his-ui/src/assets/icons/svg/gem.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/gem.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/glint.svg b/healthlink-his-ui/src/assets/icons/svg/glint.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/glint.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/glorious.svg b/healthlink-his-ui/src/assets/icons/svg/glorious.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/glorious.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/glow.svg b/healthlink-his-ui/src/assets/icons/svg/glow.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/glow.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/granite.svg b/healthlink-his-ui/src/assets/icons/svg/granite.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/granite.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/gravel.svg b/healthlink-his-ui/src/assets/icons/svg/gravel.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/gravel.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/halo.svg b/healthlink-his-ui/src/assets/icons/svg/halo.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/halo.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/haze.svg b/healthlink-his-ui/src/assets/icons/svg/haze.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/haze.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/heavenly.svg b/healthlink-his-ui/src/assets/icons/svg/heavenly.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/heavenly.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/holy.svg b/healthlink-his-ui/src/assets/icons/svg/holy.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/holy.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/hurricane.svg b/healthlink-his-ui/src/assets/icons/svg/hurricane.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/hurricane.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/hypothesize.svg b/healthlink-his-ui/src/assets/icons/svg/hypothesize.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/hypothesize.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/ice.svg b/healthlink-his-ui/src/assets/icons/svg/ice.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/ice.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/illusion.svg b/healthlink-his-ui/src/assets/icons/svg/illusion.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/illusion.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/induce.svg b/healthlink-his-ui/src/assets/icons/svg/induce.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/induce.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/infer.svg b/healthlink-his-ui/src/assets/icons/svg/infer.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/infer.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/inspect.svg b/healthlink-his-ui/src/assets/icons/svg/inspect.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/inspect.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/jade.svg b/healthlink-his-ui/src/assets/icons/svg/jade.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/jade.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/judge.svg b/healthlink-his-ui/src/assets/icons/svg/judge.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/judge.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/land.svg b/healthlink-his-ui/src/assets/icons/svg/land.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/land.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/landslide.svg b/healthlink-his-ui/src/assets/icons/svg/landslide.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/landslide.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/lapis.svg b/healthlink-his-ui/src/assets/icons/svg/lapis.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/lapis.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/lightning.svg b/healthlink-his-ui/src/assets/icons/svg/lightning.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/lightning.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/limestone.svg b/healthlink-his-ui/src/assets/icons/svg/limestone.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/limestone.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/luminance.svg b/healthlink-his-ui/src/assets/icons/svg/luminance.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/luminance.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/lustrous.svg b/healthlink-his-ui/src/assets/icons/svg/lustrous.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/lustrous.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/luxuriant.svg b/healthlink-his-ui/src/assets/icons/svg/luxuriant.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/luxuriant.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/magnificent.svg b/healthlink-his-ui/src/assets/icons/svg/magnificent.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/magnificent.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/majestic.svg b/healthlink-his-ui/src/assets/icons/svg/majestic.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/majestic.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/marble.svg b/healthlink-his-ui/src/assets/icons/svg/marble.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/marble.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/meditate.svg b/healthlink-his-ui/src/assets/icons/svg/meditate.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/meditate.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/mist.svg b/healthlink-his-ui/src/assets/icons/svg/mist.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/mist.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/mud.svg b/healthlink-his-ui/src/assets/icons/svg/mud.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/mud.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/observe.svg b/healthlink-his-ui/src/assets/icons/svg/observe.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/observe.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/offering.svg b/healthlink-his-ui/src/assets/icons/svg/offering.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/offering.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/onyx.svg b/healthlink-his-ui/src/assets/icons/svg/onyx.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/onyx.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/opal.svg b/healthlink-his-ui/src/assets/icons/svg/opal.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/opal.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/pearl.svg b/healthlink-his-ui/src/assets/icons/svg/pearl.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/pearl.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/pebble.svg b/healthlink-his-ui/src/assets/icons/svg/pebble.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/pebble.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/plant.svg b/healthlink-his-ui/src/assets/icons/svg/plant.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/plant.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/ponder.svg b/healthlink-his-ui/src/assets/icons/svg/ponder.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/ponder.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/pray.svg b/healthlink-his-ui/src/assets/icons/svg/pray.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/pray.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/presentation.svg b/healthlink-his-ui/src/assets/icons/svg/presentation.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/presentation.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/quartz.svg b/healthlink-his-ui/src/assets/icons/svg/quartz.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/quartz.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/radiance.svg b/healthlink-his-ui/src/assets/icons/svg/radiance.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/radiance.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/radiant.svg b/healthlink-his-ui/src/assets/icons/svg/radiant.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/radiant.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/rain.svg b/healthlink-his-ui/src/assets/icons/svg/rain.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/rain.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/rainbow.svg b/healthlink-his-ui/src/assets/icons/svg/rainbow.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/rainbow.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/ratify-check.svg b/healthlink-his-ui/src/assets/icons/svg/ratify-check.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/ratify-check.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/reason.svg b/healthlink-his-ui/src/assets/icons/svg/reason.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/reason.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/reflect.svg b/healthlink-his-ui/src/assets/icons/svg/reflect.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/reflect.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/reflection.svg b/healthlink-his-ui/src/assets/icons/svg/reflection.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/reflection.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/resplendent.svg b/healthlink-his-ui/src/assets/icons/svg/resplendent.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/resplendent.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/review-check.svg b/healthlink-his-ui/src/assets/icons/svg/review-check.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/review-check.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/ripple.svg b/healthlink-his-ui/src/assets/icons/svg/ripple.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/ripple.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/rock.svg b/healthlink-his-ui/src/assets/icons/svg/rock.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/rock.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/ruby.svg b/healthlink-his-ui/src/assets/icons/svg/ruby.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/ruby.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/sacred.svg b/healthlink-his-ui/src/assets/icons/svg/sacred.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/sacred.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/sacrifice.svg b/healthlink-his-ui/src/assets/icons/svg/sacrifice.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/sacrifice.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/sanctified.svg b/healthlink-his-ui/src/assets/icons/svg/sanctified.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/sanctified.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/sand.svg b/healthlink-his-ui/src/assets/icons/svg/sand.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/sand.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/sandstone.svg b/healthlink-his-ui/src/assets/icons/svg/sandstone.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/sandstone.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/sapphire.svg b/healthlink-his-ui/src/assets/icons/svg/sapphire.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/sapphire.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/scrutinize.svg b/healthlink-his-ui/src/assets/icons/svg/scrutinize.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/scrutinize.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/seed.svg b/healthlink-his-ui/src/assets/icons/svg/seed.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/seed.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/shimmer.svg b/healthlink-his-ui/src/assets/icons/svg/shimmer.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/shimmer.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/slate.svg b/healthlink-his-ui/src/assets/icons/svg/slate.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/slate.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/smoke.svg b/healthlink-his-ui/src/assets/icons/svg/smoke.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/smoke.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/snow.svg b/healthlink-his-ui/src/assets/icons/svg/snow.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/snow.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/snowflake.svg b/healthlink-his-ui/src/assets/icons/svg/snowflake.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/snowflake.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/soil.svg b/healthlink-his-ui/src/assets/icons/svg/soil.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/soil.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/sparkle.svg b/healthlink-his-ui/src/assets/icons/svg/sparkle.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/sparkle.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/speculate.svg b/healthlink-his-ui/src/assets/icons/svg/speculate.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/speculate.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/splash.svg b/healthlink-his-ui/src/assets/icons/svg/splash.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/splash.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/splendid.svg b/healthlink-his-ui/src/assets/icons/svg/splendid.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/splendid.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/splendor.svg b/healthlink-his-ui/src/assets/icons/svg/splendor.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/splendor.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/steam.svg b/healthlink-his-ui/src/assets/icons/svg/steam.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/steam.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/storm.svg b/healthlink-his-ui/src/assets/icons/svg/storm.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/storm.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/sun.svg b/healthlink-his-ui/src/assets/icons/svg/sun.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/sun.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/survey-check.svg b/healthlink-his-ui/src/assets/icons/svg/survey-check.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/survey-check.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/theorize.svg b/healthlink-his-ui/src/assets/icons/svg/theorize.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/theorize.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/think.svg b/healthlink-his-ui/src/assets/icons/svg/think.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/think.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/thunder.svg b/healthlink-his-ui/src/assets/icons/svg/thunder.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/thunder.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/topaz.svg b/healthlink-his-ui/src/assets/icons/svg/topaz.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/topaz.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/tornado.svg b/healthlink-his-ui/src/assets/icons/svg/tornado.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/tornado.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/tourmaline.svg b/healthlink-his-ui/src/assets/icons/svg/tourmaline.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/tourmaline.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/tsunami.svg b/healthlink-his-ui/src/assets/icons/svg/tsunami.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/tsunami.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/typhoon.svg b/healthlink-his-ui/src/assets/icons/svg/typhoon.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/typhoon.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/validate-check.svg b/healthlink-his-ui/src/assets/icons/svg/validate-check.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/validate-check.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/vapor.svg b/healthlink-his-ui/src/assets/icons/svg/vapor.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/vapor.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/verify-check.svg b/healthlink-his-ui/src/assets/icons/svg/verify-check.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/verify-check.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/volcano.svg b/healthlink-his-ui/src/assets/icons/svg/volcano.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/volcano.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/water.svg b/healthlink-his-ui/src/assets/icons/svg/water.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/water.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/wave.svg b/healthlink-his-ui/src/assets/icons/svg/wave.svg new file mode 100644 index 000000000..1c59a15b2 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/wave.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/wind.svg b/healthlink-his-ui/src/assets/icons/svg/wind.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/wind.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/worship.svg b/healthlink-his-ui/src/assets/icons/svg/worship.svg new file mode 100644 index 000000000..815bc8555 --- /dev/null +++ b/healthlink-his-ui/src/assets/icons/svg/worship.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/views/catalog/device/components/deviceDialog.vue b/healthlink-his-ui/src/views/catalog/device/components/deviceDialog.vue index e0a48b706..f80e34015 100755 --- a/healthlink-his-ui/src/views/catalog/device/components/deviceDialog.vue +++ b/healthlink-his-ui/src/views/catalog/device/components/deviceDialog.vue @@ -533,14 +533,10 @@ const { device_type_code, unit_code, fin_type_code, chrgitm_lv, med_chrgitm_type 'med_chrgitm_type' ); -const title = ref(''); const visible = ref(false); const emits = defineEmits(['submit']); // 声明自定义事件 const deptOptions = ref(undefined); // 部门树选项 const locationOptions = ref(undefined); // 地点树选项 -const deviceCategories = ref([]); // 器材分类 -const statusFlagOptions = ref([]); // 状态标记 -const supplierListOptions = ref([]); // 供应商列表 const unitCodeOptions = ref([]); // 包装单位选项列表（用于搜索） const unitCodeLoading = ref(false); // 包装单位搜索加载状态 @@ -603,12 +599,7 @@ function handleImportYb() { // 显示弹框 function show() { reset(); - title.value = ''; - title.value = props.title; - deviceCategories.value = props.deviceCategories; - statusFlagOptions.value = props.statusFlagOptions; form.value.categoryCode = props.currentCategoryEnum; - supplierListOptions.value = props.supplierListOptions; form.value.partPercent = 1; form.value.itemTypeCode = '2005'; form.value.ybType = '08'; @@ -647,13 +638,8 @@ function getLocationTree() { // 显示弹框 function edit() { reset(); - title.value = ''; - title.value = props.title; form.value = props.item; form.value.chrgitmLv = form.value.chrgitmLv ? form.value.chrgitmLv.toString() : undefined; - deviceCategories.value = props.deviceCategories; - statusFlagOptions.value = props.statusFlagOptions; - supplierListOptions.value = props.supplierListOptions; getDeptTree(); getLocationTree(); // 初始化包装单位列表 diff --git a/healthlink-his-ui/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue b/healthlink-his-ui/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue index 325a3f41d..f6976cf8d 100755 --- a/healthlink-his-ui/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue +++ b/healthlink-his-ui/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue @@ -507,16 +507,11 @@ const { specimen_code, unit_code, med_chrgitm_type, fin_type_code, activity_cate ); const isTemplateActive = ref(true); -const title = ref(''); const visible = ref(false); const emits = defineEmits(['submit']); // 声明自定义事件 const deptOptions = ref(undefined); // 部门树选项 const bodyOptions = ref(undefined); // 身体部位树选项 const locationOptions = ref(undefined); // 地点树选项 -const diagnosisCategoryOptions = ref(undefined); -const statusFlagOptions = ref(undefined); -const exeOrganizations = ref(undefined); -const typeEnumOptions = ref(undefined); const diagnosisTreatmentList = ref([]); // 使用单位过滤后的选项 const filteredUnitCode = ref([]); @@ -639,12 +634,6 @@ function show() { filteredUnitCode.value = []; isFilteringUnitCode.value = false; - title.value = ''; - title.value = props.title; - diagnosisCategoryOptions.value = props.diagnosisCategoryOptions; - statusFlagOptions.value = props.statusFlagOptions; - exeOrganizations.value = props.exeOrganizations; - typeEnumOptions.value = props.typeEnumOptions; form.value.categoryCode = props.currentCategoryEnum; form.value.isEditInfoDisable = props.isEditInfoDisable; visible.value = true; @@ -669,8 +658,6 @@ function edit() { // 重置使用单位过滤 filteredUnitCode.value = []; isFilteringUnitCode.value = false; - title.value = ''; - title.value = props.title; form.value = props.item; form.value.chrgitmLv = form.value.chrgitmLv ? form.value.chrgitmLv.toString() : undefined; // 所属科室：如果后端无法翻译科室名称（orgId_dictText为空），则清空orgId， @@ -697,10 +684,6 @@ function edit() { form.value.permittedUnitCode = form.value.permittedUnitCode ? form.value.permittedUnitCode.toString() : undefined; - diagnosisCategoryOptions.value = props.diagnosisCategoryOptions; - statusFlagOptions.value = props.statusFlagOptions; - exeOrganizations.value = props.exeOrganizations; - typeEnumOptions.value = props.typeEnumOptions; visible.value = true; // 编辑时计算初始总价 diff --git a/healthlink-his-ui/src/views/inHospitalManagement/charge/advanceDeposit/index.vue b/healthlink-his-ui/src/views/inHospitalManagement/charge/advanceDeposit/index.vue index 7d5bbae2d..241b089d3 100755 --- a/healthlink-his-ui/src/views/inHospitalManagement/charge/advanceDeposit/index.vue +++ b/healthlink-his-ui/src/views/inHospitalManagement/charge/advanceDeposit/index.vue @@ -8,29 +8,28 @@ - - 住院号： - - - 查询 - - - + + 住院号： + + + 查询 + + + + + - + 在院科室/病区: {{ patientInfo.inHospitalOrgName }} / - {{ - patientInfo.wardName + - formatValue(patientInfo.houseName) + - formatValue(patientInfo.bedName) - }} + {{ patientInfo.wardName + formatValue(patientInfo.houseName) }} - + + 床号: + + {{ patientInfo.bedName || '--' }} + + + + 费用类型: + + {{ patientInfo.feeType || '自费' }} + + + + + 重置 @@ -59,9 +77,15 @@ align="center" > + + + + diff --git a/healthlink-his-ui/src/views/mrhomepage/tracking/index.vue b/healthlink-his-ui/src/views/mrhomepage/tracking/index.vue new file mode 100644 index 000000000..beeb3f807 --- /dev/null +++ b/healthlink-his-ui/src/views/mrhomepage/tracking/index.vue @@ -0,0 +1,267 @@ + + + + +