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

去除变片编号生成器，修改地区选择器，修改报告卡的样式。

Browse Source
This commit is contained in:
wangjian963
2026-03-16 14:40:35 +08:00
parent 449209a79b
commit 0bf29a53a4
5 changed files with 403 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java
View File

@@ -127,12 +127,4 @@ public interface IDoctorStationDiagnosisAppService {
* @return 结果
*/
R<?> saveInfectiousDiseaseReport(InfectiousDiseaseReportDto infectiousDiseaseReportDto);
/**
* 获取下一个传染病报告卡编号
*
* @param orgCode 医疗机构编码
* @return 卡片编号
*/
R<?> getNextCardNo(String orgCode);
}

23
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java
View File

@@ -621,27 +621,4 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"传染病报告卡"}));
}
}
/**
* 获取下一个传染病报告卡编号
* 编号规则：医疗机构编码 + 年月日 + 4位流水号
* 示例：123456202603060001
*
* @param orgCode 医疗机构编码
* @return 卡片编号
*/
@Override
public R<?> getNextCardNo(String orgCode) {
// 参数校验
if (orgCode == null || orgCode.trim().isEmpty()) {
orgCode = "0000";
}
// 使用 AssignSeqUtil 生成每日递增的流水号
// 前缀为医疗机构编码，每天从0001开始
String cardNo = assignSeqUtil.getSeqByDay(orgCode, 4);
log.debug("生成传染病报告卡编号: {}", cardNo);
return R.ok(cardNo);
}
}

11
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java
View File

@@ -217,15 +217,4 @@ public class DoctorStationDiagnosisController {
return iDoctorStationDiagnosisAppService.saveInfectiousDiseaseReport(infectiousDiseaseReportDto);
}
/**
* 获取下一个传染病报告卡编号
*
* @param orgCode 医疗机构编码
* @return 卡片编号
*/
@GetMapping("/next-card-no")
public R<?> getNextCardNo(@RequestParam(value = "orgCode", required = false) String orgCode) {
return iDoctorStationDiagnosisAppService.getNextCardNo(orgCode);
}
}