签收

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/view/LabReqmainVO.java

@@ -0,0 +1,137 @@
+package com.czlis.common.core.domain.entity.lis.view;
+
+import com.czlis.common.core.domain.BaseEntity;
+import com.czlis.common.core.domain.entity.lis.LabReqmain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "LabReqmainVO", description = "申请单表输出")
+@Data
+public class LabReqmainVO extends BaseEntity {
+    @ApiModelProperty(value = "条码号")
+    private String sqh;
+    @ApiModelProperty(value = "科室")
+    private String ksdh;
+    @ApiModelProperty(value = "申请医生")
+    private String sqys;
+    @ApiModelProperty(value = "申请时间")
+    private Date sqsj;
+    @ApiModelProperty(value = "接收医生")
+    private String jsys;
+    @ApiModelProperty(value = "接收时间")
+    private Date jssj;
+    @ApiModelProperty(value = "状态")
+    private String zt;
+    @ApiModelProperty(value = "计价")
+    private String jjzt;
+    @ApiModelProperty(value = "病人类型")
+    private String brly;
+    @ApiModelProperty(value = "病人代号")
+    private String brdh;
+    @ApiModelProperty(value = "病人姓名")
+    private String brxm;
+    @ApiModelProperty(value = "性别")
+    private String brxb;
+    @ApiModelProperty(value = "出生日期")
+    private Date brsr;
+    @ApiModelProperty(value = "备注1")
+    private String bz1;
+    @ApiModelProperty(value = "备注2")
+    private String bz2;
+    @ApiModelProperty(value = "剔回原因")
+    private String bz3;
+    @ApiModelProperty(value = "急诊标志")
+    private String jzbz;
+    private String txm;
+    @ApiModelProperty(value = "床号")
+    private String ch;
+    @ApiModelProperty(value = "样本类型")
+    private String yblx;
+    @ApiModelProperty(value = "执行人")
+    private String zxys;
+    @ApiModelProperty(value = "执行时间")
+    private Date zxsj;
+    @ApiModelProperty(value = "申请单类别")
+    private String bgddh;
+    private Double costs;
+    private Integer nl;
+    private String nldw;
+    @ApiModelProperty(value = "诊断")
+    private String zd;
+    @ApiModelProperty(value = "采样时间")
+    private Date cysj;
+    private Date cksj;
+    private String ckzj;
+    private String ckyh;
+    private String djry;
+    private String inputman;
+    private String powerman;
+    private String contactman;
+    private String refsqh;
+    @ApiModelProperty(value = "采样人")
+    private String cyr;
+    @ApiModelProperty(value = "送检人")
+    private String bbsjr;
+    @ApiModelProperty(value = "送检时间")
+    private Date bbsjsj;
+    private String performby;
+    private String sbbr;
+    private String inzt;
+    private String libpos;
+    private Date inlibtime;
+    private String inlibman;
+    private Date outlibtime;
+    private String outlibman;
+    private String refused;
+    @ApiModelProperty(value = "审核时间")
+    private Date confirmtime;
+    @ApiModelProperty(value = "审核人")
+    private String confirmer;
+    private String cybl;
+    private String bbsjbl;
+    @ApiModelProperty(value = "医疗机构")
+    private String yljg;
+    @ApiModelProperty(value = "卡号")
+    private String kh;
+    @ApiModelProperty(value = "卡类型")
+    private String klx;
+    private Date jzsj;
+    @ApiModelProperty(value = "检验目的")
+    private String jymd;
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+    @ApiModelProperty(value = "家属电话")
+    private String phone1;
+    @ApiModelProperty(value = "上机仪器")
+    private String yqdh;
+    @ApiModelProperty(value = "上机时间")
+    private Date sjsj;
+    @ApiModelProperty(value = "地址")
+    private String addr;
+    @ApiModelProperty(value = "绿色通道")
+    private String lstd;
+    private String ssrq;
+    @ApiModelProperty(value = "生理周期")
+    private String slzq;
+    private Date cyblsj;
+    private Date bbsjblsj;
+    @ApiModelProperty(value = "采集量")
+    private String ybrl;
+    @ApiModelProperty(value = "签收机构")
+    private String qsyljg;
+    @ApiModelProperty(value = "采集部位")
+    private String cjbw;
+    @ApiModelProperty(value = "条码类别名称")
+    private String bgdjc;
+    @ApiModelProperty(value = "条码类别颜色")
+    private Integer bkcolor;
+}

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReqmainMapper.java

@@ -1,6 +1,7 @@
 package com.czlis.interfaceCommon.mapper;
 
 import com.czlis.common.core.domain.entity.lis.LabReqmain;
+import com.czlis.common.core.domain.entity.lis.view.LabReqmainVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
@@ -8,6 +9,7 @@ import java.util.Map;
 
 public interface LabReqmainMapper {
     LabReqmain getLabReqmainOne(String sqh);
+    LabReqmainVO getLabReqmainVO(String sqh);
     int updateLabReqmain(LabReqmain labReqmain);
     int updateLabReqmainAll(LabReqmain labReqmain);
     int deleteLabReqmain(String sqh);

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java

@@ -2,6 +2,7 @@ package com.czlis.interfaceCommon.utils;
 
 import com.czlis.common.core.domain.entity.SysUser;
 import com.czlis.common.core.domain.entity.lis.*;
+import com.czlis.common.core.domain.entity.lis.view.LabReqmainVO;
 import com.czlis.common.utils.ComDictUtils;
 import com.czlis.common.utils.ComOptionUtils;
 import com.czlis.interfaceCommon.mapper.*;
@@ -199,6 +200,9 @@ public class CommonUtil {
     public LabReqmain getLabReqmainOne(String sqh) {
         return labReqmainMapper.getLabReqmainOne(sqh);
     }
+    public LabReqmainVO getLabReqmainVO(String sqh) {
+        return labReqmainMapper.getLabReqmainVO(sqh);
+    }
     @Transactional(rollbackFor = Exception.class)
     public int updateLabReqmain(LabReqmain labReqmain) {
         return labReqmainMapper.updateLabReqmain(labReqmain);

lis-interfaceCommon/src/main/resources/mapper/LabReqmainMapper.xml

@@ -5,6 +5,10 @@
     <select id="getLabReqmainOne" resultType="com.czlis.common.core.domain.entity.lis.LabReqmain">
         select * from lab_reqmain where sqh = #{sqh}
     </select>
+    <select id="getLabReqmainVO" resultType="com.czlis.common.core.domain.entity.lis.view.LabReqmainVO">
+        select lab_reqmain.*,lab_feeitemclass.sflbjc as bgdjc,
+               lab_feeitemclass.bkcolor  as bkcolor from lab_reqmain LEFT OUTER JOIN lab_feeitemclass ON lab_reqmain.bgddh = lab_feeitemclass.sflbdh  where lab_reqmain.sqh = #{sqh}
+    </select>
 
     <update id="zxLabReqmain">
         UPDATE lab_reqmain SET zt = '2', jsys = #{userId}, jssj =getdate() WHERE sqh = #{sqh} AND ('2'> zt  or zt='8' or zxsj>jssj)

liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java

@@ -7,6 +7,7 @@ import com.czlis.common.core.domain.ResultT;
 import com.czlis.common.core.domain.entity.lis.LabPat;
 import com.czlis.common.core.domain.entity.lis.LabReqmain;
 import com.czlis.common.core.domain.entity.lis.LabResult;
+import com.czlis.common.core.domain.entity.lis.view.LabReqmainVO;
 import com.czlis.common.core.page.TableDataInfo;
 import com.czlis.common.enums.BusinessType;
 import com.czlis.interfaceCommon.constants.SysLogConstants;
@@ -242,6 +243,6 @@ public class LisWorkController extends BaseController {
     @ApiOperation("查询条码")
     @GetMapping("/querybarcode")
     public ResultT querybarcode(String sqh) {
-        return ResultT.fromResult(lisWorkService.querybarcode(sqh),LabReqmain.class);
+        return ResultT.fromResult(lisWorkService.querybarcode(sqh),LabReqmainVO.class);
     }
 }

liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java

@@ -4,12 +4,14 @@ import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.ResultT;
 import com.czlis.common.core.domain.entity.*;
 import com.czlis.common.core.domain.entity.lis.*;
+import com.czlis.common.core.domain.entity.lis.view.LabReqmainVO;
 import com.czlis.common.enums.UserStatus;
 import com.czlis.common.exception.ServiceException;
 import com.czlis.common.utils.DateUtils;
 import com.czlis.common.utils.MessageUtils;
 import com.czlis.common.utils.SecurityUtils;
 import com.czlis.common.utils.StringUtils;
+import com.czlis.common.utils.bean.BeanUtils;
 import com.czlis.interfaceCommon.constants.ComLogConstants;
 import com.czlis.interfaceCommon.constants.LabReqmainConstants;
 import com.czlis.interfaceCommon.constants.LisinterfaceNameConstants;
@@ -625,10 +627,12 @@ public class LisWorkServiceImpl implements LisWorkService {
         //1.调用接口，获取申请单信息
         Result result=querybarcode(sqh);
         if(!"0".equals(result.getCode()))return result;
-        LabReqmain labReqmainOne =(LabReqmain)result.getData();
+        LabReqmainVO labReqmainvo =(LabReqmainVO)result.getData();
-        if (labReqmainOne == null) {
+        if (labReqmainvo == null) {
             return new Result("-1",sqh+"无数据，处理失败");
         }
+        LabReqmain labReqmainOne=new LabReqmain();
+        BeanUtils.copyBeanProp(labReqmainOne,labReqmainOne);
         //2.调用接口，执行申请单收费
         Result result0=reqbilling(labReqmainOne, yhdh);
         if (!result0.getCode().equals("0")) return result0;
@@ -647,7 +651,7 @@ public class LisWorkServiceImpl implements LisWorkService {
     @Override
     public Result querybarcode(String sqh) {
         String yhdh = SecurityUtils.getUsername();
-        LabReqmain labReqmainOne = commonUtil.getLabReqmainOne(sqh);
+        LabReqmainVO labReqmainOne = commonUtil.getLabReqmainVO(sqh);
         if (labReqmainOne == null) {
             //1.调用接口，获取申请单信息
             GetReqInterface getReqInterface = new GetReqInterface();
@@ -660,7 +664,7 @@ public class LisWorkServiceImpl implements LisWorkService {
             getReqInterface.setYljg(loginConfigParamUtil.getLoginConfigParam().getLoginYLJG());
             getReqInterface.setIp(SecurityUtils.getLoginUser().getIpaddr());
             lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.GETREQINTERFACE, getReqInterface);
-            labReqmainOne = commonUtil.getLabReqmainOne(sqh);
+            labReqmainOne = commonUtil.getLabReqmainVO(sqh);
         }
         if (labReqmainOne == null) return new Result("-1", "没有获取到申请单信息！");
         String zt = labReqmainOne.getZt().trim();