jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 3c5b2a786a218fb91f24fba83a32424277186535

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

秦皇岛-科研导出优化。默认值

Showing 1 changed file with 37 additions and 37 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker2.java View file @ 3c5b2a7
... ... @@ -74,7 +74,7 @@
74 74 Criteria criteria= Criteria.where("parentId").is(patients.getId());
75 75 AntExChuModel exChuModel = mongoTemplate.findOne(Query.query(criteria), AntExChuModel.class);
76 76 if(null!=exChuModel){
77   - initQueryMapqhdky.put("cc", null!=exChuModel.getProdTime()?0<exChuModel.getProdTime()?"否":"是":"");
  77 + initQueryMapqhdky.put("cc", null!=exChuModel.getProdTime()?0 == exChuModel.getProdTime()?"是":"否":"");
78 78 initQueryMapqhdky.put("jc", null!=exChuModel.getProdTime()?0<exChuModel.getProdTime()?"是":"否":"");
79 79 if(StringUtils.isNotEmpty(exChuModel.getBp())){
80 80 Map<String, Object> map = JSON.parseObject(exChuModel.getBp(), HashMap.class);
81 81  
82 82  
83 83  
... ... @@ -156,35 +156,35 @@
156 156 Map<String, Object> map = JSON.parseObject(exChuModel.getFamilyHistory(), HashMap.class);
157 157 if(MapUtils.isNotEmpty(map)){
158 158 if(null!=map.get("yesOrNo")&&"no".equals(map.get("yesOrNo").toString())){
159   - initQueryMapqhdky.put("fpfq", "");
160   - initQueryMapqhdky.put("tnbfq", "");
161   - initQueryMapqhdky.put("gxyfq", "");
162   - initQueryMapqhdky.put("fpmq", "");
163   - initQueryMapqhdky.put("tnbmq", "");
164   - initQueryMapqhdky.put("gxymq", "");
  159 + initQueryMapqhdky.put("fpfq", "否");
  160 + initQueryMapqhdky.put("tnbfq", "否");
  161 + initQueryMapqhdky.put("gxyfq", "否");
  162 + initQueryMapqhdky.put("fpmq", "否");
  163 + initQueryMapqhdky.put("tnbmq", "否");
  164 + initQueryMapqhdky.put("gxymq", "否");
165 165 }else {
166   - initQueryMapqhdky.put("fpfq", null!=map.get("fpfq")?(boolean)map.get("fpfq")?"是":"否":"");
167   - initQueryMapqhdky.put("tnbfq", null!=map.get("tnbfq")?(boolean)map.get("tnbfq")?"是":"否":"");
168   - initQueryMapqhdky.put("gxyfq", null!=map.get("gxyfq")?(boolean)map.get("gxyfq")?"是":"否":"");
169   - initQueryMapqhdky.put("fpmq", null!=map.get("fpmq")?(boolean)map.get("fpmq")?"是":"否":"");
170   - initQueryMapqhdky.put("tnbmq", null!=map.get("tnbmq")?(boolean)map.get("tnbmq")?"是":"否":"");
171   - initQueryMapqhdky.put("gxymq", null!=map.get("gxymq")?(boolean)map.get("gxymq")?"是":"否":"");
  166 + initQueryMapqhdky.put("fpfq", null!=map.get("fpfq")?(boolean)map.get("fpfq")?"是":"否":"否");
  167 + initQueryMapqhdky.put("tnbfq", null!=map.get("tnbfq")?(boolean)map.get("tnbfq")?"是":"否":"否");
  168 + initQueryMapqhdky.put("gxyfq", null!=map.get("gxyfq")?(boolean)map.get("gxyfq")?"是":"否":"否");
  169 + initQueryMapqhdky.put("fpmq", null!=map.get("fpmq")?(boolean)map.get("fpmq")?"是":"否":"否");
  170 + initQueryMapqhdky.put("tnbmq", null!=map.get("tnbmq")?(boolean)map.get("tnbmq")?"是":"否":"否");
  171 + initQueryMapqhdky.put("gxymq", null!=map.get("gxymq")?(boolean)map.get("gxymq")?"是":"否":"否");
172 172 }
173 173 }else {
174   - initQueryMapqhdky.put("fpfq", "");
175   - initQueryMapqhdky.put("tnbfq", "");
176   - initQueryMapqhdky.put("gxyfq", "");
177   - initQueryMapqhdky.put("fpmq", "");
178   - initQueryMapqhdky.put("tnbmq", "");
179   - initQueryMapqhdky.put("gxymq", "");
  174 + initQueryMapqhdky.put("fpfq", "否");
  175 + initQueryMapqhdky.put("tnbfq", "否");
  176 + initQueryMapqhdky.put("gxyfq", "否");
  177 + initQueryMapqhdky.put("fpmq", "否");
  178 + initQueryMapqhdky.put("tnbmq", "否");
  179 + initQueryMapqhdky.put("gxymq", "否");
180 180 }
181 181 }else{
182   - initQueryMapqhdky.put("fpfq", "");
183   - initQueryMapqhdky.put("tnbfq", "");
184   - initQueryMapqhdky.put("gxyfq", "");
185   - initQueryMapqhdky.put("fpmq", "");
186   - initQueryMapqhdky.put("tnbmq", "");
187   - initQueryMapqhdky.put("gxymq", "");
  182 + initQueryMapqhdky.put("fpfq", "否");
  183 + initQueryMapqhdky.put("tnbfq", "否");
  184 + initQueryMapqhdky.put("gxyfq", "否");
  185 + initQueryMapqhdky.put("fpmq", "否");
  186 + initQueryMapqhdky.put("tnbmq", "否");
  187 + initQueryMapqhdky.put("gxymq", "否");
188 188 }
189 189 initQueryMapqhdky.put("tricer", StringUtils.isNotEmpty(exChuModel.getTricer())?exChuModel.getTricer():"");
190 190 initQueryMapqhdky.put("totalChol", StringUtils.isNotEmpty(exChuModel.getTotalChol())?exChuModel.getTotalChol():"");
... ... @@ -199,12 +199,12 @@
199 199 }else {
200 200 initQueryMapqhdky.put("jw", "");
201 201 initQueryMapqhdky.put("yw", "");
202   - initQueryMapqhdky.put("fpfq", "");
203   - initQueryMapqhdky.put("tnbfq", "");
204   - initQueryMapqhdky.put("gxyfq", "");
205   - initQueryMapqhdky.put("fpmq", "");
206   - initQueryMapqhdky.put("tnbmq", "");
207   - initQueryMapqhdky.put("gxymq", "");
  202 + initQueryMapqhdky.put("fpfq", "否");
  203 + initQueryMapqhdky.put("tnbfq", "否");
  204 + initQueryMapqhdky.put("gxyfq", "否");
  205 + initQueryMapqhdky.put("fpmq", "否");
  206 + initQueryMapqhdky.put("tnbmq", "否");
  207 + initQueryMapqhdky.put("gxymq", "否");
208 208 initQueryMapqhdky.put("tricer", "");
209 209 initQueryMapqhdky.put("totalChol","");
210 210 initQueryMapqhdky.put("highDens","");
... ... @@ -297,12 +297,12 @@
297 297 initQueryMapqhdky.put("cweight", "");
298 298 initQueryMapqhdky.put("jw", "");
299 299 initQueryMapqhdky.put("yw", "");
300   - initQueryMapqhdky.put("fpfq", "");
301   - initQueryMapqhdky.put("tnbfq", "");
302   - initQueryMapqhdky.put("gxyfq", "");
303   - initQueryMapqhdky.put("fpmq", "");
304   - initQueryMapqhdky.put("tnbmq", "");
305   - initQueryMapqhdky.put("gxymq", "");
  300 + initQueryMapqhdky.put("fpfq", "否");
  301 + initQueryMapqhdky.put("tnbfq", "否");
  302 + initQueryMapqhdky.put("gxyfq", "否");
  303 + initQueryMapqhdky.put("fpmq", "否");
  304 + initQueryMapqhdky.put("tnbmq", "否");
  305 + initQueryMapqhdky.put("gxymq", "否");
306 306 initQueryMapqhdky.put("tricer", "");
307 307 initQueryMapqhdky.put("totalChol", "");
308 308 initQueryMapqhdky.put("highDens", "");