|
@@ -39,7 +39,6 @@ import com.diagbot.util.StringUtil;
|
|
|
import com.diagbot.util.VerifyUtil;
|
|
|
import com.diagbot.vo.DeleteDiagnoseVO;
|
|
|
import com.diagbot.vo.DiagnosePageVO;
|
|
|
-import com.diagbot.vo.DiagnoseVerifyVO;
|
|
|
import com.diagbot.vo.DiseaseIndexVO;
|
|
|
import com.diagbot.vo.GetDiagnoseDetailVO;
|
|
|
import com.diagbot.vo.NeoParamVO;
|
|
@@ -223,13 +222,11 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
|
|
|
|
|
|
|
|
|
/**
|
|
|
- * 诊断依据校验全部数据
|
|
|
+ * 诊断依据校验全部数据(不用修改操作人和时间)
|
|
|
*
|
|
|
- * @param diagnoseVerifyVO
|
|
|
*/
|
|
|
- public void verifyAllData(DiagnoseVerifyVO diagnoseVerifyVO) {
|
|
|
+ public void verifyAllData() {
|
|
|
CommonParam param = initCommonParam();
|
|
|
- param.setPerson(diagnoseVerifyVO.getModifier());
|
|
|
|
|
|
// 获取所有主表信息
|
|
|
List<Diagnose> diagnoseListWithDB = this.list(new QueryWrapper<Diagnose>()
|
|
@@ -265,8 +262,6 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
|
|
|
}
|
|
|
|
|
|
for (DiagnoseDetail bean : detail) {
|
|
|
- bean.setModifier(param.getPerson());
|
|
|
- bean.setGmtModified(param.getNow());
|
|
|
if (DiagnoseTypeEnum.Confirmed.getKey() == bean.getType() || (DiagnoseTypeEnum.Examination.getKey() == bean.getType() || (DiagnoseTypeEnum.Vigilant.getKey() == bean.getType()))) {
|
|
|
// 不需要校验公式
|
|
|
} else {
|
|
@@ -351,10 +346,8 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
|
|
|
}
|
|
|
List<String> disNameList = diagnoseQuestionList.stream().map(row -> row.getDisName()).distinct().collect(Collectors.toList());
|
|
|
|
|
|
- // 修改问题词表,修改人|修改时间|状态
|
|
|
+ // 修改问题词表的状态
|
|
|
for (Diagnose diagnose : diagnoseListWithDB) {
|
|
|
- diagnose.setModifier(diagnoseVerifyVO.getModifier());
|
|
|
- diagnose.setGmtModified(param.getNow());
|
|
|
if (disNameList.contains(diagnose.getDisName())) {
|
|
|
diagnose.setHasQuestion(String.valueOf(HasQuestionEnum.HAS_QUESTION.getKey()));
|
|
|
} else {
|