Commit 464126f3d9c66f0b34b00431227113de26d92e98
1 parent
1f9eaa2c6e
Exists in
master
and in
6 other branches
民生工程修改
Showing 1 changed file with 17 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java
View file @
464126f
| ... | ... | @@ -12,6 +12,7 @@ |
| 12 | 12 | import com.lyms.platform.common.result.BaseObjectResponse; |
| 13 | 13 | import com.lyms.platform.common.utils.DateUtil; |
| 14 | 14 | import com.lyms.platform.common.utils.JsonUtil; |
| 15 | +import com.lyms.platform.common.utils.PropertiesUtils; | |
| 15 | 16 | import com.lyms.platform.common.utils.SystemConfig; |
| 16 | 17 | import com.lyms.platform.operate.web.result.BasicConfigResult; |
| 17 | 18 | import com.lyms.platform.operate.web.utils.CollectionUtils; |
| ... | ... | @@ -46,6 +47,7 @@ |
| 46 | 47 | public class LivelihoodProjectsFacade { |
| 47 | 48 | |
| 48 | 49 | private Logger logger = LoggerFactory.getLogger(LivelihoodProjectsFacade.class); |
| 50 | + public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); | |
| 49 | 51 | @Autowired |
| 50 | 52 | private ResidentsArchiveService residentsArchiveService; |
| 51 | 53 | @Autowired |
| ... | ... | @@ -790,6 +792,21 @@ |
| 790 | 792 | { |
| 791 | 793 | continue; |
| 792 | 794 | } |
| 795 | + | |
| 796 | + if ("4".equals(HIS_VERSION)) | |
| 797 | + { | |
| 798 | + if (!("2".equals(patients.getCityId()) || (patients.isSendCoupon() != null && patients.isSendCoupon()))) | |
| 799 | + { | |
| 800 | + continue; | |
| 801 | + } | |
| 802 | + }else if ("16".equals(HIS_VERSION)) | |
| 803 | + { | |
| 804 | + if (patients.getBookbuildingDate() != null && patients.getFmDate() != null && DateUtil.daysBetween(patients.getBookbuildingDate(),patients.getFmDate()) <= 30) | |
| 805 | + { | |
| 806 | + continue; | |
| 807 | + } | |
| 808 | + } | |
| 809 | + | |
| 793 | 810 | |
| 794 | 811 | Map<String, Object> map = new HashMap<>(); |
| 795 | 812 | //id |