|
|
|
@ -6,17 +6,13 @@ import com.emr.dao.Emr_DictionaryMapper;
|
|
|
|
|
import com.emr.entity.*;
|
|
|
|
|
import com.emr.service.Archive_DetailService;
|
|
|
|
|
import com.emr.service.Archive_MasterService;
|
|
|
|
|
import com.emr.service.ipml.ArchiveFlowInfoService;
|
|
|
|
|
import com.emr.service.ipml.ArchiveOtherService;
|
|
|
|
|
import com.emr.service.ipml.TPrintinfoService;
|
|
|
|
|
import com.emr.service.ipml.ZdAssortService;
|
|
|
|
|
import com.emr.service.ipml.*;
|
|
|
|
|
import com.emr.util.DateUtil;
|
|
|
|
|
import com.emr.util.ExceptionPrintUtil;
|
|
|
|
|
import com.emr.util.Msg;
|
|
|
|
|
import com.emr.vo.ArchiveFlowInfoVo;
|
|
|
|
|
import com.emr.vo.ArchiveOtherExtVo;
|
|
|
|
|
import net.sf.json.JSONObject;
|
|
|
|
|
import org.apache.commons.lang3.ArrayUtils;
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
import org.apache.http.client.methods.CloseableHttpResponse;
|
|
|
|
|
import org.apache.http.client.methods.HttpGet;
|
|
|
|
@ -65,7 +61,7 @@ public class FontController {
|
|
|
|
|
@Autowired
|
|
|
|
|
private ArchiveFlowInfoService archiveFlowInfoService;
|
|
|
|
|
@Autowired
|
|
|
|
|
private ArchiveOtherExtMapper archiveOtherExtMapper;
|
|
|
|
|
private ArchiveOtherExtService archiveOtherExtService;
|
|
|
|
|
|
|
|
|
|
@RequestMapping("selectIsPrintByPatienId")
|
|
|
|
|
@ResponseBody
|
|
|
|
@ -142,7 +138,7 @@ public class FontController {
|
|
|
|
|
return retrunErrorPage(model,checkUserName);
|
|
|
|
|
}
|
|
|
|
|
//判断门诊号是否存在
|
|
|
|
|
list = archiveOtherExtMapper.selectListBySysFlagAndJzh(-100,opID,null,null,null);
|
|
|
|
|
list = archiveOtherExtService.selectListBySysFlagAndJzh(-100,opID,null,null,null);
|
|
|
|
|
if(null == list || list.isEmpty()){
|
|
|
|
|
return retrunErrorPage(model,"门诊号不存在!");
|
|
|
|
|
}
|
|
|
|
@ -280,7 +276,7 @@ public class FontController {
|
|
|
|
|
@RequestMapping(value = "/getRecordByFilePath")
|
|
|
|
|
public String getRecordByFilePath(String filePath,String jzh){
|
|
|
|
|
try {
|
|
|
|
|
List<ArchiveOtherExtVo> list = archiveOtherExtMapper.selectListBySysFlagAndJzh(-100,jzh,null,null,filePath);
|
|
|
|
|
List<ArchiveOtherExtVo> list = archiveOtherExtService.selectListBySysFlagAndJzh(-100,jzh,null,null,filePath);
|
|
|
|
|
if(!CollectionUtils.isEmpty(list)){
|
|
|
|
|
return JSON.toJSONString(list.get(0));
|
|
|
|
|
}else{
|
|
|
|
@ -444,7 +440,7 @@ public class FontController {
|
|
|
|
|
List<ArchiveOtherExtVo> list = new ArrayList<>();
|
|
|
|
|
//assortIds等于协商的全查的分类id,全查
|
|
|
|
|
try {
|
|
|
|
|
list = archiveOtherExtMapper.selectListBySysFlagAndJzh(-100,jzh,startDateTo,endDateTo,null);
|
|
|
|
|
list = archiveOtherExtService.selectListBySysFlagAndJzh(-100,jzh,startDateTo,endDateTo,null);
|
|
|
|
|
List<String> dateList = new ArrayList<>();
|
|
|
|
|
if(!CollectionUtils.isEmpty(list)) {
|
|
|
|
|
//开始时间为空时,取集合最后一个时间
|
|
|
|
@ -671,5 +667,21 @@ public class FontController {
|
|
|
|
|
return Msg.success().add("list",list);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 其他档案接口删除功能,将statusFlag 赋值-1
|
|
|
|
|
* @return
|
|
|
|
|
* @throws Exception
|
|
|
|
|
*/
|
|
|
|
|
@RequestMapping(value="updateOtherDomForStatusFlag",method = RequestMethod.POST)
|
|
|
|
|
@ResponseBody
|
|
|
|
|
public Msg updateOtherDomForStatusFlag(String jzh,String detailIds) throws Exception{
|
|
|
|
|
if(StringUtils.isBlank(jzh)){
|
|
|
|
|
return Msg.fail("门诊号不能为空");
|
|
|
|
|
}
|
|
|
|
|
if(StringUtils.isBlank(detailIds)){
|
|
|
|
|
return Msg.fail("文档对象不能为空");
|
|
|
|
|
}
|
|
|
|
|
archiveOtherExtService.updateOtherDomForStatusFlag(jzh,detailIds);
|
|
|
|
|
return Msg.success();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|