无纸化归档功能修改

master
xuhaoxiang 4 years ago
parent a1f6aaec75
commit ed5250ccda

@ -82,12 +82,12 @@ public class signListController {
public OffsetLimitPage signList(HttpServletRequest request, HttpServletResponse response, Sign_List_Vo signListVo, Integer offset, Integer limit) throws UnsupportedEncodingException {
response.setCharacterEncoding("utf-8");
request.setCharacterEncoding("utf-8");
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
//签收日期没进行选择的话则默认显示的是当前日期的数据
if(signListVo.getStartSignDate()==null||"".equals(signListVo.getStartSignDate())){
if (signListVo.getStartSignDate() == null || "".equals(signListVo.getStartSignDate())) {
signListVo.setStartSignDate(sdf.format(new Date()));
}
if(signListVo.getEndSignDate()==null||"".equals(signListVo.getEndSignDate())){
if (signListVo.getEndSignDate() == null || "".equals(signListVo.getEndSignDate())) {
signListVo.setEndSignDate(sdf.format(new Date()));
}
OffsetLimitPage result = signListService.selectSignList(signListVo, offset, limit);
@ -95,25 +95,25 @@ public class signListController {
}
@ResponseBody
@RequestMapping(value = "/addSignList")
public String addSignList(HttpServletRequest request, HttpServletResponse response, Archive_Master_Vo archiveMasterVo) throws Exception {
response.setCharacterEncoding("utf-8");
request.setCharacterEncoding("utf-8");
String result="";
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
List<Archive_Master> master=archiveMasterService.selectByCol(archiveMasterVo);
Sign_List signList=new Sign_List();
if(master!=null&&master.size()>0){
if(!"0".equals(master.get(0).getIsscaned())){
String result = "";
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
List<Archive_Master> master = archiveMasterService.selectByCol(archiveMasterVo);
Sign_List signList = new Sign_List();
if (master != null && master.size() > 0) {
if (!"0".equals(master.get(0).getIsscaned())) {
//判断master表里纸质病历已经提交且有医生提交记录则取医生数据作为提交人否则护士为提交人
signList.setC2("".equals(master.get(0).getDoctorName())&&master.get(0).getDoctorName()!=null?master.get(0).getDoctorName():master.get(0).getNurseName());
signList.setC2("".equals(master.get(0).getDoctorName()) && master.get(0).getDoctorName() != null ? master.get(0).getDoctorName() : master.get(0).getNurseName());
//送纸质病历者所在科室
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<JSONObject> powerUserList= JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
ln:for (JSONObject jsonObjectNew : powerUserList) {
if(jsonObjectNew.getString("userName").equals(signList.getC2())){
List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
ln:
for (JSONObject jsonObjectNew : powerUserList) {
if (jsonObjectNew.getString("userName").equals(signList.getC2())) {
signList.setC3(jsonObjectNew.getString("deptId"));
break ln;
}
@ -125,9 +125,9 @@ public class signListController {
Subject currentUser = SecurityUtils.getSubject();
Session session = currentUser.getSession();
signList.setC1((String)session.getAttribute("userSession"));
signList.setC1((String) session.getAttribute("userSession"));
signList.setC5("1");
List<Sign_List> returnList=signListService.selectSignListWith(signList);
List<Sign_List> returnList = signListService.selectSignListWith(signList);
signList.setId(IDHelper.NewID());
/*signList.setC2(master.get(0).getSigner());
@ -135,13 +135,13 @@ public class signListController {
signList.setCreatedtime(sdf.format(new Date()));
signList.setdTime(sdf.format(new Date()));
signList.setT1(sdf.format(new Date()));
int z=signListService.insertSignList(signList);
result="签收成功";
}else{
result="该病历归档医生或护士尚未提交,是否强制签收?";
int z = signListService.insertSignList(signList);
result = "签收成功";
} else {
result = "该病历归档医生或护士尚未提交,是否强制签收?";
}
}else{
result="未查询到住院号为:"+archiveMasterVo.getInpNo()+"的患者住院病历信息";
} else {
result = "未查询到住院号为:" + archiveMasterVo.getInpNo() + "的患者住院病历信息";
}
//OffsetLimitPage result = archiveMasterService.selectByLast(archiveMasterVo);
return result;
@ -152,39 +152,40 @@ public class signListController {
public String addSignListForce(HttpServletRequest request, HttpServletResponse response, Archive_Master_Vo archiveMasterVo) throws Exception {
response.setCharacterEncoding("utf-8");
request.setCharacterEncoding("utf-8");
String result="";
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if(StringUtils.isNotBlank(archiveMasterVo.getInpNo())&&StringUtils.isNotBlank(archiveMasterVo.getVisitId())){
List<Archive_Master> master=archiveMasterService.selectByCol(archiveMasterVo);
Sign_List signList=new Sign_List();
signList.setOtherInfo("强制签收");
//判断master表里纸质病历已经提交且有医生提交记录则取医生数据作为提交人否则护士为提交人
signList.setC2("".equals(master.get(0).getDoctorName())&&master.get(0).getDoctorName()!=null?master.get(0).getDoctorName():master.get(0).getNurseName());
//送纸质病历者所在科室
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<JSONObject> powerUserList= JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
ln:for (JSONObject jsonObjectNew : powerUserList) {
if(jsonObjectNew.getString("userName").equals(signList.getC2())){
signList.setC3(jsonObjectNew.getString("deptId"));
break ln;
String result = "";
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (StringUtils.isNotBlank(archiveMasterVo.getInpNo()) && StringUtils.isNotBlank(archiveMasterVo.getVisitId())) {
List<Archive_Master> master = archiveMasterService.selectByCol(archiveMasterVo);
Sign_List signList = new Sign_List();
signList.setOtherInfo("强制签收");
//判断master表里纸质病历已经提交且有医生提交记录则取医生数据作为提交人否则护士为提交人
signList.setC2("".equals(master.get(0).getDoctorName()) && master.get(0).getDoctorName() != null ? master.get(0).getDoctorName() : master.get(0).getNurseName());
//送纸质病历者所在科室
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
ln:
for (JSONObject jsonObjectNew : powerUserList) {
if (jsonObjectNew.getString("userName").equals(signList.getC2())) {
signList.setC3(jsonObjectNew.getString("deptId"));
break ln;
}
}
}
signList.setSysFlag(1);
signList.setMasterID(master.get(0).getId());
signList.setPid(master.get(0).getPatientId());
Subject currentUser = SecurityUtils.getSubject();
Session session = currentUser.getSession();
signList.setC1((String)session.getAttribute("userSession"));
signList.setC5("1");
List<Sign_List> returnList=signListService.selectSignListWith(signList);
signList.setId(IDHelper.NewID());
signList.setCreatedtime(sdf.format(new Date()));
signList.setdTime(sdf.format(new Date()));
signList.setT1(sdf.format(new Date()));
signListService.insertSignList(signList);
result="签收成功";
}else{
result="缺少患者住院号及住院次数";
signList.setSysFlag(1);
signList.setMasterID(master.get(0).getId());
signList.setPid(master.get(0).getPatientId());
Subject currentUser = SecurityUtils.getSubject();
Session session = currentUser.getSession();
signList.setC1((String) session.getAttribute("userSession"));
signList.setC5("1");
List<Sign_List> returnList = signListService.selectSignListWith(signList);
signList.setId(IDHelper.NewID());
signList.setCreatedtime(sdf.format(new Date()));
signList.setdTime(sdf.format(new Date()));
signList.setT1(sdf.format(new Date()));
signListService.insertSignList(signList);
result = "签收成功";
} else {
result = "缺少患者住院号及住院次数";
}
return result;
}
@ -202,14 +203,14 @@ public class signListController {
@RequestMapping(value = "/exportExcel")
public void exportExcel(HttpServletResponse response, Archive_Master_Vo archiveMasterVo) throws Exception {
response.setContentType("application/vnd.ms-excel;charset=UTF-8");
String[] header = {"病历清单id","住院号","住院次数","名字","性别","身份证","出院科室","出院日期","主管医生","状态","医生是否提交","医生","医生提交日期","护士是否提交","护士","护士提交日期","电子病历医生提交","电子病历护士提交","是否死亡","是否签收","签收人","签收时间"};
String[] fileNames = {"id","inpNo","visitId","name","sex","idNo","deptName","dischargeDateTime","doctorInCharge","archivestate","cmtDoctor","doctorName","cmtDoctorDate","cmtNurse","nurseName","cmtDurseDate","emrDoctorCmt","emrNureCmt","deathFlag","is_sign","signer","sign_time"};
String[] header = {"病历清单id", "住院号", "住院次数", "名字", "性别", "身份证", "出院科室", "出院日期", "主管医生", "状态", "医生是否提交", "医生", "医生提交日期", "护士是否提交", "护士", "护士提交日期", "电子病历医生提交", "电子病历护士提交", "是否死亡", "是否签收", "签收人", "签收时间"};
String[] fileNames = {"id", "inpNo", "visitId", "name", "sex", "idNo", "deptName", "dischargeDateTime", "doctorInCharge", "archivestate", "cmtDoctor", "doctorName", "cmtDoctorDate", "cmtNurse", "nurseName", "cmtDurseDate", "emrDoctorCmt", "emrNureCmt", "deathFlag", "is_sign", "signer", "sign_time"};
//文件名
String fileName = "病案室终审" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
//构造excel的数据
List<Archive_Master_Vo> list = archiveMasterService.selectByLast(archiveMasterVo);
ThreadExcelUtils utils = new ThreadExcelUtils(fileName, "", header, fileNames);
String result=utils.exportExcelToFilePath(response,utils.listConvert(list));
String result = utils.exportExcelToFilePath(response, utils.listConvert(list));
}
@ -238,95 +239,95 @@ public class signListController {
public int updateDetailByArchivId(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Detail emrFaultDetail) throws UnsupportedEncodingException {
request.setCharacterEncoding("utf-8");
response.setCharacterEncoding("utf-8");
int bol=0;
//修改病案归档状态:复审退回或主任退回
int bol = 0;
//修改病案归档状态:复审退回或主任退回
Archive_Master archiveMaster = archiveMasterService.selectById(emrFaultDetail.getArchiveDetailId());
if(archiveMaster!=null) {
if (archiveMaster != null) {
archiveMaster.setArchivestate(emrFaultDetail.getState());
//查询该病案号缺陷,如果有医生就退回医生如果有护士则退回护士否则不退回提示
Emr_Fault_Detail entityFault=new Emr_Fault_Detail();
entityFault.setArchiveDetailId(emrFaultDetail.getArchiveDetailId());
List<Emr_Fault_Detail> list=emrFaultDetailService.selectByArchiveId(entityFault);
int doctorFlagNum=0;
int nurseFlagNum=0;
if(list!=null && list.size()>0){
// 从session获取用户名
Subject currentUser = SecurityUtils.getSubject();
Session session = currentUser.getSession();
String username = (String) session.getAttribute("userSession");//获取前面登录的用户名
SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String nowTime = format1.format(new Date());
//2021-01-30
Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
String handleName = user.getUserPosition();//姓名
Archive_Master_Following archive_master_following = new Archive_Master_Following();
archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId());
if (emrFaultDetail.getState().equals("主任退回")) {
//1医生 2护士
for (int k = 0; k < list.size(); k++) {
if ("1".equals(list.get(k).getBackFlag()) || "5".equals(list.get(k).getBackFlag())) {
doctorFlagNum+=1;
}
if ("2".equals(list.get(k).getBackFlag()) || "6".equals(list.get(k).getBackFlag())) {
nurseFlagNum+=1;
}
}
if(doctorFlagNum>0){
archiveMaster.setCmtDoctor(0);
archiveMaster.setDoctorName("");
archiveMaster.setCmtDoctorDate("");
//2021-01-30 following表中添加科主任退回主管医生操作记录
archive_master_following.setFollowingType("7");
archive_master_following.setFollowingContent("科主任退回主管医生");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
archive_master_followingService.insertSelective(archive_master_following);
}
if(nurseFlagNum>0){
archiveMaster.setCmtNurse(0);
archiveMaster.setNurseName("");
archiveMaster.setCmtNurseDate("");
//2021-01-30 following表中添加科主任退回护士长操作记录
archive_master_following.setFollowingType("6");
archive_master_following.setFollowingContent("科主任退回护士长");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
archive_master_followingService.insertSelective(archive_master_following);
//查询该病案号缺陷,如果有医生就退回医生如果有护士则退回护士否则不退回提示
Emr_Fault_Detail entityFault = new Emr_Fault_Detail();
entityFault.setArchiveDetailId(emrFaultDetail.getArchiveDetailId());
List<Emr_Fault_Detail> list = emrFaultDetailService.selectByArchiveId(entityFault);
int doctorFlagNum = 0;
int nurseFlagNum = 0;
if (list != null && list.size() > 0) {
// 从session获取用户名
Subject currentUser = SecurityUtils.getSubject();
Session session = currentUser.getSession();
String username = (String) session.getAttribute("userSession");//获取前面登录的用户名
SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String nowTime = format1.format(new Date());
//2021-01-30
Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
String handleName = user.getUserPosition();//姓名
Archive_Master_Following archive_master_following = new Archive_Master_Following();
archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId());
if (emrFaultDetail.getState().equals("主任退回")) {
//1医生 2护士
for (int k = 0; k < list.size(); k++) {
if ("1".equals(list.get(k).getBackFlag()) || "5".equals(list.get(k).getBackFlag())) {
doctorFlagNum += 1;
}
//修改复审内容
if (bol == 1) {
//判断缺陷记录是否有医生或护士有则退回状态改1
//参数输入
emrFaultDetail.setCreater(username);
emrFaultDetail.setCreateTime(nowTime);
//插入缺陷记录
bol = emrFaultDetailService.insertSel(emrFaultDetail);
if ("2".equals(list.get(k).getBackFlag()) || "6".equals(list.get(k).getBackFlag())) {
nurseFlagNum += 1;
}
}
if(doctorFlagNum==0 && nurseFlagNum==0){
archiveMaster.setCmtDoctor(1);
archiveMaster.setCmtNurse(1);
if (doctorFlagNum > 0) {
archiveMaster.setCmtDoctor(0);
archiveMaster.setDoctorName("");
archiveMaster.setCmtDoctorDate("");
//2021-01-30 following表中添加科主任退回主管医生操作记录
archive_master_following.setFollowingType("7");
archive_master_following.setFollowingContent("科主任退回主管医生");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
archive_master_followingService.insertSelective(archive_master_following);
}
bol = archiveMasterService.updateByClo(archiveMaster);
if (emrFaultDetail.getState().equals("复审退回")){
//2021-01-30 following表中添加病案室退回操作记录
archive_master_following.setFollowingType("9");
archive_master_following.setFollowingContent("病案室退回科主任");
if (nurseFlagNum > 0) {
archiveMaster.setCmtNurse(0);
archiveMaster.setNurseName("");
archiveMaster.setCmtNurseDate("");
//2021-01-30 following表中添加科主任退回护士长操作记录
archive_master_following.setFollowingType("6");
archive_master_following.setFollowingContent("科主任退回护士长");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
archive_master_followingService.insertSelective(archive_master_following);
}
}else{
bol=2;
//修改复审内容
if (bol == 1) {
//判断缺陷记录是否有医生或护士有则退回状态改1
//参数输入
emrFaultDetail.setCreater(username);
emrFaultDetail.setCreateTime(nowTime);
//插入缺陷记录
bol = emrFaultDetailService.insertSel(emrFaultDetail);
}
}
if (doctorFlagNum == 0 && nurseFlagNum == 0) {
archiveMaster.setCmtDoctor(1);
archiveMaster.setCmtNurse(1);
}
bol = archiveMasterService.updateByClo(archiveMaster);
if (emrFaultDetail.getState().equals("复审退回")) {
//2021-01-30 following表中添加病案室退回操作记录
archive_master_following.setFollowingType("9");
archive_master_following.setFollowingContent("病案室退回科主任");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
archive_master_followingService.insertSelective(archive_master_following);
}
} else {
bol = 2;
}
}
return bol;
}
@ -360,15 +361,15 @@ public class signListController {
emrFaultDetail.setCreateTime(nowTime);
emrFaultDetail.setState("未召回");
//判断是否已经有召回记录
Emr_Fault_Vo vo=new Emr_Fault_Vo();
Emr_Fault_Vo vo = new Emr_Fault_Vo();
vo.setArchiveDetailId(emrFaultDetail.getArchiveDetailId());
List<Emr_Fault_Vo> list = emrFaultDetailService.selectByCol(vo);
if(list.size()>0){
if (list.size() > 0) {
bol = emrFaultDetailService.delbyCol(emrFaultDetail);
if(bol==1){
if (bol == 1) {
bol = emrFaultDetailService.insertSel(emrFaultDetail);
}
}else{
} else {
bol = emrFaultDetailService.insertSel(emrFaultDetail);
}
@ -394,13 +395,13 @@ public class signListController {
public String updateSignState(HttpServletRequest request, HttpServletResponse response, Archive_Master archiveMaster) throws UnsupportedEncodingException {
request.setCharacterEncoding("utf-8");
response.setCharacterEncoding("utf-8");
String result="";
int isSign=archiveMaster.getIsSign();
String result = "";
int isSign = archiveMaster.getIsSign();
List<Archive_Master> list = archiveMasterService.selByCol(archiveMaster);
if(list.size()>0){
if (list.size() > 0) {
//修改
archiveMaster=list.get(0);
if(archiveMaster.getIsSign()!=isSign) {
archiveMaster = list.get(0);
if (archiveMaster.getIsSign() != isSign) {
// 从session获取用户名
Subject currentUser = SecurityUtils.getSubject();
Session session = currentUser.getSession();
@ -414,27 +415,27 @@ public class signListController {
archiveMaster.setSigner("");
archiveMaster.setSignTime("");
} else if (isSign == 1) {
System.out.println((archiveMaster.getIsscaned().equals("1"))+"===="+archiveMaster.getIsscaned()!="1");
if(archiveMaster.getIsscaned().equals("0")) {
System.out.println((archiveMaster.getIsscaned().equals("1")) + "====" + archiveMaster.getIsscaned() != "1");
if (archiveMaster.getIsscaned().equals("0")) {
result = "无纸质,无需签收!";
return result;
}else {
return result;
} else {
archiveMaster.setSigner(username);
archiveMaster.setSignTime(nowTime);
}
}
int bol = archiveMasterService.updateByClo(archiveMaster);
if (bol == 1) {
String followingContent="";
String followingType="";
if(isSign == 1) {
String followingContent = "";
String followingType = "";
if (isSign == 1) {
result = "该份病案签收成功!";
followingContent="病案签收成功";
followingType="13";
}else{
followingContent = "病案签收成功";
followingType = "13";
} else {
result = "该份病案取消签收成功!";
followingContent="病案取消签收成功";
followingType="14";
followingContent = "病案取消签收成功";
followingType = "14";
}
//2021-05-13 following表中添加签收操作记录
Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
@ -451,15 +452,15 @@ public class signListController {
result = "该份病案签收失败!";
}
}else{
if(isSign==1) {
} else {
if (isSign == 1) {
result = "该份病案已经签收!";
}else if(isSign==0){
} else if (isSign == 0) {
result = "该份病案已经取消签收!";
}
}
}else{
result="该份病案并不存在!";
} else {
result = "该份病案并不存在!";
}
return result;
}
@ -492,7 +493,7 @@ public class signListController {
@ResponseBody
@RequestMapping(value = "/updateScore")
public int updateScore(Archive_Master archive_master){
public int updateScore(Archive_Master archive_master) {
return archiveMasterService.updateByClo(archive_master);
}
@ -505,27 +506,27 @@ public class signListController {
//退回原因
StringBuffer assortName = new StringBuffer();
List<Emr_Fault_Vo> list = emrFaultDetailService.selectByColumn(emrFaultDetail);
for (Emr_Fault_Vo emr_fault_vo:list) {
assortName.append(emr_fault_vo.getAssortName()+";");
for (Emr_Fault_Vo emr_fault_vo : list) {
assortName.append(emr_fault_vo.getAssortName() + ";");
}
Archive_Master archive_master = archiveMasterService.selectById(emrFaultDetail.getArchiveDetailId());
String result="false";
if (archive_master!=null){
String result = "false";
if (archive_master != null) {
result = emrWebServiceShowBackReason(archive_master.getPatientId(),
Integer.parseInt(archive_master.getVisitId()),
nowTime,
assortName.toString(),
archive_master.getInpNo());
if (result.contains("true")){
if (result.contains("true")) {
result = "true";
}
}
return result;
}
public String emrWebServiceShowBackReason(String PATIENT_ID,int VISIT_ID,String nowTime,String APPLY_REASON,String INP_NO) throws Exception {
String MR_FILE_CALLBACK_RECORD="";//入参1
String MR_FILE_INDEX_CALLBACK="";//入参2
public String emrWebServiceShowBackReason(String PATIENT_ID, int VISIT_ID, String nowTime, String APPLY_REASON, String INP_NO) throws Exception {
String MR_FILE_CALLBACK_RECORD = "";//入参1
String MR_FILE_INDEX_CALLBACK = "";//入参2
com.emr.webservice.MedicalRecordShowBackContent.MR_FILE_CALLBACK_RECORD inputParam1 = new MR_FILE_CALLBACK_RECORD();
inputParam1.setPATIENT_ID(PATIENT_ID);
@ -608,17 +609,17 @@ public class signListController {
sb.append("\n");
sb.append("</root>");
String result="";
String result = "";
try {
String endpoint = EMRQualityControl;
String[] subStrs = endpoint.split("=");
String url = "";
String subStr ="";
String subStr = "";
url = subStrs[0];
if(subStrs.length>1){
if (subStrs.length > 1) {
subStr = getURLEncoderString(subStrs[1]);
}
endpoint = url+"="+subStr;
endpoint = url + "=" + subStr;
Service service = new Service();
Call call = null;
try {

@ -149,6 +149,28 @@ public class Archive_Master_Vo {
//2021-8-04 ,出院浏览页面电子病历护士提交字段
private String nurseNum;
//2021-8-06 ,退回给医生的缺陷数量(出院浏览页面使用)
private String faultDoctorNum;
//2021-8-06 ,退回给护士的缺陷数量(出院浏览页面使用)
private String faultNurseNum;
public String getFaultDoctorNum() {
return faultDoctorNum;
}
public void setFaultDoctorNum(String faultDoctorNum) {
this.faultDoctorNum = faultDoctorNum;
}
public String getFaultNurseNum() {
return faultNurseNum;
}
public void setFaultNurseNum(String faultNurseNum) {
this.faultNurseNum = faultNurseNum;
}
public String getDoctorNum() {
return doctorNum;
}

@ -66,10 +66,10 @@
) table2
on table1.MasterID=table2.id
<if test="assortId != null and assortId != ''">
and AssortID=#{assortId,jdbcType=VARCHAR}
and table1.AssortID=#{assortId,jdbcType=VARCHAR}
</if>
<if test="flag != null">
and flag = #{flag,jdbcType=NVARCHAR}
and table1.flag = #{flag,jdbcType=NVARCHAR}
</if>
) s
</select>

@ -98,6 +98,8 @@
<result column="print_num" jdbcType="NVARCHAR" property="printNum"/>
<result column="doctor_num" jdbcType="NVARCHAR" property="doctorNum"/>
<result column="nurse_num" jdbcType="NVARCHAR" property="nurseNum"/>
<result column="fault_doctor_num" jdbcType="NVARCHAR" property="faultDoctorNum"/>
<result column="fault_nurse_num" jdbcType="NVARCHAR" property="faultNurseNum"/>
</resultMap>
<sql id="Base_Column_List">
id, patient_id, inp_no, visit_id, name, sex, dept_name, discharge_date_time, ArchiveState,
@ -267,7 +269,7 @@
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.bed_number,ISNULL(s.numb, 0) numb
,ISNULL(printTable.num, 0) printNum,ISNULL(extDoctor.num, 0) doctorNum,ISNULL(extNurse.num, 0) nurseNum
,ISNULL(sDoctor.numb, 0) faultDoctorNum,ISNULL(sNurse.numb, 0) faultNurseNum,ISNULL(printTable.num, 0) printNum,ISNULL(extDoctor.num, 0) doctorNum,ISNULL(extNurse.num, 0) nurseNum
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d
@ -277,6 +279,10 @@
on m.dept_name=f.code
LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and back_flag is not null GROUP BY archive_detail_id) s
on m.id=s.archive_detail_id
LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and back_flag in ('1','5') GROUP BY archive_detail_id) sDoctor
on m.id=sDoctor.archive_detail_id
LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and back_flag in ('2','6') GROUP BY archive_detail_id) sNurse
on m.id=sNurse.archive_detail_id
LEFT JOIN (select MasterID,COUNT(*) num from archive_printInfo group by MasterID) printTable
on m.id=printTable.MasterID
LEFT JOIN (select zyh,jzh,T1,COUNT(*) num from archive_other_ext group by zyh,jzh,T1) extDoctor

@ -2848,9 +2848,14 @@
$("#QXDealBtn").show();
$('#tableQX').bootstrapTable({
url: "${path}/fault/getFaultList", // 获取表格数据的url
queryParams: function (params) {
//console.log($("#archIdQX").val());
var backFlag=1;
//console.log($("#archIdQX").val());
queryParams: function (params) {
var backFlag=1;
if(docNorFlag==3){
backFlag=3
}else if(docNorFlag==4){
backFlag=4
}
//(1,2,5,6)
/* if($("#backFlagQX").val()!=null && $("#backFlagQX").val()!=null){
backFlag=$("#backFlagQX").val();
@ -3535,8 +3540,14 @@
if (index.indexOf("qxSel") != -1) {
var redFlag = row.numb;
if (redFlag != 0) {
//有缺陷
html = html + '<button type="button" class="btn btn-sm btn-info getQXInfo">查看缺陷</button>';
//有退回给医生的缺陷
if(redFlagDoc!= 0){
html = html + '<button type="button" class="btn btn-sm btn-info getQXDoctorInfo">医生查看缺陷</button>';
}
//有退回给护士的缺陷
if(redFlagNur!= 0){
html = html + '<button type="button" class="btn btn-sm btn-info getQXNurseInfo">护士查看缺陷</button>';
}
}
}
@ -3719,9 +3730,22 @@
initTree(row.id);
getSourceFun();
},
'click .getQXInfo': function (e, value, row, index) {
'click .getQXDoctorInfo': function (e, value, row, index) {
//查看缺陷列表
//initTableQX(row.id);
var docNorFlag= 3;
$("#archIdQX").val(row.id);
$('#tableQX').bootstrapTable('refresh');
$('#QXInfoModal').modal({
backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。
keyboard: true,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。
show: true//弹出对话框
});
},
'click .getQXNurseInfo': function (e, value, row, index) {
//查看缺陷列表
//initTableQX(row.id);
var docNorFlag= 4;
$("#archIdQX").val(row.id);
$('#tableQX').bootstrapTable('refresh');
$('#QXInfoModal').modal({

@ -2774,6 +2774,11 @@
queryParams: function (params) {
//console.log($("#archIdQX").val());
var backFlag=1;
if(docNorFlag==3){
backFlag=3
}else if(docNorFlag==4){
backFlag=4
}
//(1,2,5,6)
/* if($("#backFlagQX").val()!=null && $("#backFlagQX").val()!=null){
backFlag=$("#backFlagQX").val();
@ -3584,8 +3589,14 @@
if (index.indexOf("qxSel") != -1) {
var redFlag = row.numb;
if (redFlag != 0) {
//有缺陷
html = html + '<button type="button" class="btn btn-sm btn-info getQXInfo">查看缺陷</button>';
//有退回给医生的缺陷
if(redFlagDoc!= 0){
html = html + '<button type="button" class="btn btn-sm btn-info getQXDoctorInfo">医生查看缺陷</button>';
}
//有退回给护士的缺陷
if(redFlagNur!= 0){
html = html + '<button type="button" class="btn btn-sm btn-info getQXNurseInfo">护士查看缺陷</button>';
}
}
}
if (index.indexOf("signFlg") != -1) {
@ -3756,9 +3767,22 @@
//获取来源下拉框
getSourceFun();
},
'click .getQXInfo': function (e, value, row, index) {
'click .getQXDoctorInfo': function (e, value, row, index) {
//查看缺陷列表
//initTableQX(row.id);
var docNorFlag= 3;
$("#archIdQX").val(row.id);
$('#tableQX').bootstrapTable('refresh');
$('#QXInfoModal').modal({
backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。
keyboard: true,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。
show: true//弹出对话框
});
},
'click .getQXNurseInfo': function (e, value, row, index) {
//查看缺陷列表
//initTableQX(row.id);
var docNorFlag= 4;
$("#archIdQX").val(row.id);
$('#tableQX').bootstrapTable('refresh');
$('#QXInfoModal').modal({
@ -3766,7 +3790,8 @@
keyboard: true,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。
show: true//弹出对话框
});
},'click .signInfo': function (e, value, row, index) {
},
'click .signInfo': function (e, value, row, index) {
var isscaned=""+row.isscaned;
//签收
var inpNo=row.inpNo;

@ -2614,6 +2614,11 @@
queryParams: function (params) {
//console.log($("#archIdQX").val());
var backFlag=1;
if(docNorFlag==3){
backFlag=3
}else if(docNorFlag==4){
backFlag=4
}
//(1,2,5,6)
/* if($("#backFlagQX").val()!=null && $("#backFlagQX").val()!=null){
backFlag=$("#backFlagQX").val();
@ -3406,8 +3411,14 @@
if (index.indexOf("qxSel") != -1) {
var redFlag = row.numb;
if (redFlag != 0) {
//有缺陷
html = html + '<button type="button" class="btn btn-sm btn-info getQXInfo">查看缺陷</button>';
//有退回给医生的缺陷
if(redFlagDoc!= 0){
html = html + '<button type="button" class="btn btn-sm btn-info getQXDoctorInfo">医生查看缺陷</button>';
}
//有退回给护士的缺陷
if(redFlagNur!= 0){
html = html + '<button type="button" class="btn btn-sm btn-info getQXNurseInfo">护士查看缺陷</button>';
}
}
}
return html;
@ -3472,11 +3483,12 @@
initTree(row.id);
getSourceFun();
},
'click .getQXInfo': function (e, value, row, index) {
'click .getQXDoctorInfo': function (e, value, row, index) {
//查看缺陷列表
//initTableQX(row.id);
$("#archIdQX").val(row.id);
$('#tableQX').bootstrapTable('refresh');
var docNorFlag= 3;
$('#QXInfoModal').modal({
backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。
keyboard: true,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。
@ -3484,6 +3496,18 @@
});
}
},
'click .getQXNurseInfo': function (e, value, row, index) {
//查看缺陷列表
//initTableQX(row.id);
var docNorFlag= 4;
$("#archIdQX").val(row.id);
$('#tableQX').bootstrapTable('refresh');
$('#QXInfoModal').modal({
backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。
keyboard: true,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。
show: true//弹出对话框
});
},
cellStyle: function (value, row, index) {
return {classes: 'success'}

Loading…
Cancel
Save