修改BUG
This commit is contained in:
jiangs
parent
0e8942ee71
commit
f6e0861676
@ -99,6 +99,14 @@ public class RegDictController extends BaseController {
|
||||
@Log(title = SysLogConstants.DICT, businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@Validated @RequestBody RegDict post) {
|
||||
String loginYLJG = getLoginUser().getSysLoginParam().getLoginYLJG();
|
||||
if(loginYLJG == null || loginYLJG.equals("")) return AjaxResult.error("没有获取到登录的医疗机构！");
|
||||
//匹配字典类型
|
||||
if(Arrays.stream(dict_type).anyMatch(post.getDictType():: equals)){
|
||||
post.setHospital_id(Integer.parseInt(loginYLJG));
|
||||
}else{
|
||||
post.setHospital_id(0); //默认医疗机构为0
|
||||
}
|
||||
if (!regDictService.checkDictNameUnique(post)) {
|
||||
return error("修改字典'" + post.getDictName() + "'失败，字典名称已存在");
|
||||
} else if (!regDictService.checkDictCodeUnique(post)) {
|
||||
|
||||
@ -230,7 +230,7 @@ public class RegInterfaceImpl {
|
||||
if(signTime == null) return new Result("-1","signTime标本签收时间不能为空！");
|
||||
if(signUserName == null || signUserName.equals("")) return new Result("-1","signUserName标本签收人员姓名不能为空！");
|
||||
if(signUserCode == null || signUserCode.equals("")) return new Result("-1","signUserCode标本签收人员不能为空！");
|
||||
if(Integer.parseInt(status) > 50) continue;//return new Result("0","该标本已经签收！");
|
||||
if(Integer.parseInt(status) >= 50) continue;//return new Result("0","该标本已经签收！");
|
||||
RegTransitSample regTransitSample50 = new RegTransitSample();
|
||||
regTransitSample50.setBarcode(barcode);
|
||||
regTransitSample50.setSignInTime(signTime);
|
||||
@ -250,6 +250,7 @@ public class RegInterfaceImpl {
|
||||
if(reportTime == null) return new Result("-1","审核时间不能为空！");
|
||||
if(reportUserCode == null || reportUserCode.equals("")) return new Result("-1","审核人代码不能为空！");
|
||||
if(reportUserName == null || reportUserName.equals("")) return new Result("-1","审核人姓名不能为空！");
|
||||
if(Integer.parseInt(status) >= 70) continue;
|
||||
RegTransitSample regTransitSample70 = new RegTransitSample();
|
||||
regTransitSample70.setBarcode(barcode);
|
||||
regTransitSample70.setReportTime(reportTime);
|
||||
@ -267,6 +268,7 @@ public class RegInterfaceImpl {
|
||||
if(cancelTime == null) return new Result("-1","cancelTime申请作废时间不能为空！");
|
||||
if(cancelCode == null || cancelCode.equals("")) return new Result("-1","cancelCode申请作废代码不能为空！");
|
||||
if(cancelName == null || cancelName.equals("")) return new Result("-1","cancelName申请作废名称不能为空！");
|
||||
if(Integer.parseInt(status) == 90) continue;
|
||||
RegTransitSample regTransitSample90 = new RegTransitSample();
|
||||
regTransitSample90.setBarcode(barcode);
|
||||
regTransitSample90.setCancelTime(cancelTime);
|
||||
@ -284,6 +286,8 @@ public class RegInterfaceImpl {
|
||||
if(backTime == null) return new Result("-1","backTime标本退回时间不能为空！");
|
||||
if(backUserCode == null || backUserCode.equals("")) return new Result("-1","backUserCode标本退回人员代码不能为空！");
|
||||
if(backUserName == null || backUserName.equals("")) return new Result("-1","backUserName标本退回人员姓名不能为空！");
|
||||
if(Integer.parseInt(status) == 100) continue;
|
||||
if(Integer.parseInt(status) == 90) return new Result("-1","已作废的标本不允许退回！");
|
||||
RegTransitSample regTransitSample100 = new RegTransitSample();
|
||||
regTransitSample100.setBarcode(barcode);
|
||||
regTransitSample100.setBackTime(backTime);
|
||||
|
||||
@ -567,6 +567,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
|
||||
String patId = regRequestInfoDTO.getPatId();
|
||||
String loginYLJG = SecurityUtils.getLoginUser().getSysLoginParam().getLoginYLJG();
|
||||
RegApply regApply = regRequestInfoMapper.getPatInfo(patId, loginYLJG);
|
||||
if(regApply == null) return new Result("0","没有查到数据！");
|
||||
RegApply regApply1 = new RegApply();
|
||||
regApply1.setPatId(regApply.getPatId());
|
||||
regApply1.setPatType(regApply.getPatType());
|
||||
|
||||
@ -59,7 +59,7 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService {
|
||||
return regInterfaceImpl.addTransitSample(jsonStr);
|
||||
case "delTransitSample": //删除数据接口
|
||||
return regInterfaceImpl.delTransitSample(jsonStr);
|
||||
case "queryTransitSample": //查询数据接口
|
||||
case "queryTransitSample": //查询条码数据接口
|
||||
return regInterfaceImpl.queryTransitSample(jsonStr);
|
||||
case "update": //修改状态
|
||||
return regInterfaceImpl.updateStatus(jsonStr);
|
||||
|
||||
@ -19,11 +19,12 @@
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="classid" column="classid" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectitemclassVo">
|
||||
select itemclass_id, itemclass_code, itemclass_name, itemclass_sort, status, create_by, create_time, remark,
|
||||
itemclass_tips,itemclass_bkcolor,itemclass_yblx,itemclass_printcnt,itemclass_kn
|
||||
itemclass_tips,itemclass_bkcolor,itemclass_yblx,itemclass_printcnt,itemclass_kn,classid
|
||||
from Reg_itemclass
|
||||
</sql>
|
||||
|
||||
@ -81,6 +82,7 @@
|
||||
<if test="status != null and status != ''">status = #{status},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
<if test="classid != null and classid != ''">classid = #{classid},</if>
|
||||
update_time = getdate()
|
||||
</set>
|
||||
where itemclass_id = #{itemclassId}
|
||||
@ -88,7 +90,6 @@
|
||||
|
||||
<insert id="insertItemclass" parameterType="com.transitPlatForm.common.core.domain.entity.reg.RegItemclass" useGeneratedKeys="true" keyProperty="itemclassId">
|
||||
insert into Reg_itemclass(
|
||||
<if test="itemclassId != null and itemclassId != 0">itemclass_id,</if>
|
||||
<if test="itemclassCode != null and itemclassCode != ''">itemclass_code,</if>
|
||||
<if test="itemclassName != null and itemclassName != ''">itemclass_name,</if>
|
||||
<if test="itemclassTips != null and itemclassTips != ''">itemclass_Tips,</if>
|
||||
@ -100,9 +101,9 @@
|
||||
<if test="status != null and status != ''">status,</if>
|
||||
<if test="remark != null and remark != ''">remark,</if>
|
||||
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||
<if test="classid != null and classid != ''">classid,</if>
|
||||
create_time
|
||||
)values(
|
||||
<if test="itemclassId != null and itemclassId != 0">#{itemclassId},</if>
|
||||
<if test="itemclassCode != null and itemclassCode != ''">#{itemclassCode},</if>
|
||||
<if test="itemclassName != null and itemclassName != ''">#{itemclassName},</if>
|
||||
<if test="itemclassTips != null and itemclassTips != ''">#{itemclassTips},</if>
|
||||
@ -114,6 +115,7 @@
|
||||
<if test="status != null and status != ''">#{status},</if>
|
||||
<if test="remark != null and remark != ''">#{remark},</if>
|
||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||
<if test="classid != null and classid != ''">#{classid},</if>
|
||||
getdate()
|
||||
)
|
||||
</insert>
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
<if test="ch != null and ch !=''"> and ch = #{ch}</if>
|
||||
<if test="jzbz != null">and jzbz = #{jzbz}</if>
|
||||
<if test="brlyname != null and brlyname != ''"> and brlyname = #{brlyname}</if>
|
||||
<if test="yljg != null and yljg != ''"> and yljg = #{yljg}</if>
|
||||
</select>
|
||||
|
||||
<select id="getLisReportDetail" resultType="map">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user