jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 49cbe6ea95f884b35109da32f05daa824c0053f8

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

update

Showing 2 changed files with 12 additions and 12 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 49cbe6e
... ... @@ -3862,7 +3862,7 @@
3862 3862  
3863 3863 public void childbirthManagerExcel2(ChildbirthManagerRequest childbirthManagerRequest, HttpServletResponse httpServletResponse)throws Exception {
3864 3864 try {
3865   - Map<String, String> query = childbirthManagerRequest.getInitQueryMapqhdky();
  3865 + Map<String, String> query = childbirthManagerRequest.getNormalQueryMap();
3866 3866 String queryStr = "";
3867 3867 for (String key : query.keySet()) {
3868 3868 queryStr += key + ",";
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker2.java View file @ 49cbe6e
... ... @@ -73,9 +73,9 @@
73 73 initQueryMapqhdky.put("dt", StringUtils.isNotEmpty(exChuModel.getTireNumber())?1==Integer.parseInt(exChuModel.getTireNumber())?"是":"否":"");
74 74 initQueryMapqhdky.put("dantai", StringUtils.isNotEmpty(exChuModel.getTireNumber())?1<Integer.parseInt(exChuModel.getTireNumber())?"是":"否":"");
75 75 if(StringUtils.isNotEmpty(exChuModel.getBp())){
76   - Map<String, String> map = JSON.parseObject(exChuModel.getBp(), HashMap.class);
77   - initQueryMapqhdky.put("ssy", map.get("ssy"));
78   - initQueryMapqhdky.put("szy", map.get("szy"));
  76 + Map<String, Integer> map = JSON.parseObject(exChuModel.getBp(), HashMap.class);
  77 + initQueryMapqhdky.put("ssy", null!=map.get("ssy")?map.get("ssy").toString():"");
  78 + initQueryMapqhdky.put("szy", null!=map.get("szy")?map.get("szy").toString():"");
79 79 }else {
80 80 initQueryMapqhdky.put("ssy", "");
81 81 initQueryMapqhdky.put("szy", "");
82 82  
... ... @@ -143,9 +143,9 @@
143 143 initQueryMapqhdky.put("jw", StringUtils.isNotEmpty(exChuModel.getJw())?exChuModel.getJw():"");
144 144 initQueryMapqhdky.put("yw", StringUtils.isNotEmpty(exChuModel.getYw())?exChuModel.getYw():"");
145 145 if(StringUtils.isNotEmpty(exChuModel.getFamilyHistory())){
146   - Map<String, String> map = JSON.parseObject(exChuModel.getFamilyHistory(), HashMap.class);
  146 + Map<String, Object> map = JSON.parseObject(exChuModel.getFamilyHistory(), HashMap.class);
147 147 if(MapUtils.isNotEmpty(map)){
148   - if("no".equals(map.get("yesOrNo"))){
  148 + if(null!=map.get("yesOrNo")&&"no".equals(map.get("yesOrNo").toString())){
149 149 initQueryMapqhdky.put("fpfq", "");
150 150 initQueryMapqhdky.put("tnbfq", "");
151 151 initQueryMapqhdky.put("gxyfq", "");
... ... @@ -153,12 +153,12 @@
153 153 initQueryMapqhdky.put("tnbmq", "");
154 154 initQueryMapqhdky.put("gxymq", "");
155 155 }else {
156   - initQueryMapqhdky.put("fpfq", StringUtils.isNotEmpty(map.get("fpfq"))?"true".equals(map.get("fpfq"))?"是":"否":"");
157   - initQueryMapqhdky.put("tnbfq", StringUtils.isNotEmpty(map.get("tnbfq"))?"true".equals(map.get("tnbfq"))?"是":"否":"");
158   - initQueryMapqhdky.put("gxyfq", StringUtils.isNotEmpty(map.get("gxyfq"))?"true".equals(map.get("gxyfq"))?"是":"否":"");
159   - initQueryMapqhdky.put("fpmq", StringUtils.isNotEmpty(map.get("fpmq"))?"true".equals(map.get("fpmq"))?"是":"否":"");
160   - initQueryMapqhdky.put("tnbmq", StringUtils.isNotEmpty(map.get("tnbmq"))?"true".equals(map.get("tnbmq"))?"是":"否":"");
161   - initQueryMapqhdky.put("gxymq", StringUtils.isNotEmpty(map.get("gxymq"))?"true".equals(map.get("gxymq"))?"是":"否":"");
  156 + initQueryMapqhdky.put("fpfq", null!=map.get("fpfq")?(boolean)map.get("fpfq")?"是":"否":"");
  157 + initQueryMapqhdky.put("tnbfq", null!=map.get("tnbfq")?(boolean)map.get("tnbfq")?"是":"否":"");
  158 + initQueryMapqhdky.put("gxyfq", null!=map.get("gxyfq")?(boolean)map.get("gxyfq")?"是":"否":"");
  159 + initQueryMapqhdky.put("fpmq", null!=map.get("fpmq")?(boolean)map.get("fpmq")?"是":"否":"");
  160 + initQueryMapqhdky.put("tnbmq", null!=map.get("tnbmq")?(boolean)map.get("tnbmq")?"是":"否":"");
  161 + initQueryMapqhdky.put("gxymq", null!=map.get("gxymq")?(boolean)map.get("gxymq")?"是":"否":"");
162 162 }
163 163 }else {
164 164 initQueryMapqhdky.put("fpfq", "");