|
@@ -160,7 +160,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
* @param
|
|
|
* @return
|
|
|
*/
|
|
|
- public List<ColumnDTO> getMedQualityControl() {
|
|
|
+ public List<ColumnDTO> getMedQualityControl(BasDeptInfoVO basDeptInfoVO) {
|
|
|
long hospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
|
|
|
//colums
|
|
|
QueryWrapper<SysHospitalSet> hospitalSetQueryWrapper = new QueryWrapper<>();
|
|
@@ -172,32 +172,23 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
if (hospitalSet == null || StringUtil.isBlank(hospitalSet.getValue())) {
|
|
|
return columns;
|
|
|
}
|
|
|
+ List<String> strings = new ArrayList<>();
|
|
|
|
|
|
//表头生成
|
|
|
List<String> columnSet = Arrays.asList(hospitalSet.getValue().split(","));
|
|
|
Integer orderNo = 1;
|
|
|
- ColumnDTO columnDeptId = new ColumnDTO();
|
|
|
- /* columnDeptId.setOrderNo(orderNo);
|
|
|
- columnDeptId.setFieldName("deptId");
|
|
|
- columnDeptId.setColumnName("科室编码");
|
|
|
- columnDeptId.setIsShow(0);
|
|
|
- columns.add(columnDeptId);
|
|
|
- orderNo++;
|
|
|
- ColumnDTO columnDeptName = new ColumnDTO();
|
|
|
- columnDeptName.setOrderNo(orderNo);
|
|
|
- columnDeptName.setFieldName("deptName");
|
|
|
- columnDeptName.setColumnName("科室");
|
|
|
- columnDeptName.setIsShow(1);
|
|
|
- columns.add(columnDeptName);
|
|
|
- orderNo++;*/
|
|
|
for (String valueStr : columnSet) {
|
|
|
String[] keyValue = valueStr.split("--");
|
|
|
if (keyValue != null || keyValue.length > 1) {
|
|
|
+ strings.add(keyValue[1]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for (String str : strings) {
|
|
|
+ if(str.contains(basDeptInfoVO.getInputStr())){
|
|
|
ColumnDTO columnNum = new ColumnDTO();
|
|
|
columnNum.setOrderNo(orderNo);
|
|
|
- columnNum.setId(Long.valueOf(keyValue[0]));
|
|
|
- columnNum.setFieldName("entry_" + keyValue[0] + "_name");
|
|
|
- columnNum.setColumnName(keyValue[1]);
|
|
|
+ columnNum.setColumnName(str);
|
|
|
+ columnNum.setFieldName("entry_" + str + "_name");
|
|
|
columnNum.setIsShow(1);
|
|
|
columns.add(columnNum);
|
|
|
orderNo++;
|