jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d5c02ffe86e10e403414dc14689eed4f455d7ad7

Authored by [wangbo]
1 parent 5a3a3b0a74
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

无创获取值bug修改

Showing 2 changed files with 22 additions and 16 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ d5c02ff
... ... @@ -135,7 +135,7 @@
135 135 if (CollectionUtils.isNotEmpty(list)) {
136 136 SieveModel sieveModel1 = sieveService.findOneById(list.get(0).getId());
137 137  
138   - sieveModel1.setZtfx(sieveAddRequest.getMax());
  138 + sieveModel1.setZtfx(sieveAddRequest.getMax() != null ? sieveAddRequest.getMax() : 0);
139 139 sieveModel1.setResultTime(sieveResultModel.getResultTime());
140 140 SieveService.handOrder(sieveModel1);
141 141 sieveModel1.setReportType(reportType);
... ... @@ -2164,8 +2164,10 @@
2164 2164 public void SieveHistory(Date startTime, Date endTime, String hospitalId) {
2165 2165 SieveQuery sieveQuery = new SieveQuery();
2166 2166 sieveQuery.setHospitalId(hospitalId);
2167   - sieveQuery.setCreatedStart(startTime);
2168   - sieveQuery.setCreatedEnd(endTime);
  2167 + if (null != startTime && null != endTime) {
  2168 + sieveQuery.setCreatedStart(startTime);
  2169 + sieveQuery.setCreatedEnd(endTime);
  2170 + }
2169 2171 List<SieveModel> sieveQuery1 = sieveService.queryList(sieveQuery);
2170 2172 System.out.println("条数" + sieveQuery1.size());
2171 2173 if (CollectionUtils.isNotEmpty(sieveQuery1)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java View file @ d5c02ff
... ... @@ -13,7 +13,7 @@
13 13  
14 14 /**
15 15 * 增加产筛结果
16   - *
  16 + * <p>
17 17 * Created by Administrator on 2016/6/29 0029.
18 18 */
19 19 public class SieveAddRequest implements IBasicRequestConvert<SieveResultModel> {
... ... @@ -33,10 +33,10 @@
33 33 //结果录入时间
34 34 private String resultTime;
35 35  
36   - private Map<String,String> tszhzValue;// 唐氏综合症 21-三体
37   - private Map<String,String> sbstValue;// 18-三体
38   - private Map<String,String> stzhz13Value; //13-三体
39   - private Map<String,String> sjgjxValue;// 神经管畸形 NTD
  36 + private Map<String, String> tszhzValue;// 唐氏综合症 21-三体
  37 + private Map<String, String> sbstValue;// 18-三体
  38 + private Map<String, String> stzhz13Value; //13-三体
  39 + private Map<String, String> sjgjxValue;// 神经管畸形 NTD
40 40  
41 41 //hCg
42 42 private String hcg;
... ... @@ -236,7 +236,7 @@
236 236 private String cspj;// 产筛评价
237 237 //录入人员
238 238 private String publishName;*/
239   - SieveResultModel sieveModel=new SieveResultModel();
  239 + SieveResultModel sieveModel = new SieveResultModel();
240 240 sieveModel.setParentId(parentId);
241 241 sieveModel.setId(id);
242 242 sieveModel.setTszhz(tszhz);
243 243  
244 244  
245 245  
246 246  
247 247  
248 248  
... ... @@ -262,23 +262,27 @@
262 262  
263 263 return sieveModel;
264 264 }
265   - public Integer getMax(){
266   - List<Integer> list =new ArrayList<>();
267 265  
268   - if(StringUtils.isNotEmpty(tszhz)){
  266 + public Integer getMax() {
  267 + List<Integer> list = new ArrayList<>();
  268 +
  269 + if (StringUtils.isNotEmpty(tszhz)) {
269 270 list.add(Integer.valueOf(tszhz));
270 271 }
271   - if(StringUtils.isNotEmpty(sjgjx)){
  272 + if (StringUtils.isNotEmpty(sjgjx)) {
272 273 list.add(Integer.valueOf(sjgjx));
273 274 }
274   - if(StringUtils.isNotEmpty(sbst)){
  275 + if (StringUtils.isNotEmpty(sbst)) {
275 276 list.add(Integer.valueOf(sbst));
276 277 }
277   - if(StringUtils.isNotEmpty(dzhpx)){
  278 + if (StringUtils.isNotEmpty(dzhpx)) {
278 279 list.add(Integer.valueOf(dzhpx));
279 280 }
280   - if(StringUtils.isNotEmpty(stzhz13)){
  281 + if (StringUtils.isNotEmpty(stzhz13)) {
281 282 list.add(Integer.valueOf(stzhz13));
  283 + }
  284 + if (list.size() == 0) {
  285 + list.add(0);
282 286 }
283 287 return Collections.max(list);
284 288 }