zjh 2024/01/04--1

zjh

2024-01-04 7e84621b01f42f9729a638c4fa2eb7896fab5ff2

zjh 2024/01/04--1

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

@@ -12,10 +12,9 @@
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.domain.TjXdPicture;
import com.ltkj.hosp.service.ITjCustomerService;
import com.ltkj.hosp.service.ITjProjectService;
import com.ltkj.hosp.service.TjAsyncService;
import com.ltkj.hosp.service.*;
import com.ltkj.system.service.ISysConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -28,7 +27,6 @@
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.enums.BusinessType;
import com.ltkj.hosp.domain.TjPureToneTest;
import com.ltkj.hosp.service.ITjPureToneTestService;
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.common.core.page.TableDataInfo;

@@ -48,6 +46,8 @@
    private ITjCustomerService customerService;
    @Autowired
    private ISysConfigService configService;
    @Resource
    private ITjOrderService orderService;


    /**
@@ -81,10 +81,16 @@
            for (Map.Entry<String, List<TjPureToneTest>> entry : stringListMap.entrySet()) {
                Map<String,Object>map=new HashMap<>();
                TjCustomer customer = customerService.getById(entry.getKey());
                if(customer==null) continue;
                customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
                customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
                customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
                customer.setTjNumber(entry.getValue().get(0).getTjNum());
                TjOrder order = orderService.getOrderByTjNum(entry.getValue().get(0).getTjNum());
                if(null !=order){
                    customer.setTjTime(order.getCreateTime());
                    customer.setTjType(order.getTjCategory());
                }
                map.put("list",entry.getValue());
                map.put("customer",customer);
                map.put("picturePath",configService.selectConfigByKey("TjPureToneTest"));

 ltkj-admin/src/main/resources/application.yml

@@ -210,8 +210,8 @@

#积木报表访问地址
jimu:
#  path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
  path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
  path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
#  path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
#  path: http://192.168.0.5:5000/ltkj-admin
#   path: http://10.168.0.9:5011
#   path: http://192.168.0.105:5011

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java

@@ -430,6 +430,7 @@
     */
    @ApiModelProperty("体检类别")
    private String tjCategory;

    @ApiModelProperty("就诊编号")
    private String cardId;