后端最新版本同步

openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java

@@ -149,4 +149,21 @@ public interface ICommonService {
      * @return 病区列表
      */
     List<LocationDto> getPractitionerWard();
+
+    /**
+     * 查询参与者下拉列表
+     *
+     * @param searchKey 模糊查询关键字
+     * @return 参与者下拉列表
+     */
+    R<?> getPractitionerList(String searchKey);
+
+    /**
+     * 查询医嘱打印信息
+     *
+     * @param requestIds 请求ids
+     * @param isPrescription 是否为处方
+     * @return 医嘱打印单
+     */
+    R<?> getAdvicePrintInfo(List<Long> requestIds, String isPrescription);
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/impl/CommonServiceImpl.java

@@ -15,10 +15,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
+import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
 import com.core.common.utils.bean.BeanUtils;
 import com.openhis.administration.domain.Location;
+import com.openhis.administration.domain.Organization;
 import com.openhis.administration.domain.TraceNoManage;
 import com.openhis.administration.mapper.TraceNoManageMapper;
 import com.openhis.administration.service.ILocationService;
@@ -36,7 +38,6 @@ import com.openhis.web.common.dto.*;
 import com.openhis.web.common.mapper.CommonAppMapper;
 import com.openhis.workflow.domain.InventoryItem;
 import com.openhis.workflow.service.IInventoryItemService;
-import com.openhis.administration.domain.Organization;
 
 /**
  * app常用接口
@@ -301,7 +302,7 @@ public class CommonServiceImpl implements ICommonService {
      * @return 科室列表
      */
     @Override
-    public List<Organization> departmentList(){
+    public List<Organization> departmentList() {
         return organizationService.getList(OrganizationType.DEPARTMENT.getValue(), null);
     }
 
@@ -451,4 +452,43 @@ public class CommonServiceImpl implements ICommonService {
         }
         return locationDtoList;
     }
+
+    /**
+     * 查询参与者下拉列表
+     *
+     * @param searchKey 模糊查询关键字
+     * @return 参与者下拉列表
+     */
+    @Override
+    public R<?> getPractitionerList(String searchKey) {
+        return R.ok(commonAppMapper.getPractitionerList(searchKey));
+    }
+
+    /**
+     * 查询医嘱打印信息
+     *
+     * @param requestIds 请求ids
+     * @param isPrescription 是否为处方
+     * @return 医嘱打印单
+     */
+    @Override
+    public R<?> getAdvicePrintInfo(List<Long> requestIds, String isPrescription) {
+        AdvicePrintInfoDto advicePrintInfoDto;
+        if (Whether.YES.getCode().equals(isPrescription)) {
+            // 查询处方单
+            advicePrintInfoDto = commonAppMapper.selectPrescriptionPrintInfo(requestIds);
+        } else {
+            // 查询处置单
+            advicePrintInfoDto = commonAppMapper.selectTreatmentPrintInfo(requestIds);
+        }
+        advicePrintInfoDto
+            .setAge(advicePrintInfoDto.getBirthDate() != null
+                ? AgeCalculatorUtil.getAge(advicePrintInfoDto.getBirthDate()) : "")
+            .setGenderEnum_enumText(
+                EnumUtils.getInfoByValue(AdministrativeGender.class, advicePrintInfoDto.getGenderEnum()))
+            .setEncounterYbClass_enumText(
+                EnumUtils.getInfoByValue(EncounterYbClass.class, advicePrintInfoDto.getEncounterYbClass()));
+        return R.ok(advicePrintInfoDto);
+    }
+
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java

@@ -7,6 +7,8 @@ import java.util.List;
 
 import javax.annotation.Resource;
 
+import com.openhis.common.enums.Whether;
+import com.openhis.web.common.dto.AdvicePrintInfoDto;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -198,4 +200,28 @@ public class CommonAppController {
     public List<LocationDto> getPractitionerWard() {
         return commonService.getPractitionerWard();
     }
+
+    /**
+     * 查询参与者下拉列表
+     * 
+     * @param searchKey 模糊查询关键字
+     * @return 参与者下拉列表
+     */
+    @GetMapping(value = "/practitioner-list")
+    public R<?> getPractitionerList(@RequestParam(value = "searchKey", required = false) String searchKey) {
+        return commonService.getPractitionerList(searchKey);
+    }
+
+    /**
+     * 查询医嘱打印信息
+     *
+     * @param requestIds 请求ids
+     * @param isPrescription 是否为处方
+     * @return 医嘱打印单
+     */
+    @GetMapping("/advice-print")
+    public R<?> getAdvicePrintInfo(@RequestParam(value = "requestIds") List<Long> requestIds, String isPrescription) {
+        return commonService.getAdvicePrintInfo(requestIds,isPrescription);
+    }
+
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdviceItemPrintInfoDto.java

@@ -0,0 +1,95 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.common.dto;
+
+import java.math.BigDecimal;
+
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 医嘱项目打印信息
+ *
+ * @author zwh
+ * @date 2025-09-16
+ */
+@Data
+@Accessors(chain = true)
+public class AdviceItemPrintInfoDto {
+
+    /**
+     * 数量
+     */
+    private Integer quantity;
+
+    /**
+     * 单价
+     */
+    private BigDecimal unitPrice;
+
+    /**
+     * 总价
+     */
+    private BigDecimal totalPrice;
+
+    /**
+     * 项目名称
+     */
+    private String itemName;
+
+    /**
+     * 规格
+     */
+    private String totalVolume;
+
+    /**
+     * 单次剂量
+     */
+    private BigDecimal dose;
+
+    /**
+     * 用药频次
+     */
+    @Dict(dictCode = "rate_code")
+    private String rateCode;
+    private String rateCode_dictText;
+
+    /**
+     * 用法
+     */
+    @Dict(dictCode = "method_code")
+    private String methodCode;
+    private String methodCode_dictText;
+
+    /**
+     * 剂量单位
+     */
+    @Dict(dictCode = "unit_code")
+    private String doseUnitCode;
+    private String doseUnitCode_dictText;
+
+    /**
+     * 单位
+     */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /**
+     * 处方号
+     */
+    private String prescriptionNo;
+
+    /**
+     * 分组号
+     */
+    private Long groupId;
+
+    /**
+     * 排序号
+     */
+    private Integer sortNumber;
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdvicePrintInfoDto.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.common.dto;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import com.openhis.common.annotation.Dict;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 处方信息
+ *
+ * @author zwh
+ * @date 2025-09-16
+ */
+@Data
+@Accessors(chain = true)
+public class AdvicePrintInfoDto {
+
+    /** 科室 */
+    private String departmentName;
+
+    /** 患者姓名 */
+    private String patientName;
+
+    /** 电话 */
+    private String phone;
+
+    /**
+     * 就诊编码
+     */
+    private String encounterNo;
+
+    /** 性别 */
+    private Integer genderEnum;
+    private String genderEnum_enumText;
+
+    /** 年龄 */
+    private String age;
+
+    /** 生日 */
+    private Date birthDate;
+
+    /** 开具日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reqTime;
+
+    /**
+     * 费用性质
+     */
+    private String contractName;
+
+    /**
+     * 诊断名称
+     */
+    private String conditionName;
+
+    /**
+     * 开单医生
+     */
+    private String doctorName;
+
+    /**
+     * 发药医生
+     */
+    private String dispenseDoctorName;
+
+    /**
+     * 配药医生
+     */
+    private String preparerDoctorName;
+
+    /**
+     * 收费医生
+     */
+    private String chargeDoctorName;
+
+    /** 就诊类型 */
+    private Integer encounterYbClass;
+    private String encounterYbClass_enumText;
+
+    /**
+     * 单位
+     */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /**
+     * 医嘱项目打印列表
+     */
+    private List<AdviceItemPrintInfoDto> adviceItemList;
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformInfoDto.java

@@ -26,10 +26,6 @@ public class PerformInfoDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long requestId;
 
-    /** 医嘱项目id */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long itemId;
-
     /** 住院id */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long encounterId;
@@ -45,20 +41,20 @@ public class PerformInfoDto {
     /** 请求所在表 */
     private String requestTable;
 
+    /** 执行时间列表 */
+    private List<String> executeTimes;
+
     /** 执行位置 */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long locationId;
 
+    /** 分组id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long groupId;
+
     /** 执行开始时间 */
     private Date exeStartTime;
 
     /** 执行结束时间 */
     private Date exeEndTime;
-
-    /** 组号 */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long groupId;
-
-    /** 执行时间列表 */
-    private List<String> executeTimes;
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PractitionerInfoDto.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.common.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 参与者dto
+ *
+ * @author zwh
+ * @date 2025-04-01
+ */
+@Data
+@Accessors(chain = true)
+public class PractitionerInfoDto {
+
+    /**
+     * 参与者id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long practitionerId;
+
+    /**
+     * 参与者名称
+     */
+    private String practitionerName;
+
+    /**
+     * 科室名称
+     */
+    private String organizationName;
+
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/mapper/CommonAppMapper.java

@@ -5,7 +5,6 @@ package com.openhis.web.common.mapper;
 
 import java.util.List;
 
-import com.openhis.administration.domain.TraceNoManage;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -13,9 +12,8 @@ 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.common.dto.InventoryItemDto;
-import com.openhis.web.common.dto.InventoryItemParam;
-import com.openhis.web.common.dto.LocationInventoryDto;
+import com.openhis.administration.domain.TraceNoManage;
+import com.openhis.web.common.dto.*;
 
 /**
  * app常用接口 mapper
@@ -62,8 +60,32 @@ public interface CommonAppMapper {
     /**
      * 查询追溯码信息
      *
-     * @param traceNo  追溯码
+     * @param traceNo 追溯码
      * @return
      */
     TraceNoManage getInfoByTraceNo(@Param("traceNo") String traceNo);
+
+    /**
+     * 查询参与者下拉列表
+     *
+     * @param searchKey 模糊查询关键字
+     * @return 参与者下拉列表
+     */
+    List<PractitionerInfoDto> getPractitionerList(@Param("searchKey") String searchKey);
+
+    /**
+     * 查询处方打印信息
+     *
+     * @param requestIds 请求ids
+     * @return 处方打印信息
+     */
+    AdvicePrintInfoDto selectPrescriptionPrintInfo(@Param("requestIds") List<Long> requestIds);
+
+    /**
+     * 查询处置打印信息
+     *
+     * @param requestIds 请求ids
+     * @return 处置打印信息
+     */
+    AdvicePrintInfoDto selectTreatmentPrintInfo(@Param("requestIds") List<Long> requestIds);
 }