住院采血增加功能
This commit is contained in:
jiangs
parent
710b085b8e
commit
0b4488d6dd
@ -0,0 +1,78 @@
|
||||
package com.czlis.common.core.domain.entity;
|
||||
|
||||
|
||||
import com.czlis.common.core.domain.BaseEntity;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class LabPat extends BaseEntity {
|
||||
private Date jyrq;
|
||||
private String yq;
|
||||
private String ybh;
|
||||
private String yblx;
|
||||
private String fb;
|
||||
private String ksdh;
|
||||
private String sjys;
|
||||
private String hdys;
|
||||
private String yhdh;
|
||||
private String brdh;
|
||||
private String brxm;
|
||||
private String brxb;
|
||||
private String brly;
|
||||
private String ch;
|
||||
private Integer nl;
|
||||
private String nldw;
|
||||
private String sqh;
|
||||
private Date sqsj;
|
||||
private Date dysj;
|
||||
private String dybz;
|
||||
private String jgbz;
|
||||
private String bbbz;
|
||||
private String zd;
|
||||
private String bz;
|
||||
private String bz1;
|
||||
private String zjf;
|
||||
private Date cyrq;
|
||||
private String bq;
|
||||
private String czybh;
|
||||
private String cjbw;
|
||||
private String jymd;
|
||||
private String lastuser;
|
||||
private Date lastdt;
|
||||
private String confirmer;
|
||||
private Date confirmdt;
|
||||
private String mzdy;
|
||||
private String fslx;
|
||||
private String ybzt;
|
||||
private String instrid;
|
||||
private String jzbz;
|
||||
private String sbbr;
|
||||
// private String qrr;
|
||||
// private Date qrsj;
|
||||
private String alarmflag;
|
||||
private String alarmconfirm;
|
||||
private Date alarmconfirmdt;
|
||||
private String mzh;
|
||||
private String yljg;
|
||||
private String finish;
|
||||
private String send_flag;
|
||||
private String sfzh;
|
||||
private String phone;
|
||||
private String phone1;
|
||||
private String addr;
|
||||
private String zjlx;
|
||||
private String upload;
|
||||
private String wyh;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
package com.czlis.common.core.domain.entity;
|
||||
|
||||
import com.czlis.common.core.domain.BaseEntity;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Data
|
||||
public class LabReqdetail extends BaseEntity {
|
||||
private String sqh;
|
||||
private Integer xh;
|
||||
private String sqxmdh;
|
||||
private String sqxmmc;
|
||||
private Integer sl;
|
||||
private BigDecimal dj;
|
||||
private String zt;
|
||||
private String jjzt;
|
||||
private String bz1;
|
||||
private String bz2;
|
||||
private BigDecimal costs;
|
||||
private Integer numbk1;
|
||||
private Integer numbk2;
|
||||
private Date dtbk1;
|
||||
private Date dtbk2;
|
||||
private String bz3;
|
||||
|
||||
}
|
||||
@ -0,0 +1,75 @@
|
||||
package com.czlis.common.core.domain.entity;
|
||||
|
||||
import com.czlis.common.core.domain.BaseEntity;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Data
|
||||
public class LabReqmain extends BaseEntity {
|
||||
private String sqh;
|
||||
private String ksdh;
|
||||
private String sqys;
|
||||
private Date sqsj;
|
||||
private String jsys;
|
||||
private Date jssj;
|
||||
private String zt;
|
||||
private String jjzt;
|
||||
private String brly;
|
||||
private String brdh;
|
||||
private String brxm;
|
||||
private String brxb;
|
||||
private Date brsr;
|
||||
private String bz1;
|
||||
private String bz2;
|
||||
private String bz3;
|
||||
private String jzbz;
|
||||
private String txm;
|
||||
private String ch;
|
||||
private String yblx;
|
||||
private String zxys;
|
||||
private Date zxsj;
|
||||
private String bgddh;
|
||||
private BigDecimal costs;
|
||||
private Integer nl;
|
||||
private String nldw;
|
||||
private String zd;
|
||||
private Date cysj;
|
||||
private Date cksj;
|
||||
private String yljg;
|
||||
private String kh;
|
||||
private String klx;
|
||||
private Date jzsj;
|
||||
private String jymd;
|
||||
private String sfzh;
|
||||
private String phone;
|
||||
private String phone1;
|
||||
private Date confirmtime;
|
||||
private String confirmer;
|
||||
private String cyr;
|
||||
private String addr;
|
||||
private String fb;
|
||||
private String bbsjr;
|
||||
private Date bbsjsj;
|
||||
//@TableField(exist = false)
|
||||
private String czid;
|
||||
// @TableField(exist = false)
|
||||
private String czmc;
|
||||
// @TableField(exist = false)
|
||||
private String jzjlid;
|
||||
// @TableField(exist = false)
|
||||
private String hzdh;
|
||||
// @TableField(exist = false)
|
||||
private String zxks;
|
||||
// @TableField(exist = false)
|
||||
private String hosid;
|
||||
private String lstd;
|
||||
private String jcptbz;
|
||||
private String slzq;
|
||||
private Date sjsj;
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
package com.czlis.common.core.domain.entity;
|
||||
|
||||
|
||||
import com.czlis.common.core.domain.BaseEntity;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class LabResult extends BaseEntity {
|
||||
private Date jyrq;
|
||||
private String yq;
|
||||
private String ybh;
|
||||
private String xmdh;
|
||||
private String csjg;
|
||||
private String od;
|
||||
private String cutoff;
|
||||
private String jgbz;
|
||||
private String bz1;
|
||||
private String bz2;
|
||||
private String yhdh;
|
||||
private String textresult;
|
||||
private String instrid;
|
||||
private Date operdt;
|
||||
private String operna;
|
||||
private String refs;
|
||||
private String flag;
|
||||
private String dw;
|
||||
private String result_flag;
|
||||
private String alarm_flag;
|
||||
private String redo_flag;
|
||||
private String sqxmdh;
|
||||
|
||||
}
|
||||
@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</select>
|
||||
|
||||
<select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
|
||||
select top 1 distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
|
||||
select distinct top 1 r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
|
||||
r.status, r.del_flag, r.create_time, r.remark
|
||||
from sys_role r
|
||||
left join sys_user_role ur on ur.role_id = r.role_id
|
||||
@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</select>
|
||||
|
||||
<select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
|
||||
select top 1 distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
|
||||
select distinct top 1 r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
|
||||
r.status, r.del_flag, r.create_time, r.remark
|
||||
from sys_role r
|
||||
left join sys_user_role ur on ur.role_id = r.role_id
|
||||
|
||||
@ -2,6 +2,7 @@ package com.czlis.zycx.controller;
|
||||
|
||||
import com.czlis.common.core.controller.BaseController;
|
||||
import com.czlis.common.core.domain.Result;
|
||||
import com.czlis.common.core.domain.entity.LabReqmain;
|
||||
import com.czlis.common.core.page.TableDataInfo;
|
||||
import com.czlis.zycx.pojo.Web_getBarcode;
|
||||
import com.czlis.zycx.service.ZycxService;
|
||||
@ -31,9 +32,9 @@ public class ZycxController extends BaseController {
|
||||
@ApiOperation("获取申请单")
|
||||
@GetMapping("/query")
|
||||
//@PreAuthorize("@ss.hasPermi('zycx:interface:query')")
|
||||
public TableDataInfo getSQDInfo(Web_getBarcode webGetBarcode){
|
||||
public TableDataInfo getSQDInfo(LabReqmain labReqmain){
|
||||
startPage();
|
||||
List<Web_getBarcode> sqdInfoList = zycxService.getSQDInfo(webGetBarcode);
|
||||
List<LabReqmain> sqdInfoList = zycxService.getSQDInfo(labReqmain);
|
||||
return getDataTable(sqdInfoList);
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.czlis.zycx.mapper;
|
||||
|
||||
import com.czlis.common.core.domain.entity.LabReqmain;
|
||||
import com.czlis.zycx.pojo.Web_getBarcode;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@ -8,5 +9,5 @@ import java.util.List;
|
||||
|
||||
public interface ZycxMapper {
|
||||
|
||||
List<Web_getBarcode> getSQDInfo(Web_getBarcode web_getBarcode);
|
||||
List<LabReqmain> getSQDInfo(LabReqmain labReqmain);
|
||||
}
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
package com.czlis.zycx.service;
|
||||
|
||||
import com.czlis.common.core.domain.Result;
|
||||
import com.czlis.common.core.domain.entity.LabReqmain;
|
||||
import com.czlis.common.core.page.TableDataInfo;
|
||||
import com.czlis.zycx.pojo.Web_getBarcode;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface ZycxService {
|
||||
List<Web_getBarcode> getSQDInfo(Web_getBarcode webGetBarcode);
|
||||
List<LabReqmain> getSQDInfo(LabReqmain labReqmain);
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package com.czlis.zycx.service.impl;
|
||||
|
||||
import com.czlis.common.core.domain.Result;
|
||||
import com.czlis.common.core.domain.entity.LabReqmain;
|
||||
import com.czlis.zycx.mapper.ZycxMapper;
|
||||
import com.czlis.zycx.pojo.Web_getBarcode;
|
||||
import com.czlis.zycx.service.ZycxService;
|
||||
@ -20,8 +21,8 @@ public class ZycxServiceImpl implements ZycxService {
|
||||
|
||||
|
||||
@Override
|
||||
public List<Web_getBarcode> getSQDInfo(Web_getBarcode webGetBarcode) {
|
||||
return zycxMapper.getSQDInfo(webGetBarcode);
|
||||
public List<LabReqmain> getSQDInfo(LabReqmain labReqmain) {
|
||||
return zycxMapper.getSQDInfo(labReqmain);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -4,49 +4,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.czlis.zycx.mapper.ZycxMapper">
|
||||
|
||||
|
||||
|
||||
<sql id="selectWeb_getBarcodeVo">
|
||||
SELECT sqh,ksdh,sqys,sqsj,jsys,jssj,zt,jjzt,brly,brdh,brxm,brxb,brsr,bz1,bz2,bz3,jzbz,txm,ch,yblx,zxys,zxsj,bgddh,costs,nl,nldw,zd,cysj,cksj,ckzj,ckyh,djry,inputman,powerman,contactman
|
||||
,refsqh,cyr,bbsjr,bbsjsj,performby,sbbr,inzt,libpos,inlibtime,inlibman,outlibtime,outlibman,refused,confirmtime,confirmer,cybl,bbsjbl,yljg
|
||||
,kh
|
||||
,klx
|
||||
,jzsj
|
||||
,jymd
|
||||
,sfzh
|
||||
,phone
|
||||
,phone1
|
||||
,cyjs
|
||||
,jswc
|
||||
,yqdh
|
||||
,sjsj
|
||||
,send_flag
|
||||
,addr
|
||||
,lstd
|
||||
,ssrq
|
||||
,slzq
|
||||
,cyblsj
|
||||
,bbsjblsj
|
||||
,bgddhname
|
||||
,bkcolor
|
||||
,sflbjc
|
||||
,sampletips
|
||||
,ksname
|
||||
,sqysname
|
||||
,jsysname
|
||||
,brlyname
|
||||
,brxbname
|
||||
,yblxname
|
||||
,zxysname
|
||||
,cyrname
|
||||
,Bbsjrname
|
||||
,confirmername
|
||||
,yljgname
|
||||
FROM web_getBarcode
|
||||
<sql id="selectLabReqmainVo">
|
||||
select * from lab_reqmain where 1=1
|
||||
</sql>
|
||||
|
||||
<select id="getSQDInfo" parameterType="com.czlis.zycx.pojo.Web_getBarcode" resultType="com.czlis.zycx.pojo.Web_getBarcode">
|
||||
<include refid="selectWeb_getBarcodeVo"></include>
|
||||
<select id="getSQDInfo" parameterType="com.czlis.common.core.domain.entity.LabReqmain" resultType="com.czlis.common.core.domain.entity.LabReqmain">
|
||||
<include refid="selectLabReqmainVo"></include>
|
||||
<if test="sqh != null and sqh != ''"> and sqh = #{sqh}</if>
|
||||
<if test="zt != null and zt != ''"> and zt = #{zt}</if>
|
||||
<if test="ksdh != null and ksdh != ''"> and ksdh = #{ksdh}</if>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user