diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java index 419e590..70b262c 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java @@ -1,5 +1,6 @@ package com.czlis.interfaceCommon.utils; +import cn.hutool.extra.pinyin.PinyinUtil; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.SysLoginParam; import com.czlis.common.core.domain.entity.SysUser; @@ -1783,6 +1784,14 @@ public class LisWorkUtils { labPat.setPhone(labReqmain.getPhone()); labPat.setAddr(labReqmain.getAddr()); labPat.setLstd(labReqmain.getLstd()); + String brxm0 = labPat.getBrxm(); + if(!"".equals(brxm0)) { + String pinyin = PinyinUtil.getFirstLetter(brxm0, ""); //拼音首字母 + if (pinyin.length() >= 9) { + pinyin = pinyin.substring(0, 9); + } + labPat.setZjf(pinyin); + } if (newpatinfo) commonUtil.insertLabPat(labPat); else commonUtil.updateLabPat(labPat); return new Result("0", "保存成功!", labPat); @@ -1869,6 +1878,14 @@ public class LisWorkUtils { } } labPat = loaddefault(labPat); + String brxm0 = labPat.getBrxm(); + if(!"".equals(brxm0)) { + String pinyin = PinyinUtil.getFirstLetter(brxm0, ""); //拼音首字母 + if (pinyin.length() >= 9) { + pinyin = pinyin.substring(0, 9); + } + labPat.setZjf(pinyin); + } //5.保存数据 if (newpatinfo) commonUtil.insertLabPat(labPat); else commonUtil.updateLabPat(labPat); @@ -1928,14 +1945,6 @@ public class LisWorkUtils { Result result = lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.SETREQSTATUS, setReqStatus); if (!result.getCode().equals("0")) return result; -// //4.获取病人信息 -// DayMessage dayMessage = new DayMessage(); -// dayMessage.setIp(""); -// dayMessage.setYljg("1"); -// dayMessage.setUserid(yhdh); -// dayMessage.setMsgid(LisinterfaceNameConstants.DAYMESSAGE_GETPATIENT); -// String val = labReqmainOne.getBrdh() + "|" + labReqmainOne.getBrly() + "|"; //这里有个医疗机构的,没有传,要考虑 -// dayMessage.setMsg(val); labPat = new LabPat(); labPat.setJyrq(jyrq); labPat.setYq(yq); @@ -2028,6 +2037,8 @@ public class LisWorkUtils { labPat.setYhdh(SecurityUtils.getLoginUser().getUsername()); labPat.setLastuser(yhdh); labPat.setLastdt(ldt_now); + Integer shcs=labPat.getShcs(); + if(shcs==null)labPat.setShcs(0); if (labPat.getJgbz() == null) labPat.setJgbz(LabPatConstants.DEFAULT); return labPat; } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java index 79dbe4f..1b5ff64 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java @@ -51,6 +51,8 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { Date jyrq=labPat.getJyrq(); String yq=labPat.getYq(); String ybh=labPat.getYbh(); + Integer shcs=labPat.getShcs(); + if(shcs==null)labPat.setShcs(0); //要防止别已经修改过了 LabPat labPat0 =commonUtil.getLabPatOne(jyrq,yq,ybh); if(labPat0!=null) {