1、增加是否扫描、床号字段

2、修改 出院召回时 将医生提交、护士提交 状态置为未提交
master
leijx 5 years ago
parent 1e494017b7
commit d77d122f42

@ -136,4 +136,21 @@ public class ArchiveMaster {
// 死亡字段
private String deathFlag = "0";
/**
*
* 2020-12-14
*/
@Column(name = "isscaned")
private String isScaned;
private String cmtDoctor;
private String cmtNurse;
//2020-12-28 新增床号
private String bedNumber;
}

@ -71,6 +71,6 @@ public interface ArchiveMasterRepository extends JpaRepository<ArchiveMaster, St
void updateArchiveMasterByUpdate(String id,String name, String sex, Date admissionDateTime, String deptAdmissionTo);
@Transactional
@Modifying
@Query("update ArchiveMaster o set o.archiveState = '在院' where o.id = ?1 and o.isValid = 0 and archivestate <> '作废' ")
@Query("update ArchiveMaster o set o.archiveState = '在院' , o.cmtDoctor = 0 , o.cmtNurse = 0 where o.id = ?1 and o.isValid = 0 and archivestate not in ('作废','初审','已归档','复审退回') ")
Integer updateArchiveMasterArchiveState(String id);
}

@ -7,13 +7,9 @@ import com.ann.demo.service.ArchiveMasterService;
import com.ann.demo.service.InterfaceHisCacheService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.lang.reflect.Field;
import java.util.List;
import java.util.Objects;
/**
* @Author: LeiJiaXin
@ -51,6 +47,7 @@ public class ArchiveMasterServiceImpl implements ArchiveMasterService {
}
archiveMaster.setSex(sex);
}
archiveMaster.setIsScaned("0");
//2020-8-17 如果不等于null那么就是入院信息更新操作
if(archiveMaster.getId() != null ){
@ -102,6 +99,7 @@ public class ArchiveMasterServiceImpl implements ArchiveMasterService {
ArchiveMaster master = archiveMasterRepository.findByIdAndIsValid(archiveMaster.getId(), 0);
if (master != null) {
master.setDeptName(archiveMaster.getDeptName());
master.setBedNumber(archiveMaster.getBedNumber());
master.setDischargeDateTime(archiveMaster.getDischargeDateTime());
if(master.getArchiveState().equals("在院")){
master.setArchiveState("归档中");

Loading…
Cancel
Save