From 79f9fbd9f999e26af3f0bca534d825eb687e092c Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期三, 25 十二月 2024 08:47:24 +0800 Subject: [PATCH] 20241225 --- ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 263 ++++++++++++++++++++++++++-------------------------- 1 files changed, 133 insertions(+), 130 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java index 0d237f9..111bff4 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java @@ -99,15 +99,17 @@ @Logger public AjaxResult HisApiMethods(TjCustomer customer,TjOrder tjOrder) { String jzh=null; + String dept = configService.selectConfigByKey("request_default_dept"); + String ysbm = configService.selectConfigByKey("request_default_ysbm"); try { // TjOrder tjOrder = orderService.getById(orderId); Date dates = new Date(); final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss"); OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto(); outpinregapplyDto.setPationid(customer.getPationId()); - outpinregapplyDto.setSqysbm("00029"); - outpinregapplyDto.setMzksbm("0101"); - outpinregapplyDto.setCzybm("00029"); + outpinregapplyDto.setSqysbm(ysbm); + outpinregapplyDto.setMzksbm(dept); + outpinregapplyDto.setCzybm(ysbm); outpinregapplyDto.setSfjz("0"); outpinregapplyDto.setGhzlbm("01"); outpinregapplyDto.setYwckbm("0001"); @@ -133,7 +135,7 @@ hisApiGetMethodService.save(object4, "Outpinregapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(outpinregapplyDto))); //闂ㄨ瘖鍖荤敓鎺ヨ瘖 - AjaxResult result = controller.Outpinconapply(hisRegistrationId, date, "00029"); + AjaxResult result = controller.Outpinconapply(hisRegistrationId, date, ysbm); String result3 = getAjaxResult(result); JSONObject object2 = getJSONObject(result3); String code2 = object2.getStr("ResultCode"); @@ -156,12 +158,12 @@ OutpinimpapplyDto dto=new OutpinimpapplyDto(); dto.setHisRegistrationId(tjOrder.getCardId()); dto.setMzzdid(1); - dto.setSqysbm("00029"); - dto.setMzksbm("0101"); + dto.setSqysbm(ysbm); + dto.setMzksbm(dept); dto.setFbrq(date); dto.setZdrq(date); - dto.setCzybm("00029"); - dto.setCzyksbm("0101"); + dto.setCzybm(ysbm); + dto.setCzyksbm(dept); dto.setZs("鍋ュ悍鏌ヤ綋"); dto.setBs("涓嶈"); dto.setClyz(""); @@ -190,7 +192,9 @@ //浣撴瀵筯is鐢宠鍗曡皟鐢ㄦ柟娉� public AjaxResult tijianshenqing(TjCustomer customer, String date,String cardId) { - + String dept = configService.selectConfigByKey("request_default_dept"); + String ysbm = configService.selectConfigByKey("request_default_ysbm"); + String ysmc = configService.selectConfigByKey("request_default_ysmc"); List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId); @@ -198,11 +202,11 @@ OutpintestapplyDto dto = new OutpintestapplyDto(); dto.setHisRegistrationId(cardId); dto.setSfzh(customer.getCusIdcard()); - dto.setSqysbm("00029"); - dto.setMzksbm("0101"); + dto.setSqysbm(ysbm); + dto.setMzksbm(dept); dto.setSjrq(date); - dto.setCzybm("00029"); - dto.setCzyksbm("0101"); + dto.setCzybm(ysbm); + dto.setCzyksbm(dept); dto.setSfjz("0"); List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>(); @@ -310,10 +314,10 @@ OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto(); outpinexamapplyDto.setHisRegistrationId(cardId); outpinexamapplyDto.setSfzh(customer.getCusIdcard()); - outpinexamapplyDto.setSqysbm("00029"); - outpinexamapplyDto.setMzksbm("0101"); - outpinexamapplyDto.setCzybm("00029"); - outpinexamapplyDto.setCzyksbm("0101"); + outpinexamapplyDto.setSqysbm(ysbm); + outpinexamapplyDto.setMzksbm(dept); + outpinexamapplyDto.setCzybm(ysbm); + outpinexamapplyDto.setCzyksbm(dept); outpinexamapplyDto.setSfjz("0"); // List<TbTransition> detailLists = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId); List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>(); @@ -412,11 +416,11 @@ OutpintreatapplyDto dao = new OutpintreatapplyDto(); dao.setHisRegistrationId(cardId); dao.setSfzh(customer.getCusIdcard()); - dao.setSqysbm("00029"); - dao.setMzksbm("0101"); + dao.setSqysbm(ysbm); + dao.setMzksbm(dept); dao.setSjrq(date); - dao.setCzybm("00029"); - dao.setCzyksbm("0101"); + dao.setCzybm(ysbm); + dao.setCzyksbm(dept); dao.setSfjz("0"); // List<TbTransition> details = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId); List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>(); @@ -514,11 +518,11 @@ OutpinmedicapplyDto dto1=new OutpinmedicapplyDto(); dto1.setHisRegistrationId(cardId); dto1.setSfzh(customer.getCusIdcard()); - dto1.setSqysbm("00029"); - dto1.setMzksbm("0101"); + dto1.setSqysbm(ysbm); + dto1.setMzksbm(dept); dto1.setSjrq(date); - dto1.setCzybm("00029"); - dto1.setCzyksbm("0101"); + dto1.setCzybm(ysbm); + dto1.setCzyksbm(dept); dto1.setCflxbm("A"); dto1.setYfbm("1"); dto1.setFyts("1"); @@ -538,11 +542,11 @@ cf.setCardId(cardId); cf.setSfzh(customer.getCusIdcard()); cf.setCfh(cfh); - cf.setSqysbm("00029"); - cf.setSqysxm("鐜嬪仴钀�"); - cf.setMzksbn("0101"); + cf.setSqysbm(ysbm); + cf.setSqysxm(ysmc); + cf.setMzksbn(dept); cf.setSqrq(date); - cf.setCzybm("00029"); + cf.setCzybm(ysbm); cf.setYpbm(detilsDto.getYpbm()); cf.setYpmc("灏跨礌[14C]鍛兼皵璇曢獙鑽洅"); cf.setSl(String.valueOf(detilsDto.getSl())); @@ -587,20 +591,20 @@ LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber()); List<TjSampling> list = tjSamplingService.list(wrapper); - log.info("閲囨牱鏁版嵁 ->{}",list); + log.info("閲囨牱鏁版嵁 ->{}",JSONUtil.toJsonStr(list)); if (!list.isEmpty()) { Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode)); -// log.info("鍒嗙粍鍚� ->{}",JSONUtil.toJsonStr(listMap)); + log.info("鍒嗙粍鍚� ->{}",JSONUtil.toJsonStr(listMap)); ArrayList<String> ids = new ArrayList<>(); for (Map.Entry<String, List<TjSampling>> entry : listMap.entrySet()) { -// log.info("key ->{},val ->{}",entry.getKey(),entry.getValue()); + log.info("key ->{},val ->{}",entry.getKey(),entry.getValue()); // Lis鏍囨湰浠g爜 String specimenTypeCode = entry.getKey(); List<TjSampling> samplings = entry.getValue(); - if (samplings.size() > 1) { + if (samplings.size() >= 2) { // 杩涜鍚堝苟 List<String> stringList = samplings.stream().map(TjSampling::getId).collect(Collectors.toList()); -// log.info("鎻愬彇id ->{}",stringList); + log.info("鎻愬彇id ->{}",stringList); for (int i = 0; i < stringList.size(); i++) { String s = stringList.get(i); if (tjSamplingService.isMergeItem(s) != 0) { @@ -608,8 +612,12 @@ ids.add(s); } } - String id = tjSamplingService.mergeCaiYangApi(stringList); - ids.add(id); + if (stringList.size() > 1) { + String id = tjSamplingService.mergeCaiYangApi(stringList); + ids.add(id); + }else { + ids.add(stringList.get(0)); + } } else { ids.add(samplings.get(0).getId()); } @@ -788,12 +796,10 @@ //閫�璐瑰悗鍙栨秷鎺ヨ瘖浣滃簾鐢宠鍗曠瓑鎿嶄綔 @Transactional public boolean ZfHisApiMethods(TjCustomer customer, TjOrder order,Boolean isUseLisAndPacsRegister) { + String ysbm = configService.selectConfigByKey("request_default_ysbm"); + Date dates = new Date(); final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss"); - - List<String> jcsqdh = orderService.getHuoQuJcsqdh(order.getCardId()); - - List<String> jysqdh = orderService.getHuoQuJysqdh(order.getCardId()); List<String> zlsqdh = orderService.getHuoQuZlsqdh(order.getCardId()); @@ -807,56 +813,46 @@ JSONObject object1 = null; String code1 = null; - if (isUseLisAndPacsRegister){ +// if (isUseLisAndPacsRegister){ TjCustomer customer1 = customerService.getById(order.getUserId()); // 浣滃簾妫�鏌ョ敵璇� - if (jcsqdh != null && !jcsqdh.isEmpty()){ - for (String sqdh : jcsqdh) { - AjaxResult cancelPacsAjaxResult = pacsApiMethodService.updatePacsApply(sqdh, order.getCardId(), customer1.getCusName()); - String result = cancelPacsAjaxResult.get("data").toString(); - JSONObject object = JSONUtil.parseObj(result); - String code = object.getStr("ResultCode"); - if(code.equals("1")){ - orderService.delHuoQuJcsqdh(order.getCardId()); - } + List<String> bljcsqdhByPacs = orderService.getBljcsqdhByPacs(order.getCardId()); + if (bljcsqdhByPacs != null && !bljcsqdhByPacs.isEmpty()){ + for (String sqdh : bljcsqdhByPacs) { + AjaxResult cancelPacsAjaxResult = pacsApiMethodService.updatePacsApply(sqdh, order.getCardId(), customer1.getCusName()); + String result = cancelPacsAjaxResult.get("data").toString(); + JSONObject object = JSONUtil.parseObj(result); + String code = object.getStr("ResultCode"); + if(code.equals("1")){ + orderService.delHuoQuJcsqdh(order.getCardId()); } } - // 浣滃簾妫�楠岀敵璇� TODO - if (jysqdh != null && !jysqdh.isEmpty()){ - List<String> huoQuJysqdhNotBuLu = orderService.getHuoQuJysqdhNotBuLu(order.getCardId()); - List<String> huoQuJysqdhBuLu = orderService.getHuoQuJysqdhBuLu(order.getCardId()); - for (String sqdh : huoQuJysqdhNotBuLu) { - AjaxResult cancelLisAjaxResult = lisApiMethod.cancel(sqdh, order.getCardId(), customer1.getCusName()); - log.info("lis璇锋眰杩斿洖 ->{}",JSONUtil.toJsonStr(cancelLisAjaxResult)); - if (cancelLisAjaxResult.get("code").toString().equals("200")){ - String result = cancelLisAjaxResult.get("data").toString(); - JSONObject object = JSONUtil.parseObj(result); - String code= object.getStr("ResultCode"); - if(code.equals("1")){ - orderService.delHuoQuJysqdh(order.getCardId()); - } - } else { - String str = JSONUtil.parseObj(cancelLisAjaxResult.get("result").toString()).getJSONObject("Response").getStr("ResultContent"); - if (str.contains("鐢宠宸蹭綔搴�")) - orderService.delHuoQuJysqdh(order.getCardId()); - } - } - for (String s : huoQuJysqdhBuLu) { - ajaxResult = controller.Outpindeltestapply(order.getCardId(), "00029", s); - result2 = getAjaxResult(ajaxResult); - object1 = getJSONObject(result2); - code1 = object1.getStr("ResultCode"); - if (code1.equals("0")) { + } + // 浣滃簾妫�楠岀敵璇� + List<String> bljysqdhByLis = orderService.getBljysqdhByLis(order.getCardId()); + if (bljysqdhByLis != null && !bljysqdhByLis.isEmpty()){ + for (String sqdh : bljysqdhByLis) { + AjaxResult cancelLisAjaxResult = lisApiMethod.cancel(sqdh, order.getCardId(), customer1.getCusName()); + log.info("lis璇锋眰杩斿洖 ->{}",JSONUtil.toJsonStr(cancelLisAjaxResult)); + if (cancelLisAjaxResult.get("code").toString().equals("200")){ + String result = cancelLisAjaxResult.get("data").toString(); + JSONObject object = JSONUtil.parseObj(result); + String code= object.getStr("ResultCode"); + if(code.equals("1")){ orderService.delHuoQuJysqdh(order.getCardId()); } } } + } - }else { +// }else { + List<String> jcsqdh = orderService.getHuoQuJcsqdh(order.getCardId()); + + List<String> jysqdh = orderService.getHuoQuJysqdh(order.getCardId()); //2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇� if (null != jcsqdh && jcsqdh.size()>0) { for (String s : jcsqdh) { - AjaxResult result = controller.Outpindelexamapply(order.getCardId(), "00029", s); + AjaxResult result = controller.Outpindelexamapply(order.getCardId(), ysbm, s); String result1 = getAjaxResult(result); JSONObject object = getJSONObject(result1); String code = object.getStr("ResultCode"); @@ -872,7 +868,7 @@ //2.1.6.3 浣滃簾闂ㄨ瘖妫�楠岀敵璇� if (null != jysqdh && jysqdh.size()>0) { for (String s : jysqdh) { - ajaxResult = controller.Outpindeltestapply(order.getCardId(), "00029", s); + ajaxResult = controller.Outpindeltestapply(order.getCardId(), ysbm, s); result2 = getAjaxResult(ajaxResult); object1 = getJSONObject(result2); code1 = object1.getStr("ResultCode"); @@ -888,7 +884,7 @@ //2.1.6.9 浣滃簾闂ㄨ瘖娌荤枟澶勭疆鐢宠 if (null != zlsqdh && zlsqdh.size()>0) { for (String s : zlsqdh) { - ajaxResult = controller.Outpintdelreatapply(order.getCardId(), "00029", s); + ajaxResult = controller.Outpintdelreatapply(order.getCardId(), ysbm, s); result2 = getAjaxResult(ajaxResult); object1 = getJSONObject(result2); code1 = object1.getStr("ResultCode"); @@ -901,7 +897,7 @@ //浣滃簾鑽搧鐢宠 if(null !=cfhs && cfhs.size()>0){ for (String cfh : cfhs) { - AjaxResult result = controller.Outpindelmedicapply(order.getCardId(), "00029", cfh); + AjaxResult result = controller.Outpindelmedicapply(order.getCardId(), ysbm, cfh); String result1 = getAjaxResult(result); JSONObject object = getJSONObject(result1); String code = object.getStr("ResultCode"); @@ -910,10 +906,10 @@ } } } - } +// } //2.1.3 闂ㄨ瘖鍖荤敓鍙栨秷鎺ヨ瘖 - ajaxResult = controller.Outpinunconapply(order.getCardId(), date, "00029"); + ajaxResult = controller.Outpinunconapply(order.getCardId(), date, ysbm); result2 = getAjaxResult(ajaxResult); object1 = getJSONObject(result2); code1 = object1.getStr("ResultCode"); @@ -927,14 +923,12 @@ //浣滃簾琛ュ綍椤圭洰 public boolean ZfBlXm(List<String> bldhs, TjOrder order) { - + log.info("bldhs ->{}",JSONUtil.toJsonStr(bldhs)); if(null !=bldhs && bldhs.size()>0){ + log.info("杩涘叆鍒ゆ柇"); + String ysbm = configService.selectConfigByKey("request_default_ysbm"); try { for (String bldh : bldhs) { - List<String> jcsqdh = orderService.getHuoQuBlJcsqdh(order.getCardId(),bldh); - - List<String> jysqdh = orderService.getHuoQuBlJysqdh(order.getCardId(),bldh); - List<String> zlsqdh = orderService.getHuoQuBlZlsqdh(order.getCardId(),bldh); @@ -945,45 +939,53 @@ String result2 = null; JSONObject object1 = null; String code1 = null; - - if (lisApiMethod.isUseLisAndPacsRegister(order)) { - TjCustomer customer1 = customerService.getById(order.getUserId()); - // 浣滃簾妫�鏌ョ敵璇� - if (jcsqdh != null && !jcsqdh.isEmpty()){ - for (String sqdh : jcsqdh) { - AjaxResult cancelPacsAjaxResult = pacsApiMethodService.updatePacsApply(sqdh, order.getCardId(), customer1.getCusName()); - log.info("浣滃簾妫�鏌� pacs杩斿洖 ->{}",JSONUtil.toJsonStr(cancelPacsAjaxResult)); - String result = cancelPacsAjaxResult.get("data").toString(); - JSONObject object = JSONUtil.parseObj(result); - String code = object.getStr("ResultCode"); - if(code.equals("1")){ - orderService.delHuoQuBlJcsqdh(order.getCardId(),bldh); - }else { - return false; - } + log.info("鏌ヨ鍓�"); +// if (lisApiMethod.isUseLisAndPacsRegister(order)) { + TjCustomer customer1 = customerService.getById(order.getUserId()); + log.info("customer1 ->{}",customer1); + List<String> bljcsqdhByPacs = orderService.getBljcsqdhByPacs(order.getCardId(), bldh); + log.info("bljcsqdhByPacs ->{}",bljcsqdhByPacs); + // 浣滃簾妫�鏌ョ敵璇� + if (bljcsqdhByPacs != null && !bljcsqdhByPacs.isEmpty()){ + for (String sqdh : bljcsqdhByPacs) { + AjaxResult cancelPacsAjaxResult = pacsApiMethodService.updatePacsApply(sqdh, order.getCardId(), customer1.getCusName()); + log.info("浣滃簾妫�鏌� pacs杩斿洖 ->{}",JSONUtil.toJsonStr(cancelPacsAjaxResult)); + String result = cancelPacsAjaxResult.get("data").toString(); + JSONObject object = JSONUtil.parseObj(result); + String code = object.getStr("ResultCode"); + if(code.equals("1")){ + orderService.delHuoQuBlJcsqdh(order.getCardId(),bldh); + }else { + return false; } } - // 浣滃簾妫�楠岀敵璇� - if (jysqdh != null && !jysqdh.isEmpty()){ - for (String sqdh : jysqdh) { - AjaxResult cancelLisAjaxResult = lisApiMethod.cancel(sqdh, order.getCardId(), customer1.getCusName()); - log.info("浣滃簾妫�楠� pacs杩斿洖 ->{}",JSONUtil.toJsonStr(cancelLisAjaxResult)); - String result = cancelLisAjaxResult.get("data").toString(); - JSONObject object = JSONUtil.parseObj(result); - String code= object.getStr("ResultCode"); - if(code.equals("1")){ - orderService.delHuoQuBlJysqdh(order.getCardId(),bldh); - }else { - return false; - } + } + List<String> bljysqdhByLis = orderService.getBljysqdhByLis(order.getCardId(), bldh); + log.info("bljysqdhByLis ->{}",bljysqdhByLis); + // 浣滃簾妫�楠岀敵璇� + if (bljysqdhByLis != null && !bljysqdhByLis.isEmpty()){ + for (String sqdh : bljysqdhByLis) { + AjaxResult cancelLisAjaxResult = lisApiMethod.cancel(sqdh, order.getCardId(), customer1.getCusName()); + log.info("浣滃簾妫�楠� pacs杩斿洖 ->{}",JSONUtil.toJsonStr(cancelLisAjaxResult)); + String result = cancelLisAjaxResult.get("data").toString(); + JSONObject object = JSONUtil.parseObj(result); + String code= object.getStr("ResultCode"); + if(code.equals("1")){ + orderService.delHuoQuBlJysqdh(order.getCardId(),bldh); + }else { + return false; } } + } - }else { - //2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇� + List<String> jcsqdh = orderService.getHuoQuBlJcsqdh(order.getCardId(),bldh); + + List<String> jysqdh = orderService.getHuoQuBlJysqdh(order.getCardId(),bldh); +// }else { +// 2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇� if (null != jcsqdh && jcsqdh.size()>0) { for (String s : jcsqdh) { - AjaxResult result = controller.Outpindelexamapply(order.getCardId(), "00029", s); + AjaxResult result = controller.Outpindelexamapply(order.getCardId(), ysbm, s); String result1 = getAjaxResult(result); JSONObject object = getJSONObject(result1); String code = object.getStr("ResultCode"); @@ -998,7 +1000,7 @@ //2.1.6.3 浣滃簾闂ㄨ瘖妫�楠岀敵璇� if (null != jysqdh && jysqdh.size()>0) { for (String s : jysqdh) { - ajaxResult = controller.Outpindeltestapply(order.getCardId(), "00029", s); + ajaxResult = controller.Outpindeltestapply(order.getCardId(), ysbm, s); result2 = getAjaxResult(ajaxResult); object1 = getJSONObject(result2); code1 = object1.getStr("ResultCode"); @@ -1013,7 +1015,7 @@ //2.1.6.9 浣滃簾闂ㄨ瘖娌荤枟澶勭疆鐢宠 if (null != zlsqdh && zlsqdh.size()>0) { for (String s : zlsqdh) { - ajaxResult = controller.Outpintdelreatapply(order.getCardId(), "00029", s); + ajaxResult = controller.Outpintdelreatapply(order.getCardId(), ysbm, s); result2 = getAjaxResult(ajaxResult); object1 = getJSONObject(result2); code1 = object1.getStr("ResultCode"); @@ -1028,7 +1030,7 @@ //浣滃簾鑽搧鐢宠 if(null !=cfhs && cfhs.size()>0){ for (String cfh : cfhs) { - AjaxResult result = controller.Outpindelmedicapply(order.getCardId(), "00029", cfh); + AjaxResult result = controller.Outpindelmedicapply(order.getCardId(), ysbm, cfh); String result1 = getAjaxResult(result); JSONObject object = getJSONObject(result1); String code = object.getStr("ResultCode"); @@ -1039,11 +1041,11 @@ } } } - } +// } return true; } } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage()); return false; } } @@ -1052,6 +1054,7 @@ //閫�璐瑰悗鍙栨秷鎺ヨ瘖浣滃簾鐢宠鍗曠瓑鎿嶄綔 public boolean ZfHisApiMethod(String jzh) { + String ysbm = configService.selectConfigByKey("request_default_ysbm"); Date dates = new Date(); final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss"); @@ -1068,7 +1071,7 @@ //2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇� if (null != jcsqdh && jcsqdh.size()>0) { for (String s : jcsqdh) { - AjaxResult result = controller.Outpindelexamapply(jzh, "00029", s); + AjaxResult result = controller.Outpindelexamapply(jzh, ysbm, s); String result1 = getAjaxResult(result); JSONObject object = getJSONObject(result1); String code = object.getStr("ResultCode"); @@ -1089,7 +1092,7 @@ if (null != jysqdh && jysqdh.size()>0) { for (String s : jysqdh) { - ajaxResult = controller.Outpindeltestapply(jzh, "00029", s); + ajaxResult = controller.Outpindeltestapply(jzh, ysbm, s); result2 = getAjaxResult(ajaxResult); object1 = getJSONObject(result2); code1 = object1.getStr("ResultCode"); @@ -1102,7 +1105,7 @@ //2.1.6.9 浣滃簾闂ㄨ瘖娌荤枟澶勭疆鐢宠 if (null != zlsqdh && zlsqdh.size()>0) { for (String s : zlsqdh) { - ajaxResult = controller.Outpintdelreatapply(jzh, "00029", s); + ajaxResult = controller.Outpintdelreatapply(jzh, ysbm, s); result2 = getAjaxResult(ajaxResult); object1 = getJSONObject(result2); code1 = object1.getStr("ResultCode"); @@ -1115,7 +1118,7 @@ //浣滃簾鑽搧鐢宠 if(null !=cfhs && cfhs.size()>0){ for (String cfh : cfhs) { - AjaxResult result = controller.Outpindelmedicapply(jzh, "00029", cfh); + AjaxResult result = controller.Outpindelmedicapply(jzh, ysbm, cfh); String result1 = getAjaxResult(result); JSONObject object = getJSONObject(result1); String code = object.getStr("ResultCode"); @@ -1127,7 +1130,7 @@ //2.1.3 闂ㄨ瘖鍖荤敓鍙栨秷鎺ヨ瘖 - ajaxResult = controller.Outpinunconapply(jzh, date, "00029"); + ajaxResult = controller.Outpinunconapply(jzh, date, ysbm); result2 = getAjaxResult(ajaxResult); object1 = getJSONObject(result2); code1 = object1.getStr("ResultCode"); -- Gitblit v1.8.0