ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
@@ -65,6 +65,8 @@ private TjOrderController tjOrderController; @Autowired private ISysUserService userService; @Autowired private TjOrderYcxmService ycxmService; /** * 收退费回调接口 @@ -138,7 +140,7 @@ remarkService.deletedOrderRemarkByTjNum(order.getTjNumber()); tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId())); transitionService.deletedTbTransitionByTjNum(order.getTjNumber()); ycxmService.delOrderYcXmJyByTjh(order.getTjNumber()); TjCustomer customer = tjCustomerService.getById(order.getUserId()); customer.setCardId("0"); tjCustomerService.updateById(customer); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -234,6 +234,8 @@ private TjFlowingWaterHisService tjFlowingWaterHisService; @Resource private ITjXdPictureService xdPictureService; @Autowired private TjOrderYcxmService ycxmService; //将方法返回值解析成json格式 public JSONObject getJSONObject(String builder) { @@ -2001,6 +2003,15 @@ return AjaxResult.error("操作失败! 以下项目已存在: " + string); } transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId); //补差价 List<Map<String,Object>> cjMaps = groupingProService.huoquxiangmuchajia(pacId.toString(), cusId); if(null !=cjMaps && !cjMaps.isEmpty()){ for (Map<String, Object> cjMap : cjMaps) { transitionService.buxiangmuchajia(cusId,pacId.toString(),cjMap.get("xmid").toString(),new BigDecimal(cjMap.get("cj").toString())); } } } } } @@ -3086,6 +3097,7 @@ remarkService.deletedOrderRemarkByTjNum(tjNum); tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId())); transitionService.deletedTbTransitionByTjNum(tjNum); ycxmService.delOrderYcXmJyByTjh(tjNum); TjCustomer customer = tjCustomerService.getById(order.getUserId()); customer.setCardId("0"); @@ -3694,9 +3706,11 @@ } } } if(!list.isEmpty()) { int i = tjReportService.deleteTjReportByReIds(list.toArray(new Long[]{})); if (i == 0) { return AjaxResult.error("撤回失败！"); } } return AjaxResult.success("操作成功"); } @@ -3749,7 +3763,6 @@ return AjaxResult.error("操作失败! 以下项目已存在: " + string); } transitionService.ttsaveTemoTransitionByGroupingId(cusId, cardId, pacId.toString()); //补差价 List<Map<String,Object>> cjMaps = groupingProService.huoquxiangmuchajia(pacId.toString(), cusId); if(null !=cjMaps && !cjMaps.isEmpty()){ @@ -3781,6 +3794,16 @@ @GetMapping(value = "newgetTransitionList") @ApiOperation(value = "最新查询过渡表数据") public AjaxResult newgetTransitionList(@RequestParam @ApiParam(value = "客户id") String cusId) { // String pacId = transitionService.getTbTransitionPacId(cusId); // if(StringUtil.isNotBlank(pacId)){ // //补差价 // List<Map<String,Object>> cjMaps = groupingProService.huoquxiangmuchajia(pacId, cusId); // if(null !=cjMaps && !cjMaps.isEmpty()){ // for (Map<String, Object> cjMap : cjMaps) { // transitionService.buxiangmuchajia(cusId,pacId,cjMap.get("xmid").toString(),new BigDecimal(cjMap.get("cj").toString())); // } // } // } List<TbTransition> list= transitionService.newgetTransitionList(cusId); return AjaxResult.success(list); } ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java
@@ -123,8 +123,15 @@ @Log(title = "体检项目建议规则新表", businessType = BusinessType.INSERT) @PostMapping @ApiOperation(value = "新增体检项目建议规则新表") public AjaxResult add(@RequestBody TjProAdvicerules tjProAdvicerules) { return toAjax(tjProAdvicerulesService.insertTjProAdvicerules(tjProAdvicerules)); public AjaxResult add(@RequestBody TjProAdvicerules advicerules) { if(StringUtil.isNotBlank(advicerules.getFwz())){ if(advicerules.getFwz().contains("-")){ String[] split = advicerules.getFwz().split("-"); advicerules.setFwzdz(split[1]); advicerules.setFwzxz(split[0]); } } return toAjax(tjProAdvicerulesService.save(advicerules)); } /** @@ -134,8 +141,15 @@ @Log(title = "体检项目建议规则新表", businessType = BusinessType.UPDATE) @PutMapping @ApiOperation(value = "修改体检项目建议规则新表") public AjaxResult edit(@RequestBody TjProAdvicerules tjProAdvicerules) { return toAjax(tjProAdvicerulesService.updateTjProAdvicerules(tjProAdvicerules)); public AjaxResult edit(@RequestBody TjProAdvicerules advicerules) { if(StringUtil.isNotBlank(advicerules.getFwz())){ if(advicerules.getFwz().contains("-")){ String[] split = advicerules.getFwz().split("-"); advicerules.setFwzdz(split[1]); advicerules.setFwzxz(split[0]); } } return toAjax(tjProAdvicerulesService.updateById(advicerules)); } /** ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -106,6 +106,8 @@ private IDictHospService dictHospService; @Autowired private ITjReportPrintService printService; @Autowired private TjOrderYcxmService ycxmService; @GetMapping("/savePdf") @ApiOperation(value = "从本地存储模板到数据库") @@ -2167,6 +2169,7 @@ one.setPrintLastTime(null); one.setDownloadLastTime(null); if (tjOrderService.updateById(one)) { ycxmService.delOrderYcXmJyByTjh(tjNumber); return AjaxResult.success("撤回成功！"); } } ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java
@@ -90,7 +90,7 @@ zhxm.setPym(PinyinUtil.getFirstLetter(zhxm.getZhmc(), "")); if (zhxmService.save(zhxm)) { List<TjZhxmglpro> zhxmglpros = zhxm.getZhxmglpros(); if (null != zhxmglpros && zhxmglpros.size() > 0) { if (null != zhxmglpros && !zhxmglpros.isEmpty()) { for (TjZhxmglpro zhxmglpro : zhxmglpros) { TjZhxmglpro pro = new TjZhxmglpro(); pro.setZhId(zhxm.getId()); @@ -114,7 +114,7 @@ zhxm.setPym(PinyinUtil.getFirstLetter(zhxm.getZhmc(), "")); if (zhxmService.updateById(zhxm)) { List<TjZhxmglpro> zhxmglpros = zhxm.getZhxmglpros(); if (null != zhxmglpros && zhxmglpros.size() > 0) { if (null != zhxmglpros && !zhxmglpros.isEmpty()) { LambdaQueryWrapper<TjZhxmglpro> wq = new LambdaQueryWrapper<>(); wq.eq(TjZhxmglpro::getZhId, zhxm.getId()); tjZhxmglproService.remove(wq); @@ -143,7 +143,7 @@ List<TjZhxmglpro> list = tjZhxmglproService.list(wq); StringBuilder allName = new StringBuilder(); // StringBuilder allSonName = new StringBuilder(); if (null != list && list.size() > 0) { if (null != list && !list.isEmpty()) { List<TjProject> projectList = new ArrayList<>(); BigDecimal money = new BigDecimal("0.00"); for (TjZhxmglpro zhxmglpro : list) { ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -364,4 +364,8 @@ "t.now_price=(t.now_price+#{cj})\n" + "WHERE t.id=aa.id") void buxiangmuchajia(@Param("idCard") String idCard,@Param("pacId") String pacId,@Param("proId") String proId,@Param("cj") BigDecimal cj); @Select("SELECT a.pac_id FROM tb_transition a WHERE a.cus_id=#{idCard} AND isnull(a.tj_num) and !isnull(a.pac_id) LIMIT 1 ") String getTbTransitionPacId(String cusId); } ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjGroupingProMapper.java
@@ -99,7 +99,7 @@ "\n" + "SELECT a.parent_pro_id,SUM(a.now_price)ys FROM tb_transition a WHERE a.cus_id=#{cusIdCard} AND pac_id=#{groupingId} AND ISNULL(a.tj_num) GROUP BY a.parent_pro_id)aa\n" + "ON\n" + "g.pro_id=aa.parent_pro_id AND g.grouping_id=#{groupingId} AND (g.ys_price-aa.ys)>0") "trim(g.pro_id)=trim(aa.parent_pro_id ) where g.grouping_id=#{groupingId} AND (g.ys_price-aa.ys)>0") List<Map<String,Object>> huoquxiangmuchajia(@Param("groupingId") String groupingId, @Param("cusIdCard") String cusIdCard); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
@@ -144,4 +144,7 @@ TbTransition getOnwTbTransition(String idCard,String tjNumber); void buxiangmuchajia(String idCard,String pacId,String proId,BigDecimal cj); String getTbTransitionPacId(String cusId); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
@@ -247,4 +247,9 @@ public void buxiangmuchajia(String idCard, String pacId,String proId, BigDecimal cj) { tbTransitionMapper.buxiangmuchajia( idCard, pacId,proId, cj); } @Override public String getTbTransitionPacId(String cusId) { return tbTransitionMapper.getTbTransitionPacId(cusId); } }
