|
@@ -256,7 +256,7 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
|
|
|
if (StringUtils.isBlank(wmDaHospital.getProvince())) {
|
|
|
address = null;
|
|
|
}
|
|
|
- if (StringUtils.isNotBlank(wmTaskContent.getTemp4()) && !wmTaskContent.getTemp4().equals(address)) {
|
|
|
+ if (StringUtils.isNotBlank(wmTaskContent.getTemp4()) && !address.equals(wmTaskContent.getTemp4())) {
|
|
|
resList.add(generateMap("所在城市", address, wmTaskContent.getTemp4()));
|
|
|
String[] citys = wmTaskContent.getTemp4().split("-");
|
|
|
if (citys.length == 3) {
|
|
@@ -351,10 +351,10 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
|
|
|
// resList.add(generateMap("医务处处长联系方式",wmDaHospital.getYwcczlxfs(),wmTaskContent.getTemp15()));
|
|
|
// newinfo.setYwcczlxfs(wmTaskContent.getTemp15());
|
|
|
// }
|
|
|
-// if(null!=wmTaskContent.getTemp16()&&!wmTaskContent.getTemp16().equals(wmDaHospital.getAddress())){
|
|
|
-// resList.add(generateMap("详细地址",wmDaHospital.getAddress(),wmTaskContent.getTemp16()));
|
|
|
-// newinfo.setAddress(wmTaskContent.getTemp16());
|
|
|
-// }
|
|
|
+ if(null!=wmTaskContent.getTemp16()&&!wmTaskContent.getTemp16().equals(wmDaHospital.getAddress())){
|
|
|
+ resList.add(generateMap("详细地址",wmDaHospital.getAddress(),wmTaskContent.getTemp16()));
|
|
|
+ newinfo.setAddress(wmTaskContent.getTemp16());
|
|
|
+ }
|
|
|
// if(null!=wmTaskContent.getTemp20()&&!wmTaskContent.getTemp20().equals(wmDaHospital.getYjkzrxm())){
|
|
|
// resList.add(generateMap("药剂科主任姓名",wmDaHospital.getYjkzrxm(),wmTaskContent.getTemp20()));
|
|
|
// newinfo.setYjkzrxm(wmTaskContent.getTemp20());
|