更新需求:

1.更新缺陷列表质控报表
2.重新校验完整性功能
3.终审页面超期字样、退回按钮去掉
4.首次签收页面增加选择条件 超期天数
————2021.03.14 王泽钦
master
wzqgit 4 years ago
parent 09fc19ea25
commit 76cc294a3e

@ -0,0 +1,73 @@
package com.emr.controller;
import com.emr.entity.Archive_Master;
import com.emr.entity.Archive_Master_Vo;
import com.emr.entity.TempMasterID;
import com.emr.service.Archive_MasterService;
import com.emr.service.TempMasterIDService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.ArrayList;
import java.util.List;
@Controller
public class TempHandleWzController {
@Autowired
private TempMasterIDService tempMasterIDService;
@Autowired
private Archive_MasterService archiveMasterService;
@RequestMapping("toReloadWzPage")
public String toReloadWzPage() {
return "reloadWz";
}
@RequestMapping("selectByInpNoAndVisitId")
@ResponseBody
public List<Archive_Master> selectByInpNoAndVisitId(Archive_Master_Vo archive_master_vo){
return this.archiveMasterService.selectByUnfile(archive_master_vo);
}
@RequestMapping("reloadWz")
@ResponseBody
public int reloadWz(String masterId){
int rows = 0;
TempMasterID tempMasterID = new TempMasterID();
tempMasterID.setId(masterId);
List<TempMasterID> list = new ArrayList<>();
list.add(tempMasterID);
rows = tempMasterIDService.reloadWz(list);
return rows;
}
@RequestMapping("reloadWzAll")
@ResponseBody
public int reloadWzAll(){
int rows = 0;
//List<TempMasterID> list = tempMasterIDService.selectAllMasterID();
//rows = tempMasterIDService.reloadWz(list);
TempMasterID t1 = new TempMasterID();
t1.setId("36cc3c27-447e-48e4-93b9-06b3acc397ca");
TempMasterID t2 = new TempMasterID();
t2.setId("a490ca0b-879f-4ae4-9238-33c44e5fda99");
TempMasterID t3 = new TempMasterID();
t3.setId("0687f5a2-40f0-48ce-872b-922d8ceba7da");
TempMasterID t4 = new TempMasterID();
t4.setId("169044f8-21a2-4420-ad01-c24b19910e3a");
TempMasterID t5 = new TempMasterID();
t5.setId("3f3d18cf-6f75-4367-9ada-3684e176c102");
List<TempMasterID> list = new ArrayList<>();
list.add(t1);
list.add(t2);
list.add(t3);
list.add(t4);
list.add(t5);
rows = tempMasterIDService.reloadWz(list);
return rows;
}
}

@ -362,7 +362,12 @@ public class faultController {
return emrFaultDetail; return emrFaultDetail;
} }
@ResponseBody
@RequestMapping(value = "/getQualityControlList")
public OffsetLimitPage getQualityControlList(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit) {
OffsetLimitPage result = emrFaultDetailService.getQualityControlList(emrFaultVo, offset, limit);
return result;
}
} }

@ -36,4 +36,6 @@ public interface Emr_Fault_DetailMapper {
List<Emr_Fault_Detail> selectByArchiveId(Emr_Fault_Detail emrFaultDetail); List<Emr_Fault_Detail> selectByArchiveId(Emr_Fault_Detail emrFaultDetail);
List<Emr_Fault_Vo> selectStorageByCol(Emr_Fault_Vo emrFaultVo); List<Emr_Fault_Vo> selectStorageByCol(Emr_Fault_Vo emrFaultVo);
List<Emr_Fault_Vo> getQualityControlList(Emr_Fault_Vo emrFaultVo);//获取质控缺陷评分列表
} }

@ -0,0 +1,13 @@
package com.emr.dao;
import com.emr.entity.TempMasterID;
import com.emr.entity.TempMasterIDExample;
import java.util.List;
public interface TempMasterIDMapper {
int insert(TempMasterID record);
int insertSelective(TempMasterID record);
List<TempMasterID> selectByExample(TempMasterIDExample example);
}

@ -119,6 +119,16 @@ public class Archive_Master_Vo {
private String createTimeEnd; private String createTimeEnd;
private String overdueDays;
public String getOverdueDays() {
return overdueDays;
}
public void setOverdueDays(String overdueDays) {
this.overdueDays = overdueDays;
}
public String getCreateTimeStart() { public String getCreateTimeStart() {
return createTimeStart; return createTimeStart;
} }

@ -86,6 +86,26 @@ public class Emr_Fault_Vo {
private String archiveState; private String archiveState;
private String typeName;
private String doctorInCharge;
public String getTypeName() {
return typeName;
}
public void setTypeName(String typeName) {
this.typeName = typeName;
}
public String getDoctorInCharge() {
return doctorInCharge;
}
public void setDoctorInCharge(String doctorInCharge) {
this.doctorInCharge = doctorInCharge;
}
public Integer getId() { public Integer getId() {
return id; return id;
} }

@ -0,0 +1,13 @@
package com.emr.entity;
public class TempMasterID {
private String id;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id == null ? null : id.trim();
}
}

@ -0,0 +1,270 @@
package com.emr.entity;
import java.util.ArrayList;
import java.util.List;
public class TempMasterIDExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
public TempMasterIDExample() {
oredCriteria = new ArrayList<Criteria>();
}
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
public String getOrderByClause() {
return orderByClause;
}
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
public boolean isDistinct() {
return distinct;
}
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(String value) {
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(String value) {
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(String value) {
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(String value) {
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(String value) {
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(String value) {
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdLike(String value) {
addCriterion("id like", value, "id");
return (Criteria) this;
}
public Criteria andIdNotLike(String value) {
addCriterion("id not like", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<String> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<String> values) {
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(String value1, String value2) {
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(String value1, String value2) {
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}

@ -97,6 +97,10 @@ public interface Emr_Fault_DetailService {
List<Emr_Fault_Detail> selectByArchiveId(Emr_Fault_Detail emrFaultDetail); List<Emr_Fault_Detail> selectByArchiveId(Emr_Fault_Detail emrFaultDetail);
OffsetLimitPage selectStorageByCol(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit); OffsetLimitPage selectStorageByCol(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit);
List<Emr_Fault_Vo> getQualityControlList(Emr_Fault_Vo emrFaultVo);//获取质控缺陷评分列表
OffsetLimitPage getQualityControlList(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit);
} }

@ -0,0 +1,14 @@
package com.emr.service;
import com.emr.entity.Archive_Master;
import com.emr.entity.Archive_Master_Vo;
import com.emr.entity.TempMasterID;
import java.util.List;
public interface TempMasterIDService {
List<TempMasterID> selectAllMasterID();
//重新校验完整性并赋值
int reloadWz(List<TempMasterID> masterIDList);
}

@ -24,9 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import java.util.Map;
@Service @Service
public class Archive_MasterServiceImpl implements Archive_MasterService { public class Archive_MasterServiceImpl implements Archive_MasterService {
@ -49,7 +47,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
public OffsetLimitPage selectByCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { public OffsetLimitPage selectByCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
PageHelper.offsetPage(offset, limit); PageHelper.offsetPage(offset, limit);
List<Archive_Master> list= archiveMasterMapper.selectByCol(archiveMasterVo); List<Archive_Master> list= archiveMasterMapper.selectByCol(archiveMasterVo);
List<Archive_Master> resultList = new Page<>();
JSONArray powerUsers = powerUserService.getPowerUserList("1"); JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
if (powerUserList != null){ if (powerUserList != null){
@ -60,29 +58,24 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
}}); }});
for (Archive_Master archive_master : list) { for (Archive_Master archive_master : list) {
String doctorName ="";
String nurseName ="";
JSONObject userInfo = mappedMovies.get(archive_master.getDoctorName()); JSONObject userInfo = mappedMovies.get(archive_master.getDoctorName());
if (userInfo==null){ if (userInfo==null){
doctorName=archive_master.getDoctorName(); archive_master.setDoctorName(archive_master.getDoctorName());
}else { }else {
doctorName = userInfo.getString("name"); archive_master.setDoctorName(userInfo.getString("name"));
} }
userInfo = mappedMovies.get(archive_master.getNurseName()); userInfo = mappedMovies.get(archive_master.getNurseName());
if (userInfo==null){ if (userInfo==null){
nurseName=archive_master.getNurseName(); archive_master.setNurseName(archive_master.getNurseName());
}else { }else {
nurseName = userInfo.getString("name"); archive_master.setNurseName(userInfo.getString("name"));
} }
archive_master.setDoctorName(doctorName);
archive_master.setNurseName(nurseName);
resultList.add(archive_master);
} }
} }
return new OffsetLimitPage((Page) resultList); return new OffsetLimitPage((Page) list);
} }
@Override @Override
@ -124,7 +117,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
public OffsetLimitPage selectByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { public OffsetLimitPage selectByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
PageHelper.offsetPage(offset, limit); PageHelper.offsetPage(offset, limit);
List<Archive_Master> list = archiveMasterMapper.selectByColumn(archiveMasterVo); List<Archive_Master> list = archiveMasterMapper.selectByColumn(archiveMasterVo);
List<Archive_Master> resultList = new Page<>();
JSONArray powerUsers = powerUserService.getPowerUserList("1"); JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
if (powerUserList != null){ if (powerUserList != null){
@ -135,36 +128,31 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
}}); }});
for (Archive_Master archive_master : list) { for (Archive_Master archive_master : list) {
String doctorName ="";
String nurseName ="";
JSONObject userInfo = mappedMovies.get(archive_master.getDoctorName()); JSONObject userInfo = mappedMovies.get(archive_master.getDoctorName());
if (userInfo==null){ if (userInfo==null){
doctorName=archive_master.getDoctorName(); archive_master.setDoctorName(archive_master.getDoctorName());
}else { }else {
doctorName = userInfo.getString("name"); archive_master.setDoctorName(userInfo.getString("name"));
} }
userInfo = mappedMovies.get(archive_master.getNurseName()); userInfo = mappedMovies.get(archive_master.getNurseName());
if (userInfo==null){ if (userInfo==null){
nurseName=archive_master.getNurseName(); archive_master.setNurseName(archive_master.getNurseName());
}else { }else {
nurseName = userInfo.getString("name"); archive_master.setNurseName(userInfo.getString("name"));
} }
archive_master.setDoctorName(doctorName);
archive_master.setNurseName(nurseName);
resultList.add(archive_master);
} }
} }
return new OffsetLimitPage((Page) resultList); return new OffsetLimitPage((Page) list);
} }
@Override @Override
public OffsetLimitPage selectByUnfile(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { public OffsetLimitPage selectByUnfile(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
PageHelper.offsetPage(offset, limit); PageHelper.offsetPage(offset, limit);
List<Archive_Master> list = archiveMasterMapper.selectByUnfile(archiveMasterVo); List<Archive_Master> list = archiveMasterMapper.selectByUnfile(archiveMasterVo);
List<Archive_Master> resultList = new Page<>();
JSONArray powerUsers = powerUserService.getPowerUserList("1"); JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
if (powerUserList != null){ if (powerUserList != null){
@ -175,85 +163,70 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
}}); }});
for (Archive_Master archive_master : list) { for (Archive_Master archive_master : list) {
String doctorName ="";
String nurseName ="";
JSONObject userInfo = mappedMovies.get(archive_master.getDoctorName()); JSONObject userInfo = mappedMovies.get(archive_master.getDoctorName());
if (userInfo==null){ if (userInfo==null){
doctorName=archive_master.getDoctorName(); archive_master.setDoctorName(archive_master.getDoctorName());
}else { }else {
doctorName = userInfo.getString("name"); archive_master.setDoctorName(userInfo.getString("name"));
} }
userInfo = mappedMovies.get(archive_master.getNurseName()); userInfo = mappedMovies.get(archive_master.getNurseName());
if (userInfo==null){ if (userInfo==null){
nurseName=archive_master.getNurseName(); archive_master.setNurseName(archive_master.getNurseName());
}else { }else {
nurseName = userInfo.getString("name"); archive_master.setNurseName(userInfo.getString("name"));
} }
archive_master.setDoctorName(doctorName);
archive_master.setNurseName(nurseName);
resultList.add(archive_master);
} }
} }
return new OffsetLimitPage((Page) resultList); return new OffsetLimitPage((Page) list);
} }
@Override @Override
public OffsetLimitPage selectByLast(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { public OffsetLimitPage selectByLast(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
PageHelper.offsetPage(offset, limit); PageHelper.offsetPage(offset, limit);
List<Archive_Master_Vo> list = archiveMasterMapper.selectByLast(archiveMasterVo); List<Archive_Master_Vo> list = archiveMasterMapper.selectByLast(archiveMasterVo);
List<Archive_Master_Vo> resultList = new Page<>();
JSONArray powerUsers = powerUserService.getPowerUserList("1"); JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
if (powerUserList != null){
Map<String,JSONObject> mappedMovies = Maps.uniqueIndex(powerUserList, new Function<JSONObject,String>() { if (powerUserList != null) {
@Override Map<String, JSONObject> mappedMovies = Maps.uniqueIndex(powerUserList, temp -> temp.getString("userName"));
public String apply(JSONObject temp) {
return temp.getString("userName");
}});
for (Archive_Master_Vo archive_master : list) { for (Archive_Master_Vo archive_master : list) {
String doctorName ="";
String nurseName ="";
String firstInstance ="";
JSONObject userInfo = mappedMovies.get(archive_master.getDoctorName()); JSONObject userInfo = mappedMovies.get(archive_master.getDoctorName());
if (userInfo==null){ if (userInfo == null) {
doctorName=archive_master.getDoctorName(); archive_master.setDoctorName(archive_master.getDoctorName());
}else { } else {
doctorName = userInfo.getString("name"); archive_master.setDoctorName(userInfo.getString("name"));
} }
userInfo = mappedMovies.get(archive_master.getNurseName()); userInfo = mappedMovies.get(archive_master.getNurseName());
if (userInfo==null){ if (userInfo == null) {
nurseName=archive_master.getNurseName(); archive_master.setNurseName(archive_master.getNurseName());
}else { } else {
nurseName = userInfo.getString("name"); archive_master.setNurseName(userInfo.getString("name"));
} }
userInfo = mappedMovies.get(archive_master.getFirstInstance()); userInfo = mappedMovies.get(archive_master.getFirstInstance());
if (userInfo==null){ if (userInfo == null) {
firstInstance=archive_master.getFirstInstance(); archive_master.setFirstInstance(archive_master.getFirstInstance());
}else { } else {
firstInstance = userInfo.getString("name"); archive_master.setFirstInstance(userInfo.getString("name"));
} }
archive_master.setDoctorName(doctorName);
archive_master.setNurseName(nurseName);
archive_master.setFirstInstance(firstInstance);
resultList.add(archive_master);
} }
} }
return new OffsetLimitPage((Page) resultList);
return new OffsetLimitPage((Page) list);
} }
@Override @Override
public OffsetLimitPage selectByCmtCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { public OffsetLimitPage selectByCmtCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
PageHelper.offsetPage(offset, limit); PageHelper.offsetPage(offset, limit);
List<Archive_Master> list = archiveMasterMapper.selectByCmtCol(archiveMasterVo); List<Archive_Master> list = archiveMasterMapper.selectByCmtCol(archiveMasterVo);
List<Archive_Master> resultList = new Page<>();
JSONArray powerUsers = powerUserService.getPowerUserList("1"); JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
if (powerUserList != null){ if (powerUserList != null){
@ -264,29 +237,24 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
}}); }});
for (Archive_Master archive_master : list) { for (Archive_Master archive_master : list) {
String doctorName ="";
String nurseName ="";
JSONObject userInfo = mappedMovies.get(archive_master.getDoctorName()); JSONObject userInfo = mappedMovies.get(archive_master.getDoctorName());
if (userInfo==null){ if (userInfo==null){
doctorName=archive_master.getDoctorName(); archive_master.setDoctorName(archive_master.getDoctorName());
}else { }else {
doctorName = userInfo.getString("name"); archive_master.setDoctorName(userInfo.getString("name"));
} }
userInfo = mappedMovies.get(archive_master.getNurseName()); userInfo = mappedMovies.get(archive_master.getNurseName());
if (userInfo==null){ if (userInfo==null){
nurseName=archive_master.getNurseName(); archive_master.setNurseName(archive_master.getNurseName());
}else { }else {
nurseName = userInfo.getString("name"); archive_master.setNurseName(userInfo.getString("name"));
} }
archive_master.setDoctorName(doctorName);
archive_master.setNurseName(nurseName);
resultList.add(archive_master);
} }
} }
return new OffsetLimitPage((Page) resultList); return new OffsetLimitPage((Page) list);
} }
@Override @Override
@ -351,7 +319,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
public OffsetLimitPage selectOverdue(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { public OffsetLimitPage selectOverdue(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
PageHelper.offsetPage(offset, limit); PageHelper.offsetPage(offset, limit);
List<Archive_Master_Vo> list = archiveMasterMapper.selectOverdue(archiveMasterVo); List<Archive_Master_Vo> list = archiveMasterMapper.selectOverdue(archiveMasterVo);
List<Archive_Master_Vo> resultList = new Page<>();
JSONArray powerUsers = powerUserService.getPowerUserList("1"); JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
if (powerUserList != null){ if (powerUserList != null){
@ -362,29 +330,24 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
}}); }});
for (Archive_Master_Vo archive_master : list) { for (Archive_Master_Vo archive_master : list) {
String doctorInChargeName ="";
String firstInstance ="";
JSONObject userInfo = mappedMovies.get(archive_master.getDoctorInCharge()); JSONObject userInfo = mappedMovies.get(archive_master.getDoctorInCharge());
if (userInfo==null){ if (userInfo==null){
doctorInChargeName=archive_master.getDoctorInCharge(); archive_master.setDoctorInCharge(archive_master.getDoctorInCharge());
}else { }else {
doctorInChargeName = userInfo.getString("name"); archive_master.setDoctorInCharge(userInfo.getString("name"));
} }
userInfo = mappedMovies.get(archive_master.getFirstInstance()); userInfo = mappedMovies.get(archive_master.getFirstInstance());
if (userInfo==null){ if (userInfo==null){
firstInstance=archive_master.getFirstInstance(); archive_master.setFirstInstance(archive_master.getFirstInstance());
}else { }else {
firstInstance = userInfo.getString("name"); archive_master.setFirstInstance(userInfo.getString("name"));
} }
archive_master.setDoctorInCharge(doctorInChargeName);
archive_master.setFirstInstance(firstInstance);
resultList.add(archive_master);
} }
} }
return new OffsetLimitPage((Page) resultList); return new OffsetLimitPage((Page) list);
} }
@Override @Override

@ -6,18 +6,24 @@
*/ */
package com.emr.service.ipml; package com.emr.service.ipml;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.emr.dao.Emr_Fault_DetailMapper; import com.emr.dao.Emr_Fault_DetailMapper;
import com.emr.entity.*; import com.emr.entity.*;
import com.emr.service.Emr_DictionaryService; import com.emr.service.Emr_DictionaryService;
import com.emr.service.Emr_Fault_DetailService; import com.emr.service.Emr_Fault_DetailService;
import com.emr.service.Emr_Fault_TypeService; import com.emr.service.Emr_Fault_TypeService;
import com.emr.service.PowerUserService;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.google.common.base.Function;
import com.google.common.collect.Maps;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map;
@Service @Service
public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService {
@ -30,6 +36,9 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService {
@Autowired @Autowired
private Emr_DictionaryService emrDictionaryService; private Emr_DictionaryService emrDictionaryService;
@Autowired
private PowerUserService powerUserService;
/** /**
* *
* @param emrFaultVo * @param emrFaultVo
@ -194,6 +203,46 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService {
return new OffsetLimitPage((Page) list); return new OffsetLimitPage((Page) list);
} }
@Override
public List<Emr_Fault_Vo> getQualityControlList(Emr_Fault_Vo emrFaultVo) {
return emrFaultDetailMapper.getQualityControlList(emrFaultVo);
}
@Override
public OffsetLimitPage getQualityControlList(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit) {
PageHelper.offsetPage(offset, limit);
List<Emr_Fault_Vo> list = emrFaultDetailMapper.getQualityControlList(emrFaultVo);
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
if (powerUserList != null){
Map<String,JSONObject> mappedMovies = Maps.uniqueIndex(powerUserList, new Function<JSONObject,String>() {
@Override
public String apply(JSONObject temp) {
return temp.getString("userName");
}});
for (Emr_Fault_Vo emr_fault_vo : list) {
JSONObject userInfo = mappedMovies.get(emr_fault_vo.getDoctorInCharge());
if (userInfo==null){
emr_fault_vo.setDoctorInCharge(emr_fault_vo.getDoctorInCharge());
}else {
emr_fault_vo.setDoctorInCharge(userInfo.getString("name"));
}
userInfo = mappedMovies.get(emr_fault_vo.getCreater());
if (userInfo==null){
emr_fault_vo.setCreater(emr_fault_vo.getCreater());
}else {
emr_fault_vo.setCreater(userInfo.getString("name"));
}
}
}
return new OffsetLimitPage((Page) list);
}
} }

@ -0,0 +1,81 @@
package com.emr.service.ipml;
import com.emr.dao.Archive_MasterMapper;
import com.emr.dao.TempMasterIDMapper;
import com.emr.entity.Archive_Master;
import com.emr.entity.TempMasterID;
import com.emr.entity.TempMasterIDExample;
import com.emr.service.TempMasterIDService;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
@Service
public class TempMasterIDServiceImpl implements TempMasterIDService {
@Autowired
private TempMasterIDMapper tempMasterIDMapper;
@Autowired
private Archive_MasterMapper archive_masterMapper;
@Value("${HomepageDictionary}")
private String HomepageDictionary;
@Value("${HomepageMethod}")
private String HomepageMethod;
@Override
public List<TempMasterID> selectAllMasterID() {
return tempMasterIDMapper.selectByExample(new TempMasterIDExample());
}
@Override
public int reloadWz(List<TempMasterID> masterIDList) {
String result = "";
int rows = 0;
ArrayList<Archive_Master> archive_masters = new ArrayList<>();
Archive_Master archive_master = null;
try {
String endpoint = HomepageDictionary;
String method = HomepageMethod;
JaxWsDynamicClientFactory factory = JaxWsDynamicClientFactory.newInstance();
Client client = factory.createClient(endpoint);
// HomepageDictionary_Service homepageDictionary_service = new HomepageDictionary_Service();
// com.emr.webservice.HomepageDictionary homepageDictionaryImplPort = homepageDictionary_service.getHomepageDictionaryImplPort();
// 设置超时单位为毫秒
/*HTTPConduit conduit = (HTTPConduit)client.getConduit();
HTTPClientPolicy policy = new HTTPClientPolicy();
policy.setConnectionTimeout(30000);//连接超时时间
policy.setAllowChunking(false);
policy.setReceiveTimeout(180000);//请求超时时间.
conduit.setClient(policy);*/
for (TempMasterID tempMasterID:masterIDList) {
archive_master = new Archive_Master();
String temp = tempMasterID.getId();
Object[] res = null;
res = client.invoke(method, temp);
result = (String) res[0];
// String result = homepageDictionaryImplPort.checkData(temp);
//修改lockinfo
archive_master.setId(temp);
archive_master.setLockinfo(result);
archive_masters.add(archive_master);
//rows = archive_masterMapper.updateByClo(archive_master);
//TODO 手动提交事务
}
for (Archive_Master temp: archive_masters) {
rows = archive_masterMapper.updateByClo(temp);
}
} catch (Exception e) {
System.err.println(e.toString());
}
return rows;
}
}

@ -34,6 +34,8 @@ import java.util.Map;
* @author * @author
*/ */
public class PrintToPdfUtil { public class PrintToPdfUtil {
final private static float A4_weight = 595;//标准A4的宽
final private static float A4_height = 842;//标准A4的高
/** /**
* @param imageFolderPath * @param imageFolderPath
@ -96,7 +98,7 @@ public class PrintToPdfUtil {
// 图片地址 // 图片地址
String imagePath = null; String imagePath = null;
// 读取图片流 // 读取图片流
BufferedImage img = null; //BufferedImage img = null;
// 实例化图片 // 实例化图片
Image image = null; Image image = null;
File[] files = file.listFiles(); File[] files = file.listFiles();
@ -107,7 +109,8 @@ public class PrintToPdfUtil {
if (file1.getName().endsWith(".png") || file1.getName().endsWith(".jpg") || file1.getName().endsWith(".gif") if (file1.getName().endsWith(".png") || file1.getName().endsWith(".jpg") || file1.getName().endsWith(".gif")
|| file1.getName().endsWith(".jpeg") || file1.getName().endsWith(".tif")) { || file1.getName().endsWith(".jpeg") || file1.getName().endsWith(".tif")) {
imageFolderPath = file1.getAbsolutePath(); //2021-3-13修改
/*imageFolderPath = file1.getAbsolutePath();
// 读取图片流 // 读取图片流
img = ImageIO.read(new File(imageFolderPath)); img = ImageIO.read(new File(imageFolderPath));
@ -123,10 +126,36 @@ public class PrintToPdfUtil {
// 根据图片大小设置文档大小 // 根据图片大小设置文档大小
//doc.setPageSize(new Rectangle(img.getWidth(), img.getHeight())); //doc.setPageSize(new Rectangle(img.getWidth(), img.getHeight()));
// 实例化图片 // 实例化图片
image = Image.getInstance(imageFolderPath); image = Image.getInstance(imageFolderPath);*/
Image img = Image.getInstance(imageFolderPath);
/*处理图片缩放比例*/
float w = img.getWidth();
float h = img.getHeight();
float percent = 0;
if ((w > A4_weight) && (h < A4_height)) {
percent = (A4_weight * 100) / w;
} else if ((w < A4_weight) && (h > A4_height)) {
percent = (A4_height * 100) / h;
} else if ((w > A4_weight) && (h > A4_height)) {
percent = (A4_weight * 100) / w;
h = (h * percent) / 100;
if (h > A4_height) {
percent = (A4_height * 100) / h;
}
}
img.setAlignment(com.lowagie.text.Image.ALIGN_CENTER);
if(percent != 100){
img.scaleAbsolute(A4_weight,A4_height);
}else{
img.scalePercent(percent);
}
// 添加图片到文档 // 添加图片到文档
doc.open(); doc.open();
doc.add(image); doc.add(img);
//doc.add(image);
} }
//file.getAbsolutePath().replaceFirst(path, " "); //file.getAbsolutePath().replaceFirst(path, " ");
if (file1.isDirectory()) { if (file1.isDirectory()) {

@ -88,7 +88,8 @@ public class test {
String method = "CheckData"; String method = "CheckData";
JaxWsDynamicClientFactory factory = JaxWsDynamicClientFactory.newInstance(); JaxWsDynamicClientFactory factory = JaxWsDynamicClientFactory.newInstance();
Client client = factory.createClient("http://120.27.212.36:9999/filing/services/HomepageDictionary?wsdl"); //Client client = factory.createClient("http://120.27.212.36:9999/filing/services/HomepageDictionary?wsdl");
Client client = factory.createClient("http://127.0.0.1:8080/WholeCheckInterface/services/HomepageDictionary?wsdl");
// Endpoint endpoint2 = client.getEndpoint(); // Endpoint endpoint2 = client.getEndpoint();
// QName opName = new QName(endpoint2.getService().getName().getNamespaceURI(), method); // QName opName = new QName(endpoint2.getService().getName().getNamespaceURI(), method);
// BindingInfo bindingInfo = endpoint2.getEndpointInfo().getBinding(); // BindingInfo bindingInfo = endpoint2.getEndpointInfo().getBinding();
@ -101,7 +102,7 @@ public class test {
// } // }
// } // }
Object[] res = null; Object[] res = null;
res = client.invoke("CheckData","02e4ba493dc643c9926926662327995e"); res = client.invoke("CheckData","3f3d18cf-6f75-4367-9ada-3684e176c102");
String xml = (String) res[0]; String xml = (String) res[0];
System.err.println("@@@@@@@@@@@@@@@@@" + xml); System.err.println("@@@@@@@@@@@@@@@@@" + xml);
} }

@ -1177,6 +1177,9 @@
and [dbo].[getWorkday](m.discharge_date_time,d.create_time)>7 and [dbo].[getWorkday](m.discharge_date_time,d.create_time)>7
</if> </if>
</if> </if>
<if test="overdueDays != null and overdueDays != ''">
and [dbo].[getWorkday](m.discharge_date_time,d.create_time)=#{overdueDays,jdbcType=NCHAR}
</if>
</select> </select>
<!--封存日志--> <!--封存日志-->
<select id="selectByFollowinglog" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap2"> <select id="selectByFollowinglog" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap2">

@ -62,6 +62,8 @@
<result column="deal_person" jdbcType="NVARCHAR" property="dealPerson"/> <result column="deal_person" jdbcType="NVARCHAR" property="dealPerson"/>
<result column="deal_time" jdbcType="NVARCHAR" property="dealTime"/> <result column="deal_time" jdbcType="NVARCHAR" property="dealTime"/>
<result column="archive_state" jdbcType="NVARCHAR" property="archiveState"/> <result column="archive_state" jdbcType="NVARCHAR" property="archiveState"/>
<result column="type_name" jdbcType="NVARCHAR" property="typeName"/>
<result column="DOCTOR_IN_CHARGE" jdbcType="NVARCHAR" property="doctorInCharge"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, archive_detail_id, assort_id, parent_id, content,price, score, back_content, first_trial,state,recall_reason id, archive_detail_id, assort_id, parent_id, content,price, score, back_content, first_trial,state,recall_reason
@ -514,4 +516,48 @@
</foreach> </foreach>
</if> </if>
</select> </select>
<select id="getQualityControlList" parameterType="com.emr.entity.Emr_Fault_Vo" resultMap="BaseResultMap2">
select m.inp_no,m.visit_id,g.Name dept_name,m.name,m.discharge_date_time,m.ArchiveState,100-t.price score,t.price,
t.type_name, e.content,e.back_content,
m.DOCTOR_IN_CHARGE,e.creater,e.create_time
from Archive_Master m
inner join emr_fault_detail e on e.archive_detail_id = m.id
inner join emr_fault_type t on e.assort_id = t.id
inner join (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) g
on m.dept_name=g.code
where 1=1 and e.back_flag in(5,6)
<if test="inpNo != null and inpNo != ''">
and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
</if>
<if test="visitId != null and visitId != ''">
and m.visit_id=#{visitId,jdbcType=NCHAR}
</if>
<if test="name != null and name != ''">
and m.name like '%'+#{name,jdbcType=NCHAR}+'%'
</if>
<if test="archivestate != null and archivestate != ''">
and m.ArchiveState=#{archivestate,jdbcType=NCHAR}
</if>
<if test="deptName!= null and deptName!= ''">
and m.dept_name in
<foreach item="item" collection="deptName.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="dischargeDateTime != null">
and m.discharge_date_time = #{dischargeDateTime,jdbcType=NVARCHAR}
</if>
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and m.discharge_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
<when test="startDate != null and startDate != ''">
and m.discharge_date_time >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120)
</when>
<when test="endDate != null and endDate != ''">
and m.discharge_date_time &lt;= #{endDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
</choose>
</select>
</mapper> </mapper>

@ -0,0 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.emr.dao.TempMasterIDMapper">
<resultMap id="BaseResultMap" type="com.emr.entity.TempMasterID">
<result column="id" jdbcType="VARCHAR" property="id" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id
</sql>
<select id="selectByExample" parameterType="com.emr.entity.TempMasterIDExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
'false' as QUERYID,
<include refid="Base_Column_List" />
from TempMasterID
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<insert id="insert" parameterType="com.emr.entity.TempMasterID">
insert into TempMasterID (id)
values (#{id,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.emr.entity.TempMasterID">
insert into TempMasterID
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=VARCHAR},
</if>
</trim>
</insert>
</mapper>

@ -948,13 +948,10 @@
<textarea id="doctorText" rows="5" style="width:95%;" ></textarea> <textarea id="doctorText" rows="5" style="width:95%;" ></textarea>
</div> </div>
<div class="row divCss2"> <div class="row divCss2">
<%--<input type="checkbox" id="isScanedChk" />归档病历已全部无纸化无扫描件--%> 归档病历是否已全部无纸化无扫描件
归档病历是否已全部无纸化无扫描件 <input type="checkbox" name="isScanedChk" class="isScanedChk1" onclick="checkedThis(this,this);">是
<input type="checkbox" name="isScanedChk" class="isScanedChk2" onclick="checkedThis(this,this);">否
<input type="checkbox" name="isScanedChk" id="isScanedChk" onclick="checkedThis(this,this);">是 <label style="color: red">(必填)</label>
<input type="checkbox" name="isScanedChk" onclick="checkedThis(this,this);">否
<label style="color: red">(必填)</label>
<%--<input type="checkbox" id="isScanedChk"/>归档病历已全部无纸化无扫描件--%>
</div> </div>
</div> </div>
</form> </form>
@ -996,12 +993,10 @@
<textarea id="nures2Text" rows="5" style="width:95%;"></textarea> <textarea id="nures2Text" rows="5" style="width:95%;"></textarea>
</div> </div>
<div class="row divCss2"> <div class="row divCss2">
<%--<input type="checkbox" id="isScanedChk2" />归档病历已全部无纸化无扫描件--%> 归档病历是否已全部无纸化无扫描件
归档病历是否已全部无纸化无扫描件 <input type="checkbox" name="isScanedChk2" class="isScanedChk3" onclick="checkedThis(this,this);">是
<input type="checkbox" name="isScanedChk2" class="isScanedChk4" onclick="checkedThis(this,this);">否
<input type="checkbox" name="isScanedChk2" id="isScanedChk2" onclick="checkedThis(this,this);">是 <label style="color: red">(必填)</label>
<input type="checkbox" name="isScanedChk2" onclick="checkedThis(this,this);">否
<label style="color: red">(必填)</label>
</div> </div>
</div> </div>
</form> </form>
@ -2133,10 +2128,8 @@
var lockinfo = $("#wzxText").val(); var lockinfo = $("#wzxText").val();
var content = $("#doctorText").val(); var content = $("#doctorText").val();
var isScanedChk = 0; var isScanedChk = 0;
if ($('.isScanedChk').is(':checked')) { if($('.isScanedChk1').is(':checked')){
isScanedChk = "1"; isScanedChk = "1";
}
if($('.isScanedChk').is(':checked')){
if (lockinfo == "完整") { if (lockinfo == "完整") {
$.ajax({ $.ajax({
url: "${path}/beHosp/cmtDoctorOrNurs", url: "${path}/beHosp/cmtDoctorOrNurs",
@ -2166,7 +2159,40 @@
show: true//弹出对话框 show: true//弹出对话框
}); });
} }
}}else { }
}else if ($('.isScanedChk2').is(':checked')){
if (lockinfo == "完整") {
$.ajax({
url: "${path}/beHosp/cmtDoctorOrNurs",
type: "POST",
data: {cmtDoctor: doctorFlag, id: id,lockinfo:lockinfo,content:content,isscaned:isScanedChk},
success: function (result) {
$("#doctorModal").modal('hide');
if (result == "成功") {
$("#table").bootstrapTable("refresh");
toastr.success("归档医生提交成功!");
} else {
toastr.error("归档医生提交失败!");
}
}
});
} else {
//如果缺失病案首页或入院记录则无法强制提交
if (lockinfo.indexOf("病案首页") != -1 || lockinfo.indexOf("入院记录") != -1) {
alert("缺失病案首页或入院记录,无法强制提交!");
} else {
$("#flagStaff").val(0);
//弹窗提示是否强制性
$("#WzRsult2").html(lockinfo);
$('#WZModal2').modal({
backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。
keyboard: false,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。
show: true//弹出对话框
});
}
}
}
else {
toastr.error("必填项未选择!归档医生提交失败!"); toastr.error("必填项未选择!归档医生提交失败!");
} }
}); });
@ -2183,10 +2209,8 @@
var lockinfo = $("#wzx2Text").val(); var lockinfo = $("#wzx2Text").val();
var content = $("#nures2Text").val(); var content = $("#nures2Text").val();
var isScanedChk2 = 0; var isScanedChk2 = 0;
if ($('.isScanedChk2').is(':checked')) { if($('.isScanedChk3').is(':checked')){
isScanedChk2 = "1"; isScanedChk2 = "1";
}
if($('.isScanedChk2').is(':checked')){
if (lockinfo == "完整") { if (lockinfo == "完整") {
$.ajax({ $.ajax({
url: "${path}/beHosp/cmtDoctorOrNurs", url: "${path}/beHosp/cmtDoctorOrNurs",
@ -2212,7 +2236,33 @@
show: true//弹出对话框 show: true//弹出对话框
}); });
} }
}else { }else if ($('.isScanedChk4').is(':checked')){
if (lockinfo == "完整") {
$.ajax({
url: "${path}/beHosp/cmtDoctorOrNurs",
type: "POST",
data: {cmtNurse: nursFlag, id: id, lockinfo: lockinfo, content: content, isscaned: isScanedChk2},
success: function (result) {
$("#nursModal").modal('hide');
if (result == "成功") {
$("#table").bootstrapTable("refresh");
toastr.success("归档护士提交成功!");
} else {
toastr.error("归档护士提交失败!");
}
}
});
} else {
$("#flagStaff").val(1);
//弹窗提示是否强制性
$("#WzRsult2").html(lockinfo);
$('#WZModal2').modal({
backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。
keyboard: false,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。
show: true//弹出对话框
});
}
} else {
toastr.error("必填项未选择!归档护士提交失败!"); toastr.error("必填项未选择!归档护士提交失败!");
} }
}); });

@ -171,7 +171,7 @@
if(tipLoad==1){ if(tipLoad==1){
$("#table").bootstrapTable({ // 对应table标签的id $("#table").bootstrapTable({ // 对应table标签的id
//method: 'POST', //method: 'POST',
url: "${path}/fault/faultList", // 获取表格数据的url url: "${path}/fault/getQualityControlList", // 获取表格数据的url
contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求注释掉这句话也能拿到数据 contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求注释掉这句话也能拿到数据
//dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行 //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
cache: false, // 设置为 false 禁用 AJAX 数据缓存, 默认为true cache: false, // 设置为 false 禁用 AJAX 数据缓存, 默认为true
@ -253,7 +253,7 @@
visitId:""+$("#visitId").val(), visitId:""+$("#visitId").val(),
name:""+$("#name").val(), name:""+$("#name").val(),
archivestate:"" + $("#archivestate").val(), archivestate:"" + $("#archivestate").val(),
deptName: deptName.toString() deptName: deptName.toString()
}; };
return temp; return temp;
@ -317,9 +317,15 @@
field: 'dischargeDateTime', field: 'dischargeDateTime',
align: 'center', align: 'center',
valign: 'middle', valign: 'middle',
// formatter: function (value, row, index) { formatter: function (value, row, index) {
// return value var result="";
// } if(value!=null && value!=""){
result= value.substring(0, 10);
}else{
result=value;
}
return result
}
}, },
{ {
title: '归档状态', title: '归档状态',
@ -351,33 +357,6 @@
} }
}, },
// {
// title: '归档状态',
// field: 'archivestate',
// align: 'center',
// valign: 'middle',
// formatter: function (value, row, index) {
// //在院 未归档 归档中 初审 已归档 已认证 复审退回
// var a = '';
// if (value == "未归档") {
// a = '<span style="color:#c0c0c0;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>' + value + '</span>';
// } else if (value == "已归档") {
// a = '<span style="color:#030378"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
// } else if (value == "在院") {
// a = '<span style="color:#bfa200"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
// } else if (value == "归档中") {
// a = '<span style="color:#5d9c0a"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
// } else if (value == "初审") {
// a = '<span style="color:#8FBC8F"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
// } else if (value == "已认证") {
// a = '<span style="color:#FF7F24"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
// } else if (value == "复审退回") {
// a = '<span style="color:red"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
// }
// return a;
//
// }
// },
{ {
field: 'score', field: 'score',
title: '评分(分)', title: '评分(分)',
@ -389,16 +368,28 @@
//return changeDateFormat(value) //return changeDateFormat(value)
} }
}, },
{
field: 'price',
title: '扣分项',
//sortable: true,
align: 'center',
valign: 'middle',
formatter: function (value, row, index) {
return value;
//return changeDateFormat(value)
}
},
{ {
field: 'backContent', field: 'backContent',
title: '退回内容', title: '退回内容',
visible: false,
formatter: function (value, row, index) { formatter: function (value, row, index) {
return value; return value;
//return changeDateFormat(value) //return changeDateFormat(value)
} }
}, },
{ {
field: 'assortId', field: 'typeName',
title: '缺陷选项', title: '缺陷选项',
valign: 'middle', valign: 'middle',
formatter: function (value, row, index) { formatter: function (value, row, index) {
@ -415,6 +406,12 @@
//return changeDateFormat(value) //return changeDateFormat(value)
} }
}, },
{
title: '主管医生',
field: 'doctorInCharge',
align: 'center',
valign: 'middle',
},
{ {
field: 'createTime', field: 'createTime',
title: '创建时间', title: '创建时间',

@ -2083,7 +2083,7 @@
} else { } else {
if (days > deathExpired) { if (days > deathExpired) {
var day = days - deathExpired; var day = days - deathExpired;
result = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>已死亡</span><span style="color:red">(超期' + day + ')</span></span>'; result = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>已死亡</span></span>';
} else { } else {
result = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>已死亡</span>'; result = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>已死亡</span>';
} }
@ -2115,7 +2115,7 @@
//获取properties配置文件中的属性值 //获取properties配置文件中的属性值
var expired = <%=res.getString("expired")%>; var expired = <%=res.getString("expired")%>;
if (days > expired) { if (days > expired) {
a = '<span style="color:#8FBC8F"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '<span style="color:red">(超期)</span></span>'; a = '<span style="color:#8FBC8F"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
} else { } else {
a = '<span style="color:#8FBC8F"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>'; a = '<span style="color:#8FBC8F"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
} }
@ -2182,9 +2182,9 @@
html = '<button type="button" class="btn btn-danger btn-sm selInfo" >查看</button>';// '<a href="javascript:;" class="delete">删除</a>'; html = '<button type="button" class="btn btn-danger btn-sm selInfo" >查看</button>';// '<a href="javascript:;" class="delete">删除</a>';
} }
if (row.archivestate == '初审') { if (row.archivestate == '初审') {
if (index != null && index != "" && index.indexOf("back") != -1) { /*if (index != null && index != "" && index.indexOf("back") != -1) {
html += '<button type="button" class="btn btn-warning btn-sm returnInfo" >退回</button>'; html += '<button type="button" class="btn btn-warning btn-sm returnInfo" >退回</button>';
} }*/
if (index != null && index != "" && index.indexOf("last") != -1) { if (index != null && index != "" && index.indexOf("last") != -1) {
html += '<button type="button" class="btn btn-sm btn-primary verifyInfo">审核</button>'; html += '<button type="button" class="btn btn-sm btn-primary verifyInfo">审核</button>';
} }
@ -2354,7 +2354,7 @@
function rowStyle(row, index) { function rowStyle(row, index) {
var style = {}; var style = {};
if (row.followingType != null) { if (row.followingType != null) {
style={css:{'color':'#ed5565'}}; style={css:{'color':'#76abed'}};
} }
return style; return style;
} }

@ -261,24 +261,10 @@
<input type="text" class="input-sm form-control" name="end" id="createTimeEnd"/> <input type="text" class="input-sm form-control" name="end" id="createTimeEnd"/>
</div> </div>
</div> </div>
<%--<div class="form-group divCss">
<label >归档状态:</label>
<select class="input-sm form-control" id="archivestate">
<option value="">全部</option>
<option value="取消入院">取消入院</option>
<option value="在院">在院</option>
<option value="归档中">归档中</option>
<option value="提交">提交</option>
<option value="主任退回">主任退回</option>
<option value="初审">初审</option>
<option value="复审退回">复审退回</option>
<option value="已归档">已归档</option>
</select>
</div>
<div class="form-group divCss"> <div class="form-group divCss">
<label>床号:</label> <label>超期天数:</label>
<input type="text" class="input-sm form-control" id="bedNumber" placeholder="请输入床号"> <input type="text" class="input-sm form-control" id="overdueDays" placeholder="请输入超期天数">
</div>--%> </div>
<div class="form-group divCss"> <div class="form-group divCss">
<label>是否死亡:</label> <label>是否死亡:</label>
<select class="input-sm form-control" id="deathFlag"> <select class="input-sm form-control" id="deathFlag">
@ -1803,7 +1789,8 @@
endDate: $("#endDate").val(), endDate: $("#endDate").val(),
createTimeStart:$("#createTimeStart").val(), createTimeStart:$("#createTimeStart").val(),
createTimeEnd:$("#createTimeEnd").val(), createTimeEnd:$("#createTimeEnd").val(),
deathFlag:$("#deathFlag").val() deathFlag:$("#deathFlag").val(),
overdueDays:$("#overdueDays").val()
}; };
return temp; return temp;

@ -0,0 +1,102 @@
<%--
Created by IntelliJ IDEA.
User: 56827
Date: 2021/3/4
Time: 20:54
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
<title>Title</title>
<%@include file="../jspf/comm.jspf" %>
<%@ include file="../jspf/ztreeCommom.jsp" %>
</head>
<body>
<div style="margin-left:30px;margin-right:10px;height:auto">
<%--<form id="form" name="form" method="post" action="${pageContext.request.contextPath }/selectByInpNoAndVisitId">--%>
<form>
<div>
<label for="inpNo">住院号:</label>
<input type="text" id="inpNo" placeholder="请输入住院号">
</div>
<div>
<label for="visitId">住院次数:</label>
<input type="number" id="visitId" placeholder="请输入次数">
</div>
<button type="button" id="searchBtn">查询</button>
<button type="button" id="reloadWz">重新校验完整性</button>
<button type="button" id="reloadWzAll">重新校验完整性(缺失清单)</button>
</form>
</div>
<div>
<label>患者id:</label>
<textarea id="masterId" style="height: 200px;width: 400px">
</textarea>
<label>完整性信息:</label>
<textarea id="wzContent" style="height: 200px;width: 400px">
</textarea>
</div>
<script>
$(function () {
$("#searchBtn").on('click', function () {
var inpNo = $("#inpNo").val();
var visitId = $("#visitId").val();
$.ajax({
url: "${pageContext.request.contextPath }/selectByInpNoAndVisitId",
type: "POST",
data: {inpNo: inpNo, visitId: visitId},
success: function (result) {
console.log(result);
if (result.length > 0) {
$("#masterId").val(result[0].id);
$("#wzContent").val(result[0].lockinfo);
}else {
alert("不存在该患者");
}
}
});
});
$("#reloadWz").on('click', function () {
var masterId = $("#masterId").val();
$.ajax({
url: "${pageContext.request.contextPath }/reloadWz",
type: "POST",
data: {masterId: masterId},
success: function (result) {
console.log(result);
if (result > 0) {
alert("重新校验成功");
}else {
alert("重新校验失败");
}
}
});
});
$("#reloadWzAll").on('click', function () {
//var masterId = $("#masterId").val();
$.ajax({
url: "${pageContext.request.contextPath }/reloadWzAll",
type: "GET",
data: null,
success: function (result) {
// console.log(result.length);
// console.log(result);
if (result > 0) {
alert("重新校验成功");
}else {
alert("重新校验失败");
}
}
});
});
});
</script>
</body>
</html>

@ -1973,7 +1973,11 @@
align: 'center', align: 'center',
valign: 'middle', valign: 'middle',
formatter: function (value, row, index) { formatter: function (value, row, index) {
return value.substring(0, 10); var result="";
if(value!=null && value!=""){
result=value.substring(0, 10);
}
return result;
} }
}, },
{ {

Loading…
Cancel
Save