ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
@@ -7,20 +7,23 @@ import com.ltkj.common.core.domain.AjaxResult; import com.ltkj.hosp.domain.TjOrder; import com.ltkj.hosp.mapper.TjCustomerMapper; import com.ltkj.hosp.service.ITjOrderDetailService; import com.ltkj.hosp.service.ITjOrderService; import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo; import com.ltkj.web.controller.system.TjCheckController; import com.ltkj.web.controller.system.TjReportController; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Map; import static com.ltkj.framework.datasource.DynamicDataSourceContextHolder.log; /** * @Company: 西安路泰科技有限公司 @@ -39,6 +42,8 @@ private TjCustomerMapper tjCustomerMapper; @Autowired private ITjOrderService tjOrderService; @Autowired private ITjOrderDetailService detailService; /** * 提供给三方调用的报告查看接口 @@ -145,4 +150,28 @@ } } /** * 小程序点击体检报告查询详情,显示身高体重体重指数收缩压舒张压 */ @GetMapping("/getShenGaoTiZhong") @ApiOperation(value = "小程序-体检报告查询详情") public AjaxResult getShenGaoTiZhong(@RequestParam @ApiParam(value = "体检号") String tjNumber) { // Map<String, Object> objectMap = new HashMap<>(); LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>(); wq1.eq(TjOrder::getTjNumber, tjNumber); wq1.eq(TjOrder::getCheckStatus, 1); TjOrder one = tjOrderService.getOne(wq1); if (one == null) { return AjaxResult.success("体检暂未完成！！"); } List<ShenGaoTiZhongVo> maps = detailService.getShenGaoTiZhongList(one.getTjNumber()); log.info("ltkj {}的体检报告查询详情"+maps,tjNumber); return AjaxResult.success(maps); } } ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -2072,4 +2072,14 @@ return detailService.updFcPro(json); } @GetMapping("/zongjianyishengHuiFuyichangxiangmu") @ApiOperation(value = "总检恢复异常项目接口") public AjaxResult zongjianyishengHuiFuyichangxiangmu(@RequestParam String tjNum) { List<TjOrderYcxm> list = ycxmService.zongjianyishengHuiFuyichangxiangmu(tjNum); return AjaxResult.success(list); } } ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -41,6 +41,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import jodd.util.StringUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -178,7 +179,7 @@ @ApiOperation(value = "查询体检预约列表接口(默认)") public TableDataInfo list(TjReservation tjReservation) { startPage(); tjReservation.setIsExpire(2); if(tjReservation.getIsExpire()==null) tjReservation.setIsExpire(2); List<TjReservation> list = tjReservationService.selectTjReservationList(tjReservation); // if(null !=list && list.size()>0){ // for (TjReservation reservation : list) { ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
@@ -439,7 +439,7 @@ jcycxmService.remove(wq); if(StringUtil.isNotBlank(xdtgmdjg.getJcjl())){ String s = "。|；|;|,|，"; String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "").split(s); String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "。").split(s); for (String jg : split) { if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常") && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见") ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
@@ -117,7 +117,7 @@ // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() .antMatchers("/api/viewReport","/api/reportData","/api/getInfo").permitAll() .antMatchers("/api/**").permitAll() .antMatchers("/jmreport/**","/lis/**","/pacs/**","/callBack/**","/hosp/order/signOrderInfo").anonymous() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated() ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
@@ -333,6 +333,18 @@ @TableField(exist = false) private Integer tjStatus; @ApiModelProperty("预约时间开始") @TableField(exist = false) @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd") private Date yykssj; @ApiModelProperty("预约时间结束") @TableField(exist = false) @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd") private Date yyjssj; @ApiModelProperty("座机") private String dwPhone;
@@ -24,4 +24,8 @@ @Select("select * FROM tj_order_ycxm WHERE tjh=#{tjNumber}") List<TjOrderYcxm> selectListByTjh(String tjNumber); @Select("select * FROM tj_order_ycxm WHERE tjh=#{tjNum} and deleted=1") List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java
@@ -17,4 +17,6 @@ void delOrderYcXmJyByTjh(String tjh); List<TjOrderYcxm> selectListByTjh(String tjNumber); List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java
@@ -31,4 +31,9 @@ public List<TjOrderYcxm> selectListByTjh(String tjNumber) { return mapper.selectListByTjh(tjNumber); } @Override public List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum) { return mapper.zongjianyishengHuiFuyichangxiangmu(tjNum); } } ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
@@ -85,7 +85,7 @@ <if test="phoe != null and phoe != ''">and phoe = #{phoe}</if> <if test="company != null and company != ''">and company like concat('%', #{company}, '%')</if> <if test="companyId != null and companyId != ''">and company_id = #{companyId} </if> <if test="reservationTime != null ">and reservation_time BETWEEN #{reservationTime} and now()</if> <if test="yykssj != null and yyjssj != null ">and reservation_time BETWEEN #{yykssj} and #{yyjssj} </if> <if test="isExpire != null ">and is_expire = #{isExpire}</if> and deleted = '0' </where>
