jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6708ab13519f153eebc0c167f8c91d6aef8826a7

Authored by jiangjiazhi
1 parent 78590dc447
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

增加字段

Showing 1 changed file with 14 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 6708ab1
... ... @@ -74,7 +74,8 @@
74 74  
75 75 @Autowired
76 76 private CouponService couponService;
77   -
  77 +@Autowired
  78 + private SieveService sieveService;
78 79 /**
79 80 * 处理区域隐藏建档
80 81 *
81 82  
82 83  
... ... @@ -2137,14 +2138,21 @@
2137 2138 return highScoreResult;
2138 2139 }
2139 2140  
2140   - public BaseResponse getLastCheck(Integer userId,String pid){
  2141 + public BaseResponse getLastCheck(Integer userId,String parentId){
2141 2142 AntExQuery antExQuery1 = new AntExQuery();
2142 2143 String hospitalId = autoMatchFacade.getHospitalId(userId);
2143 2144 antExQuery1.setHospitalId(hospitalId);
2144   - antExQuery1.setPid(pid);
  2145 + antExQuery1.setParentId(parentId);
2145 2146 antExQuery1.setYn(YnEnums.YES.getId());
2146 2147 List<AntenatalExaminationModel> examinationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery1.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
2147 2148 Map m =new HashMap();
  2149 + SieveQuery sieveQuery = new SieveQuery();
  2150 + sieveQuery.setParentId(parentId);
  2151 + List<SieveModel> list =sieveService.queryList(sieveQuery);
  2152 + int status=-1;
  2153 + if(CollectionUtils.isNotEmpty(list)){
  2154 + status= list.get(0).getStatus();
  2155 + }
2148 2156 if(CollectionUtils.isNotEmpty(examinationModelList)){
2149 2157 for(AntenatalExaminationModel model:examinationModelList){
2150 2158 String zybd=model.getZyqbd();
2151 2159  
... ... @@ -2161,13 +2169,14 @@
2161 2169 m.put("textpjbc",text);
2162 2170 m.put("s75gdgtt",s75gdgtt);
2163 2171 m.put("jzxgn",jzxgn);
  2172 + m.put("status",status);
2164 2173 break;
2165 2174 }
2166 2175 }
2167 2176 }
2168 2177 AntExChuQuery antExChuQuery =new AntExChuQuery();
2169 2178 antExQuery1.setHospitalId(hospitalId);
2170   - antExQuery1.setPid(pid);
  2179 + antExQuery1.setParentId(parentId);
2171 2180 antExQuery1.setYn(YnEnums.YES.getId());
2172 2181 List<AntExChuModel> chuModelList= antenatalExaminationService.queryAntExChu(antExChuQuery);
2173 2182 if(CollectionUtils.isNotEmpty(chuModelList)){
... ... @@ -2186,6 +2195,7 @@
2186 2195 m.put("textpjbc",text);
2187 2196 m.put("s75gdgtt",s75gdgtt);
2188 2197 m.put("jzxgn",jzxgn);
  2198 + m.put("status",status);
2189 2199 break;
2190 2200 }
2191 2201 }