clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.jizhiweb.cn:2222/clinic-v2/server

This commit is contained in:
ChenQiuYu 2025-05-23 08:58:32 +08:00
parent ff7ab7cc9c d1507ede5b
commit 3c3ea0633d
8 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/syjiaer/clinic/server/common/api/input/BaseInputModel.java
View File

@ -4,6 +4,7 @@ package com.syjiaer.clinic.server.common.api.input;
import com.alibaba.fastjson.JSONObject;
import com.syjiaer.clinic.server.common.api.annotations.IMField;
import com.syjiaer.clinic.server.common.exception.MessageException;
import com.syjiaer.clinic.server.common.util.DebugUtil;
import java.lang.reflect.Field;
import java.util.ArrayList;
@ -54,6 +55,15 @@ public abstract class BaseInputModel {
}
map.put(mapKey, mappedList);
}
else if (value instanceof java.time.LocalDate) {
String dateStr= ((java.time.LocalDate) value).format(java.time.format.DateTimeFormatter.ISO_LOCAL_DATE);
DebugUtil.out(mapKey+":"+dateStr);
map.put(mapKey, dateStr);
} else if (value instanceof java.time.LocalDateTime) {
String dateTimeStr=((java.time.LocalDateTime) value).format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
DebugUtil.out(mapKey+":"+dateTimeStr);
map.put(mapKey, dateTimeStr);
}
else if (value == null || !value.toString().isEmpty()){
map.put(mapKey, value);
}else{

3
src/main/java/com/syjiaer/clinic/server/common/api/input/IM3101.java
View File

@ -17,8 +17,9 @@ import java.util.List;
public class IM3101 extends BaseInputModel {
@IMField(key="syscode",name = "系统编码",required = true)
private String syscode;
@IMField(key="patient_dtos",name = "参保人信息",required = true)
private List<PatientDtos> patientDtos;
private PatientDtos patientDtos;
@IMField(key="rule_ids",name = "规则标识集合")
private List<String> ruleIds;
@IMField(key="task_id",name = "任务ID")

7
src/main/java/com/syjiaer/clinic/server/common/api/input/im3101/FsiEncounterDtos.java
View File

@ -1,5 +1,6 @@
package com.syjiaer.clinic.server.common.api.input.im3101;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.syjiaer.clinic.server.common.api.annotations.IMField;
import com.syjiaer.clinic.server.common.api.input.BaseInputModel;
import lombok.Getter;
@ -25,9 +26,9 @@ public class FsiEncounterDtos extends BaseInputModel {
@IMField(key = "medins_admdvs", name = "医疗机构行政区划编码", required = true)
private String medinsAdmdvs;
@IMField(key = "medins_type", name = "医疗服务机构类型", required = true)
private String medinsType;
private String medinsType="1";
@IMField(key = "medins_lv", name = "医疗机构等级", required = true)
private String medinsLv;
private String medinsLv="05";
@IMField(key = "wardarea_codg", name = "病区标识")
private String wardareaCodg;
@IMField(key = "wardno", name = "病房号")
@ -35,8 +36,10 @@ public class FsiEncounterDtos extends BaseInputModel {
@IMField(key = "bedno", name = "病床号")
private String bedno;
@IMField(key = "adm_date", name = "入院日期", required = true)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime admDate;
@IMField(key = "dscg_date", name = "出院日期", required = true)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime dscgDate;
@IMField(key = "dscg_main_dise_codg", name = "主诊断编码", required = true)
private String dscgMainDiseCodg;

5
src/main/java/com/syjiaer/clinic/server/common/api/input/im3101/FsiOrderDtos.java
View File

@ -73,14 +73,19 @@ public class FsiOrderDtos extends BaseInputModel {
private LocalDateTime drordStopDate;
@IMField(key = "drord_dept_codg", name = "下达医嘱的科室标识", required = true)
private String drordDeptCodg;
@IMField(key = "drord_dept_name", name = "下达医嘱科室名称", required = true)
private String drordDeptName;
@IMField(key = "drord_dr_codg", name = "开处方(医嘱)医生标识", required = true)
private String drordDrCodg;
@IMField(key = "drord_dr_name", name = "开处方(医嘱)医生姓名", required = true)
private String drordDrName;
@IMField(key = "drord_dr_profttl", name = "开处方(医嘱)医职称", required = true)
private String drordDrProfttl;
@IMField(key = "curr_drord_flag", name = "是否当前处方(医嘱)", required = true)
private String currDrordFlag;
}

4
src/main/java/com/syjiaer/clinic/server/common/api/input/im3101/PatientDtos.java
View File

@ -20,7 +20,7 @@ public class PatientDtos extends BaseInputModel {
@IMField(key = "patn_name", name = "姓名", required = true)
private String patnName;
@IMField(key = "gend", name = "性别", required = true)
private String gend;
private Integer gend;
@IMField(key = "brdy", name = "出生日期", required = true)
private LocalDate brdy;
@IMField(key = "poolarea", name = "统筹区编码", required = true)
@ -28,5 +28,5 @@ public class PatientDtos extends BaseInputModel {
@IMField(key = "curr_mdtrt_id", name = "当前就诊标识", required = true)
private String currMdtrtId;
@IMField(key = "fsi_encounter_dtos", name = "就诊信息集合", required = true)
private List<FsiEncounterDtos> fsiEncounterDtos;
private FsiEncounterDtos fsiEncounterDtos;
}

6
src/main/java/com/syjiaer/clinic/server/common/api/request/SocialRequest.java
View File

@ -248,4 +248,10 @@ public class SocialRequest {
JSONObject jsonObject = httpUtil.callBackMsgId("5102", "data", map, 10000);
return jsonObject;
}
public void call3101(IM3101 im3101) {
JSONObject jsonObject = httpUtil.callBackMsgId("3101", "data", im3101.buildToMap(), 10000);
DebugUtil.out(jsonObject);
}
}

6
src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java
View File

@ -493,10 +493,12 @@ public class ChargeService extends BaseService {
public void uploadCostDetails(String changeOrderCode) {
ChargeOrder order = chargeOrderMapper.selectByCode(changeOrderCode);
List<ChargeGoodsList> goodsLists = chargeGoodsListMapper.selectByCode(changeOrderCode);
List<ChargeItemList> itemLists = chargeItemListMapper.selectByCode(changeOrderCode);
if (order.getMdtrtId() == null){
throw new MessageException("非医保挂号，不能上传费用明细信息");
}
//撤销之前上传的费用明细信息
try {
IM2205 im2205 = new IM2205();

13
src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java
View File

@ -115,7 +115,18 @@ public class PatientRegistrationService extends BaseService {
if (registration.getType().equals(RegistrationTypeEnum.Common.getType())){
return registration;
}
if (registration.getPsnNo() == null){
throw new MessageException("医保挂号人员编号不能为空");
}
if (registration.getInsutype() == null){
throw new MessageException("医保挂号险种不能为空");
}
if (mdtrtCertType == null){
throw new MessageException("医保挂号证件类型不能为空");
}
if (mdtrtCertNo == null){
throw new MessageException("医保挂号证件号码不能为空");
}
//医保挂号额外流程
IM2201 im2201 = new IM2201();
im2201.setPsnNo(registration.getPsnNo());