签到登记修改

zhaowenxuan

2024-10-14 70b0d82ed60798d922bc32714949fd3df12ed0bf

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java

@@ -78,6 +78,7 @@
import com.ltkj.web.controller.his.*;
import com.ltkj.web.controller.lis.LisApiMethod;
import com.ltkj.web.controller.pacs.PacsApiMethodService;
import com.ltkj.web.controller.service.TjSysAsyncServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -211,6 +212,8 @@
    private HisPDFUtil hisPDFUtil;
    @Value("${path.reportServer}")
    private String urlValue;
    @Autowired
    private TjSysAsyncServiceImpl tjSysAsyncService;

    //将方法返回值解析成json格式
    public JSONObject getJSONObject(String builder) {
@@ -1082,19 +1085,12 @@
                            newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
                        }
                        // 查询 对接Lis、Pacs申请如果类型包含在配置内则使用对接lis、pacs
    //                String useLisAndPacsRegisterDictTeam = configService.selectConfigByKey("use_lis_and_pacs_register_dict_team");
    //                String[] split = useLisAndPacsRegisterDictTeam.split(",");
    //                List<String> list = Arrays.asList(split);
    //                if (list.contains(tjOrder.getTjType())) {
    //                    List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(),tjOrder.getCardId());
    //                    pacsApiMethodService.save(tjOrder,tjCustomer,detailList);
    //                    lisApiMethod.save(tjOrder,tjCustomer,detailList);
    //                }else {
    //                    hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
    //                }

//                        if (isUseLisAndPacsRegister(tjOrder)) {
//                          hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"),tjOrder,sysUser,result);
//                        }else {
//                            hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
//                        }
                        hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());

                        return AjaxResult.success(tjNumber);
                    } else {
                        tjCustomer.setCardId(tjOrder.getTjNumber());
@@ -1124,6 +1120,20 @@
        return AjaxResult.error();
    }

    /**
     * 根据体检类型判断是否需要直接从Lis、pacs直接申请
     */
    public Boolean isUseLisAndPacsRegister(TjOrder tjOrder) {
        try {
            String useLisAndPacsRegisterDictTeam = configService.selectConfigByKey("use_lis_and_pacs_register_dict_team");
            String[] split = useLisAndPacsRegisterDictTeam.split(",");
            List<String> list = Arrays.asList(split);
            return list.contains(tjOrder.getTjType());
        } catch (Exception e) {
            return false;
        }
    }


    @PostMapping("/addPlOrderAndDetail")
    @ApiOperation(value = "体检批量签到登记接口")