Commit 3ba0a6229158b1a331e7933cd1c75d093ae03a7e
1 parent
4bad647b08
Exists in
master
and in
6 other branches
儿保检查-修改高危详情BUG修复
Showing 1 changed file with 2 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
3ba0a62
| ... | ... | @@ -43,6 +43,7 @@ |
| 43 | 43 | import java.util.*; |
| 44 | 44 | import java.util.concurrent.Callable; |
| 45 | 45 | import java.util.concurrent.Future; |
| 46 | +import java.util.concurrent.TimeUnit; | |
| 46 | 47 | import java.util.regex.Pattern; |
| 47 | 48 | |
| 48 | 49 | import static com.lyms.platform.operate.web.service.BabyAfterVisitService.*; |
| ... | ... | @@ -233,7 +234,7 @@ |
| 233 | 234 | } |
| 234 | 235 | bm.setDiseases(request.getDiseases()); |
| 235 | 236 | //秦皇岛-高危详情添加到儿童表 |
| 236 | - bm.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(request.getQhdHighRiskInfo())?request.getQhdHighRiskInfo():null); | |
| 237 | + bm.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(request.getQhdHighRiskInfo())?request.getQhdHighRiskInfo():new ArrayList<Map<String, String>>()); | |
| 237 | 238 | |
| 238 | 239 | |
| 239 | 240 | //如果这次更新的检查记录是最新的记录就更新对应档案数据否则不更新 |
| ... | ... | @@ -4913,9 +4914,6 @@ |
| 4913 | 4914 | public BaseResponse getBabyCheckStatis(String hospitalId, Date startDate, Date endDate) { |
| 4914 | 4915 | BaseResponse br=new BaseResponse(); |
| 4915 | 4916 | Map<String,Integer> map=new HashMap<>(); |
| 4916 | -// long month0=0,month1=0,month0=0,month0=0,month0=0,month0=0,month0=0,month0=0,month0=0,month0=0,month0=0, | |
| 4917 | -// month0=0,month0=0,month0=0,month0=0,month0=0,month0=0,month0=0month0=0month0=0,month0=0,month0=0, | |
| 4918 | -// ; | |
| 4919 | 4917 | BabyCheckModelQuery query = new BabyCheckModelQuery(); |
| 4920 | 4918 | query.setHospitalId(hospitalId); |
| 4921 | 4919 | query.setYn(YnEnums.YES.getId()); |