diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java index 9ec92e90..8287394c 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java @@ -65,25 +65,51 @@ public class PmsTreatmentVo { @Data public static class TreatmentRecordVO { private Long id; - private Long treatmentId; + + private Long patientId; + private String name; + + private String pinyinFull; + + private String pinyinSimple; + private Byte gender; + private Integer age; + private Date birthDate; + private String ethnicity; + private Integer educationYears; + private String phone; + private Byte idCardType; + private String idCard; + private Byte visitType; + private String visitNumber; + private Date visitTime; + private Date dischargeTime; + private String doctor; + private String deptName; + private String diagnosisCode; + private String diagnosisName; + private Byte status; + + private Long treatmentId; + private Long organizationId; @ApiModelProperty("生效的code和答案字典") private Map validRecordValDict; @@ -94,6 +120,9 @@ public class PmsTreatmentVo { private Date createTime; + public TreatmentRecordVO() { + } + public TreatmentRecordVO(PmsTreatment pmsTreatment) { this.treatmentId = pmsTreatment.getId(); this.name = pmsTreatment.getName(); diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/PmsTreatmentDao.java b/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/PmsTreatmentDao.java index 629353a3..c92171c0 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/PmsTreatmentDao.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/PmsTreatmentDao.java @@ -33,5 +33,6 @@ public interface PmsTreatmentDao { @DataSource(DataSourceType.MASTER) List adminQuery(@Param("query") PmsTreatmentDto.TreatmentQueryDTO query); + @DataSource(DataSourceType.MASTER) PmsTreatmentVo.TreatmentRecordVO adminQueryTreatment(@Param("id") Long id); } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java index c073475b..1f3361c1 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java @@ -466,6 +466,7 @@ public class ScreeningServiceImpl implements IScreeningService { detail.setScreenId(detailInfo.getId()); detail.setTenantId(hospitailId); detail.setSubmitStatus(UserConstants.SubmitStatus.save.status); + detail.setCreateTime(new Date()); detail.setDelFlag((byte) 0); scrScreeningRecordMapper.insertSelective(detail); detailInfo.setDetailId(detail.getId());