diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/ExamApplyController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/ExamApplyController.java index 1894e0da5..7405d2a2c 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/ExamApplyController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/ExamApplyController.java @@ -169,6 +169,9 @@ public class ExamApplyController extends BaseController { examApply.setApplyTime(LocalDateTime.now()); examApply.setCreateTime(new Date()); examApply.setApplyStatus(0); // 0=已开单 + if (examApply.getIsCharged() == null) examApply.setIsCharged(0); + if (examApply.getIsRefunded() == null) examApply.setIsRefunded(0); + if (examApply.getIsExecuted() == null) examApply.setIsExecuted(0); // 操作员工号取当前登录用户 try { diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/ExamApplyDto.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/ExamApplyDto.java index 2bc7770b0..cb7cf8650 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/ExamApplyDto.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/ExamApplyDto.java @@ -84,6 +84,15 @@ public class ExamApplyDto implements Serializable { /** 申请单状态 0已开单 1已收费 2已预约 3已签到 4部分报告 5已完告 6作废 */ private Integer applyStatus; + /** 是否已收费 0=否 1=是 */ + private Integer isCharged; + + /** 是否已退费 0=否 1=是 */ + private Integer isRefunded; + + /** 是否已执行 0=否 1=是 */ + private Integer isExecuted; + /** 就诊ID(用于写入门诊医嘱和费用项关联) */ private Long encounterId;