wangjunping/his
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
liupanting
2025-02-24 15:25:23 +08:00
parent 3c82374029 0ad32e695d
commit e4764d9f8c
73 changed files with 1594 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java
View File

@@ -4,10 +4,14 @@
package com.openhis.web.datadictionary.controller;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.core.common.enums.AssignSeqEnum;
import com.core.common.utils.AssignSeqUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -22,14 +26,11 @@ import com.openhis.administration.domain.ChargeItemDefApp;
import com.openhis.administration.domain.ChargeItemDefinition;
import com.openhis.administration.service.IChargeItemDefAppService;
import com.openhis.administration.service.IChargeItemDefinitionService;
import com.openhis.administration.service.IDeviceDefinitionService;
import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.medication.service.IMedicationDefinitionService;
import com.openhis.web.datadictionary.dto.ChargeItemDefPageDto;
import com.openhis.web.datadictionary.dto.ItemDefSearchParam;
import com.openhis.web.datadictionary.dto.ItemDefinitionDto;
import com.openhis.web.datadictionary.mapper.ChargeItemDefSearchMapper;
import com.openhis.workflow.service.IActivityDefinitionService;
import lombok.extern.slf4j.Slf4j;
@@ -50,12 +51,14 @@ public class ItemDefinitionController {
private IChargeItemDefAppService chargeItemDefAppService;
@Autowired(required = false)
private ChargeItemDefSearchMapper chargeItemDefSearchMapper;
// @Autowired(required = false)
// private IMedicationDefinitionService medicationDefinitionService;
// @Autowired(required = false)
// private IDeviceDefinitionService deviceDefinitionService;
// @Autowired(required = false)
// private IActivityDefinitionService activityDefinitionService;
@Autowired(required = false)
private IMedicationDefinitionService medicationDefinitionService;
@Autowired(required = false)
private IDeviceDefinitionService deviceDefinitionService;
@Autowired(required = false)
private IActivityDefinitionService activityDefinitionService;
private AssignSeqUtil assignSeqUtil;
/**
* 项目定价列表
@@ -130,8 +133,10 @@ public class ItemDefinitionController {
}
// 通过 DefinitionType 区分药品定价/器具定价/手术定价
if (DefinitionTypeEnum.MEDICATION.getCode().equals(itemDefSearchParam.getDefinitionType())) {
//获取定价列表
chargeItemDefinitionList =
chargeItemDefSearchMapper.getMedList(itemDefSearchParam, pageNo, pageSize, skipCount);
//设置分页条件
chargeItemDefinitionPage.setSize(pageSize);
chargeItemDefinitionPage.setCurrent(pageNo);
if (chargeItemDefinitionList.size() > 0) {
@@ -141,10 +146,13 @@ public class ItemDefinitionController {
chargeItemDefinitionPage.setTotal(0);
chargeItemDefinitionPage.setRecords(new ArrayList<>());
}
return R.ok(chargeItemDefinitionPage);
return R.ok(chargeItemDefinitionPage,
MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null));
} else if (DefinitionTypeEnum.DEVICE.getCode().equals(itemDefSearchParam.getDefinitionType())) {
//获取定价列表
chargeItemDefinitionList =
chargeItemDefSearchMapper.getDevList(itemDefSearchParam, pageNo, pageSize, skipCount);
//设置分页条件
chargeItemDefinitionPage.setSize(pageSize);
chargeItemDefinitionPage.setCurrent(pageNo);
if (chargeItemDefinitionList.size() > 0) {
@@ -154,10 +162,13 @@ public class ItemDefinitionController {
chargeItemDefinitionPage.setTotal(0);
chargeItemDefinitionPage.setRecords(new ArrayList<>());
}
return R.ok(chargeItemDefinitionPage);
return R.ok(chargeItemDefinitionPage,
MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null));
} else if (DefinitionTypeEnum.ACTIVITY.getCode().equals(itemDefSearchParam.getDefinitionType())) {
//获取定价列表
chargeItemDefinitionList =
chargeItemDefSearchMapper.getActList(itemDefSearchParam, pageNo, pageSize, skipCount);
//设置分页条件
chargeItemDefinitionPage.setSize(pageSize);
chargeItemDefinitionPage.setCurrent(pageNo);
if (chargeItemDefinitionList.size() > 0) {
@@ -167,9 +178,10 @@ public class ItemDefinitionController {
chargeItemDefinitionPage.setTotal(0);
chargeItemDefinitionPage.setRecords(new ArrayList<>());
}
return R.ok(chargeItemDefinitionPage);
return R.ok(chargeItemDefinitionPage,
MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null));
} else {
return R.ok();
return R.ok(new Page<>(), MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null));
}
}
@@ -185,7 +197,7 @@ public class ItemDefinitionController {
ChargeItemDefinition chargeItemDefinition = new ChargeItemDefinition();
BeanUtils.copyProperties(itemDefinitionDto, chargeItemDefinition);
if (!chargeItemDefinitionService.updateById(chargeItemDefinition)) {
return R.fail();
return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
}
// 更新收费项目adm_charge_item_def_app
@@ -197,4 +209,45 @@ public class ItemDefinitionController {
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"费用定价"}))
: R.fail(PromptMsgConstant.Common.M00007, null);
}
/**
* 采番测试（例子，非常规代码，请勿调用）
*
* @return 采番测试结果
*/
@GetMapping(value = "/test-assign")
public R<?> getTestAssign() {
// 基础采番
String code = assignSeqUtil.getSeq(AssignSeqEnum.TEST.getPrefix());
// 控制长度采番(seqLength: 总长度)
String code1 = assignSeqUtil.getSeq(AssignSeqEnum.TEST.getPrefix(),8);
// 控制长度批量采番
List<String> code2 = assignSeqUtil.getSeq(AssignSeqEnum.TEST.getPrefix(),8,3);
// 获取编号
Integer code3 = assignSeqUtil.getSeqNo(AssignSeqEnum.TEST.getPrefix());
// 批量获取编号
List<Integer> code4 = assignSeqUtil.getSeqNo(AssignSeqEnum.TEST.getPrefix(),3);
// 每日采番
String code5 = assignSeqUtil.getSeqByDay(AssignSeqEnum.TEST.getPrefix());
// 每日按长度采番(seqLength: 日期后的数字位数)
String code6 = assignSeqUtil.getSeqByDay(AssignSeqEnum.TEST.getPrefix(),8);
// 每日批量采番
List<String> code7 = assignSeqUtil.getSeqByDay(AssignSeqEnum.TEST.getPrefix(),8,3);
// 每日获取编号
Integer code8 = assignSeqUtil.getSeqNoByDay(AssignSeqEnum.TEST.getPrefix());
// 每日批量获取编号
List<Integer> code9 = assignSeqUtil.getSeqNoByDay(AssignSeqEnum.TEST.getPrefix(),3);
Map<String, Object> map = new HashMap<>();
map.put("code",code);
map.put("code1",code1);
map.put("code2",code2);
map.put("code3",code3);
map.put("code4",code4);
map.put("code5",code5);
map.put("code6",code6);
map.put("code7",code7);
map.put("code8",code8);
map.put("code9",code9);
return R.ok(map);
}
}

2
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefSearchParam.java
View File

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
public class ItemDefSearchParam {
/** 定价类型 */
private String DefinitionType;
private String definitionType;
/** 定价项目 */
private String chargeItem;
/** 模糊搜索条件 */

4
openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/Assembler/AdmissionAssembler.java Normal file
View File

@@ -0,0 +1,4 @@
package com.openhis.web.inpatientManage.Assembler;
public class AdmissionAssembler {
}

27
openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/controller/AdmissionController.java Normal file
View File

@@ -0,0 +1,27 @@
package com.openhis.web.inpatientManage.controller;
import com.openhis.administration.service.IEncounterService;
import com.openhis.administration.service.IPatientService;
import com.openhis.web.inpatientManage.dto.AdmissionDto;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/inpatient-manage")
@Slf4j
@AllArgsConstructor
public class AdmissionController {
private final IEncounterService encounterService;
private final IPatientService patientService;
//办理入院
@PostMapping("admission")
public void addSupplyRequest(@Validated @RequestBody AdmissionDto admission) {
}
}

4
openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/dto/AdmissionDto.java Normal file
View File

@@ -0,0 +1,4 @@
package com.openhis.web.inpatientManage.dto;
public class AdmissionDto {
}

4
openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/dto/AdmissionInitPageDto.java Normal file
View File

@@ -0,0 +1,4 @@
package com.openhis.web.inpatientManage.dto;
public class AdmissionInitPageDto {
}

1
openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java
View File

@@ -48,6 +48,7 @@ import lombok.extern.slf4j.Slf4j;
@RequestMapping("/inventory-manage-purchase")
@Slf4j
public class PurchaseInventoryController {
@Autowired
private ISupplyRequestService supplyRequestService;
@Autowired

10
openhis-server/openhis-application/src/main/resources/i18n/messages.properties
View File

@@ -34,4 +34,12 @@ no.view.permission=您没有查看数据的权限，请联系管理员添加权
apl.common.M00002={0}保存成功
apl.common.M00001={0}添加成功
apl.common.M00002={0}保存成功
apl.common.M00003={0}已经存在
apl.common.M00004={0}操作成功
apl.common.M00005={0}删除成功
apl.common.M00006=操作失败,该数据已被他人删除,请刷新后重试
apl.common.M00007=操作失败,该数据已被他人更改,请刷新后重试
apl.common.M00008=请勿重复提交
apl.common.M00009=查询成功

10
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/xml/ChargeItemDefSearchMapper.xml → openhis-server/openhis-application/src/main/resources/mapper/ChargeItemDefSearchMapper.xml
View File

@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.web.datadictionary.mapper.ChargeItemDefSearchMapper">
<select id="getMedList" resultType="com.openhis.web.datadictionary.dto.ChargeItemDefPageDto">
@@ -73,7 +71,7 @@
<if test="itemDefSearchParam.getStatusEnum() != null">
AND T5.status_enum = #{itemDefSearchParam.statusEnum}
</if>
<if test="itemDefSearchParam.getCategoryCode() != null">
<if test="itemDefSearchParam.getChargeItem() != null">
AND T5.category_code = #{itemDefSearchParam.chargeItem}
</if>
</where>
@@ -151,7 +149,7 @@
<if test="itemDefSearchParam.getStatusEnum() != null">
AND T5.status_enum = #{itemDefSearchParam.statusEnum}
</if>
<if test="itemDefSearchParam.getCategoryCode() != null">
<if test="itemDefSearchParam.getChargeItem() != null">
AND T5.category_code = #{itemDefSearchParam.chargeItem}
</if>
</where>
@@ -225,7 +223,7 @@
<if test="itemDefSearchParam.getStatusEnum() != null">
AND T5.status_enum = #{itemDefSearchParam.statusEnum}
</if>
<if test="itemDefSearchParam.getCategoryCode() != null">
<if test="itemDefSearchParam.getChargeItem() != null">
AND T5.category_code = #{itemDefSearchParam.chargeItem}
</if>
</where>