From 8cb82432832795a55d8a72c73484517d110a7b00 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 27 八月 2021 18:15:48 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into shequhuodong
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java
index a955e05..dd2eb95 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java
@@ -308,17 +308,17 @@
vo.setMainRelatives(oneData.get(17).trim());
}
if (StringUtils.isNotEmpty(oneData.get(18))) {
- Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(18));
- if (isOk.equals(-1)) {
- index++;
- ComMngPopulationRehabilitationMistakeExcelVO mistake =
- new ComMngPopulationRehabilitationMistakeExcelVO();
- setRehabilitationMistake(oneData, mistake);
- mistake.setMistake("您填写的与人员关系有误");
- mistakes.add(mistake);
- continue;
- }
- vo.setPatientRelation(isOk);
+// Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(18));
+// if (isOk.equals(-1)) {
+// index++;
+// ComMngPopulationRehabilitationMistakeExcelVO mistake =
+// new ComMngPopulationRehabilitationMistakeExcelVO();
+// setRehabilitationMistake(oneData, mistake);
+// mistake.setMistake("您填写的与人员关系有误");
+// mistakes.add(mistake);
+// continue;
+// }
+ vo.setPatientRelation(oneData.get(18).trim());
}
if (StringUtils.isNotEmpty(oneData.get(19))) {
vo.setRehabReasonAndType(oneData.get(19).trim());
--
Gitblit v1.7.1