zhanjiang2.0
/
demo
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1、病案首页新增主要诊断；

Browse Source 
2、手麻系统新增标题，以及类型逻辑；
master
leijx 5 years ago
parent 73c22d2e00
commit c375a0786b
7 changed files with 61 additions and 29 deletions
Show Stats Download Patch File Download Diff File

6
src/main/java/com/ann/demo/entity/normalEntity/DiagDetail.java
Unescape Escape View File

@ -25,14 +25,16 @@ public class DiagDetail {
private String masterId;
/**
* 诊断ID
* 诊断ICD
* */
@Id
@Column(name = "diag_code", length = 50)
private String AKC196;
/**
* 诊断类型
* 诊断类型 1门诊诊断 2入院诊断 3出院诊断 4手术并发症
* 5并发症 6院内感染 7损伤和中毒的外部原因 8病理诊断
* 9新生儿疾病诊断
* */
@Id
@Column(name = "diag_type", length = 50)

2
src/main/java/com/ann/demo/entity/normalEntity/OtherData.java
Unescape Escape View File

@ -295,7 +295,7 @@ public class OtherData {
/**
* 78 损伤、中毒的外部原因疾病编码必填
*/
private String YZY092_1;
private String mainDiagCodeOutSideReason;
/**
* 79 损伤中毒的外部原因编码

34
src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java
Unescape Escape View File

@ -5,6 +5,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
import com.ann.demo.entity.constant.AliasName;
import com.ann.demo.entity.constant.Identification;
import com.ann.demo.entity.constant.InterfaceName;
import com.ann.demo.entity.filing.ArchiveDetail;
import com.ann.demo.entity.filing.MessageSubordinate;
import com.ann.demo.entity.filing.dto.MessageDto;
import com.ann.demo.entity.filing.dto.PatientMainDto;
@ -156,11 +157,11 @@ public class HomepageDictionaryImpl implements HomepageDictionary {
if(archiveMasterId != null){
// 保存消息从属表
patientMainStr = JSON.toJSONString(new PatientMainDto(messageDto.getInpNo(), messageDto.getVisitId()), SerializerFeature.WriteMapNullValue);
if (messageDto.getType().equals("麻醉单")) {
type = AliasName.HANDNUMBNESS_REPORT;
} else {
type = AliasName.OTHER;
}
//if (messageDto.getType().equals("麻醉单")) {
type = AliasName.HANDNUMBNESS_REPORT;
// } else {
// type = AliasName.OTHER;
// }
messageDto.setType(type);
result = 1;
flag = true;
@ -202,7 +203,7 @@ public class HomepageDictionaryImpl implements HomepageDictionary {
long startTime = System.currentTimeMillis();
boolean flag = false;
Integer result = 0;
String type = "", patientMainStr = null,archiveMasterId = null;
String type = "", patientMainStr = null,archiveMasterId = null,remark = null;
Date xmlCreateTime = null;
MessageLog messageLog = new MessageLog(xmlStr, InterfaceName.ICU_REPORT, new Date());
messageService.save(messageLog);
@ -211,6 +212,27 @@ public class HomepageDictionaryImpl implements HomepageDictionary {
if (messageDto != null) {
archiveMasterId = messageService.getArchiveMasterId(messageDto.getInpNo(), messageDto.getVisitId());
if(archiveMasterId != null){
// String addFlag = messageDto.getAddFlag();
// //做增删改 增删新增从属 删除不新增
// if(Objects.equals(addFlag,"insert") || Objects.equals(addFlag,"update") || Objects.equals(addFlag,"delete")){
// ArchiveDetail archiveDetail = archiveDetailService.isExit(archiveMasterId, messageDto.getType(), messageDto.getSource(), messageDto.getApplyId());
// if(archiveDetail == null && !Objects.equals(addFlag,"insert")){
// remark = messageDto.getDetailType()+"没有生成对应的文件不能"+ addFlag;
// }else{
// if(Objects.equals(addFlag,"delete")){
// if(!archiveDetailService.delete(archiveDetail.getId())){
// remark = messageDto.getSubType()+"删除失败！";
// }else{
// remark = "ok";
// }
// }
// }
//
// }else{
// remark = "标识不包括insert/update/delete";
// }
// 保存消息从属表
patientMainStr = JSON.toJSONString(new PatientMainDto(messageDto.getInpNo(), messageDto.getVisitId()), SerializerFeature.WriteMapNullValue);
xmlCreateTime = messageDto.getXmlCreateTime();

2
src/main/java/com/ann/demo/repository/MessageRepository.java
Unescape Escape View File

@ -20,7 +20,7 @@ public interface MessageRepository extends JpaRepository<MessageLog, Integer> {
@Query("select o from MessageLog o where o.interfaceName = 'InpSummary' ")
public List<MessageLog> findAllHaha();
@Query(nativeQuery = true,value = " select id from archive_master where (inp_No = ?1 ) and (visit_id = ?2 ) and archiveState <> '作废' ")
@Query(nativeQuery = true,value = " select id from archive_master where (inp_No = ?1 ) and (visit_id = ?2 ) and archiveState <> '作废' and is_valid = 0 ")
public String getArchiveMasterId(String inpNo,String visitId);
}

2
src/main/java/com/ann/demo/service/ArchiveDetailService.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.ann.demo.service;
import com.ann.demo.entity.filing.ArchiveDetail;
import com.ann.demo.entity.filing.dto.MessageDto;
/**
@ -11,4 +12,5 @@ public interface ArchiveDetailService {
public String updateFlag(String applyId);
// ArchiveDetail isExit(String archiveMasterId, String type, String source, String applyId);
}

10
src/main/java/com/ann/demo/service/impl/MedicalRecordHomepageCacheServiceImpl.java
Unescape Escape View File

@ -15,8 +15,9 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Objects;
/**
/**l
* @Author: LeiJiaXin
* @Date: 2019/9/26 9:27
*/
@ -52,7 +53,7 @@ public class MedicalRecordHomepageCacheServiceImpl implements MedicalRecordHomep
try {
MedicalRecordHomepageCache mrh = medicalRecordHomepageCacheRepository.findByMasterId(medicalRecordHomepageCache.getMasterId());
if (mrh != null) {
medicalRecordHomepageCache.setRemark("已被更新:上次内容为" + mrh.getContent());
medicalRecordHomepageCache.setRemark("已更新");
}
medicalRecordHomepageCacheRepository.save(medicalRecordHomepageCache);
return true;
@ -130,6 +131,11 @@ public class MedicalRecordHomepageCacheServiceImpl implements MedicalRecordHomep
if (diagDetails != null) {
for (DiagDetail diagDetail : diagDetails) {
diagDetail.setMasterId(masterId);
// 20200528 取出院诊断的主要诊断
if(Objects.equals(diagDetail.getYZY203(),"3") && Objects.equals(diagDetail.getYZY201(),1) ){
medicalRecordHomepage.getOtherData().setMainDiagCode(diagDetail.getAKC196());
commonTable.setMainDiagName(diagDetail.getAKC185());
}
}
}

34
src/main/resources/application.yml
Unescape Escape View File

@ -1,25 +1,25 @@
spring:
datasource:
url: jdbc:mysql://localhost:3306/test
# url: jdbc:mysql://10.6.1.127:3306/test
username: root
password: 123456
driver-class-name: com.mysql.jdbc.Driver
# url: jdbc:mysql://localhost:3306/test
# # url: jdbc:mysql://10.6.1.127:3306/test
# username: root
# password: 123456
# driver-class-name: com.mysql.jdbc.Driver
# jpa:
# database: mysql
# show-sql: false
# hibernate:
# ddl-auto: update
# database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
url: jdbc:sqlserver://10.6.1.127:1433;DatabaseName=DB_PrivilegeManagement_GYFY
username: sa
password: docus@702
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
jpa:
database: mysql
database: sql_server
show-sql: false
hibernate:
ddl-auto: update
database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
# url: jdbc:sqlserver://10.6.1.127:1433;DatabaseName=DB_PrivilegeManagement_GYFY
# username: sa
# password: docus@702
# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# jpa:
# database: sql_server
# show-sql: false
# hibernate:
# dialect: org.hibernate.dialect.SQLServer2008Dialect
dialect: org.hibernate.dialect.SQLServer2008Dialect
hikari:
#是否为只读数据库
read-only: false

Write Preview
Loading…
Cancel
Save