diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseSourceServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseSourceServiceImpl.java
index b2e44df..e7bc566 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseSourceServiceImpl.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseSourceServiceImpl.java
@@ -5,11 +5,14 @@ import java.util.List;
import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.lyms.base.common.dao.conf.DiagnoseSourceMapper;
import com.lyms.base.common.entity.conf.DiagnoseSource;
+import com.lyms.base.common.enums.StatusEnum;
import com.lyms.base.common.service.conf.DiagnoseSourceService;
import com.lyms.exception.SystemException;
+import com.lyms.util.StrUtils;
/**
*
@@ -26,21 +29,40 @@ public class DiagnoseSourceServiceImpl extends ServiceImpl getDiagnoseSource() throws SystemException {
- // TODO Auto-generated method stub
- return null;
+ EntityWrapper wrapper = new EntityWrapper<>();
+ wrapper.where("enable={0}", StatusEnum.ENABLED.getStatus());
+ return selectList(wrapper);
}
}
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseVersionServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseVersionServiceImpl.java
index b09af7c..8d8301c 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseVersionServiceImpl.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseVersionServiceImpl.java
@@ -3,13 +3,17 @@ package com.lyms.base.common.service.conf.impl;
import java.io.Serializable;
import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.lyms.base.common.dao.conf.DiagnoseVersionMapper;
import com.lyms.base.common.entity.conf.DiagnoseVersion;
+import com.lyms.base.common.enums.StatusEnum;
import com.lyms.base.common.service.conf.DiagnoseVersionService;
import com.lyms.exception.SystemException;
+import com.lyms.util.StrUtils;
/**
*
@@ -22,25 +26,63 @@ import com.lyms.exception.SystemException;
public class DiagnoseVersionServiceImpl extends ServiceImpl
implements DiagnoseVersionService {
+ @Autowired
+ private DiagnoseVersionMapper diagnoseVersionMapper;
+
public Integer deleteLogicById(Serializable id) {
return baseMapper.deleteLogicById(id);
}
+ private void throwCheckExecption(DiagnoseVersion diagnoseVersion) throws SystemException {
+ if (diagnoseVersion == null)
+ throw new SystemException("诊断信息不能为空");
+ }
+
@Override
public boolean enable(Serializable id) throws SystemException {
- // TODO Auto-generated method stub
- return false;
+
+ if (id == null)
+ return false;
+ DiagnoseVersion version = diagnoseVersionMapper.selectById(id);
+ if (version == null)
+ return false;
+
+ Integer status = version.getEnable();
+
+ status = status == null || StatusEnum.isDisEnabled(status) ? StatusEnum.DISENABLED.getStatus()
+ : StatusEnum.ENABLED.getStatus();
+ version.setEnable(status);
+
+ /*
+ * if (status == null || StatusEnum.isDisEnabled(status)) {
+ * version.setEnable(StatusEnum.ENABLED.getStatus()); } else {
+ * version.setEnable(StatusEnum.DISENABLED.getStatus()); }
+ */
+
+ Integer tag = diagnoseVersionMapper.updateById(version);
+ return tag != null && tag >= 1;
}
@Override
public List getEnableDiagnoseVersionBy(Serializable id) throws SystemException {
- // TODO Auto-generated method stub
- return null;
+
+ if (id == null)
+ return null;
+
+ EntityWrapper wrapper = new EntityWrapper();
+ wrapper.where("enable={0}", StatusEnum.ENABLED.getStatus());
+ return diagnoseVersionMapper.selectList(wrapper);
}
@Override
public String createVersion(DiagnoseVersion version) throws SystemException {
- // TODO Auto-generated method stub
- return null;
+ this.throwCheckExecption(version);
+
+ String id = StrUtils.uuid();
+ version.setId(id);
+
+ Integer tag = diagnoseVersionMapper.insert(version);
+
+ return tag != null && tag >= 1 ? id : null;
}
}
diff --git a/parent/hospital.web/src/test/java/test/hospital/Test.java b/parent/hospital.web/src/test/java/test/hospital/Test.java
index 7dbc78b..605ad0b 100644
--- a/parent/hospital.web/src/test/java/test/hospital/Test.java
+++ b/parent/hospital.web/src/test/java/test/hospital/Test.java
@@ -11,6 +11,10 @@ public class Test {
System.out.println(str);
conver.conver(str);
System.out.println(conver.get(0));
+
+ System.out.println(String.format("%s", "hello"));
+ System.out.println(String.format("{0}", "fd"));
+
}
// 创建