From 5505e1d0c25ede3232b4cd7ab4a99f9e8627ce3c Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Thu, 12 Mar 2026 10:52:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A9=E5=BC=80=E5=8D=95=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/entity/reg/RegApply.java | 1 + .../domain/entity/reg/RegApplyDetail.java | 2 + .../core/domain/entity/reg/RegHospital.java | 1 + .../core/domain/entity/reg/RegItemclass.java | 1 + .../common/core/domain/entity/reg/RegSeq.java | 14 + .../domain/entity/reg/RegTransitSample.java | 4 +- .../entity/reg/RegTransitSampleDetail.java | 4 + .../interfaceCommon/mapper/CommonMapper.java | 5 +- .../mapper/RegApplyDetailMapper.java | 12 + .../mapper/RegApplyMapper.java | 10 + .../interfaceCommon/mapper/RegSeqMapper.java | 10 + .../interfaceCommon/utils/CommonUtil.java | 51 +++ .../main/resources/mapper/CommonMapper.xml | 4 +- .../resources/mapper/RegApplyDetailMapper.xml | 57 ++++ .../main/resources/mapper/RegApplyMapper.xml | 113 +++++++ .../main/resources/mapper/RegSeqMapper.xml | 15 + .../system/web/config/SwaggerConfig.java | 2 +- .../com/transitPlatForm/SpringbootTest.java | 23 ++ .../controller/RegRequestInfoController.java | 12 +- .../controller/dict/RegDictController.java | 7 + .../transitPF/mapper/RegDictMapper.java | 2 + .../mapper/RegRequestInfoMapper.java | 3 +- .../transitPF/pojo/DTO/ReqApplyInfoDTO.java | 17 + .../transitPF/service/RegDictService.java | 3 + .../service/RegRequestInfoService.java | 3 + .../service/impl/RegDictServiceImpl.java | 7 + .../impl/RegRequestInfoServiceImpl.java | 292 +++++++++++++++++- .../main/resources/mapper/RegDictMapper.xml | 4 + .../resources/mapper/RegRequestInfoMapper.xml | 4 +- .../mapper/RegTransitSampleMapper.xml | 28 ++ 30 files changed, 696 insertions(+), 15 deletions(-) create mode 100644 pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegSeq.java create mode 100644 pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegApplyDetailMapper.java create mode 100644 pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegApplyMapper.java create mode 100644 pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegSeqMapper.java create mode 100644 pf_interfaceCommon/src/main/resources/mapper/RegApplyDetailMapper.xml create mode 100644 pf_interfaceCommon/src/main/resources/mapper/RegApplyMapper.xml create mode 100644 pf_interfaceCommon/src/main/resources/mapper/RegSeqMapper.xml create mode 100644 pf_system/src/test/java/com/transitPlatForm/SpringbootTest.java create mode 100644 pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/ReqApplyInfoDTO.java diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegApply.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegApply.java index 5512227..e8c72a1 100644 --- a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegApply.java +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegApply.java @@ -55,4 +55,5 @@ public class RegApply { * 状态 0.正常，1 作废 */ private String Status; + private String applyid; } diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegApplyDetail.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegApplyDetail.java index f42ed01..4430eeb 100644 --- a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegApplyDetail.java +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegApplyDetail.java @@ -11,6 +11,7 @@ import java.util.Date; @AllArgsConstructor @NoArgsConstructor public class RegApplyDetail { + private Long uid; private String applyid; private BigDecimal OrderItemSerial; private String OrderItemCode; @@ -24,4 +25,5 @@ public class RegApplyDetail { private String update_by; private Date update_time; private String DataSource; + private BigDecimal amount; } diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegHospital.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegHospital.java index ddcab30..e0034eb 100644 --- a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegHospital.java +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegHospital.java @@ -36,4 +36,5 @@ public class RegHospital extends BaseEntity { */ @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; + private String hospital_type; } diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegItemclass.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegItemclass.java index e251df7..0c5e8bc 100644 --- a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegItemclass.java +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegItemclass.java @@ -47,4 +47,5 @@ public class RegItemclass extends BaseEntity { private Long itemclassPrintcnt; @Excel(name = "抗凝样本", readConverterExp = "0=否,1=是") private Long itemclassKn; + private String classid; } diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegSeq.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegSeq.java new file mode 100644 index 0000000..661d321 --- /dev/null +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegSeq.java @@ -0,0 +1,14 @@ +package com.transitPlatForm.common.core.domain.entity.reg; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class RegSeq { + private String seqid; + private Long maxno; + private String bz; +} diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSample.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSample.java index 303bf28..6d9e6ab 100644 --- a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSample.java +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSample.java @@ -56,7 +56,7 @@ public class RegTransitSample { /** * 出生日期 时间格式：yyyy-MM-dd */ - private String PatBirthday; + private Date PatBirthday; /** * 身份证号 */ @@ -130,7 +130,7 @@ public class RegTransitSample { */ private String Barcode; /** - * 试管编码 + * 条码类别 */ private String SrcHospBarcode; /** diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSampleDetail.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSampleDetail.java index 04b6439..c3ca0ed 100644 --- a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSampleDetail.java +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSampleDetail.java @@ -56,4 +56,8 @@ public class RegTransitSampleDetail { * 数据来源 */ private String DataSource; + private String applyid; + private String applyDetailId; + private String bz1; + private String bz2; } diff --git a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/CommonMapper.java b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/CommonMapper.java index c2aa6f5..0704305 100644 --- a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/CommonMapper.java +++ b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/CommonMapper.java @@ -3,9 +3,10 @@ package com.transitPlatForm.interfaceCommon.mapper; import java.util.Date; +import java.util.List; +import java.util.Map; public interface CommonMapper { Date getCurrentTime(); - //String getyhjs(@Param("yhdh")String yhdh); - //String getUserPower(@Param("yq")String yq,@Param("yhdh")String yhdh); + List> getFeeClassList(); } diff --git a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegApplyDetailMapper.java b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegApplyDetailMapper.java new file mode 100644 index 0000000..9220dfc --- /dev/null +++ b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegApplyDetailMapper.java @@ -0,0 +1,12 @@ +package com.transitPlatForm.interfaceCommon.mapper; + +import com.transitPlatForm.common.core.domain.entity.reg.RegApplyDetail; + +import java.util.List; + +public interface RegApplyDetailMapper { + void insert(RegApplyDetail regApplyDetail); + List queryList(RegApplyDetail regApplyDetail); + void update(RegApplyDetail regApplyDetail); + void delete(String applyid); +} diff --git a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegApplyMapper.java b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegApplyMapper.java new file mode 100644 index 0000000..d45301f --- /dev/null +++ b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegApplyMapper.java @@ -0,0 +1,10 @@ +package com.transitPlatForm.interfaceCommon.mapper; + +import com.transitPlatForm.common.core.domain.entity.reg.RegApply; + +public interface RegApplyMapper { + void insert(RegApply regApply); + RegApply queryOne(RegApply regApply); + void update(RegApply regApply); + void delete(String applyid); +} diff --git a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegSeqMapper.java b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegSeqMapper.java new file mode 100644 index 0000000..6c0a529 --- /dev/null +++ b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegSeqMapper.java @@ -0,0 +1,10 @@ +package com.transitPlatForm.interfaceCommon.mapper; + +import com.transitPlatForm.common.core.domain.entity.reg.RegSeq; + +import java.util.List; + +public interface RegSeqMapper { + RegSeq getSeqOne(String seqid); + void update(RegSeq regSeq); +} diff --git a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/utils/CommonUtil.java b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/utils/CommonUtil.java index 7fa560e..290b501 100644 --- a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/utils/CommonUtil.java +++ b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/utils/CommonUtil.java @@ -1,9 +1,12 @@ package com.transitPlatForm.interfaceCommon.utils; +import com.transitPlatForm.common.core.domain.Result; import com.transitPlatForm.common.core.domain.entity.SysUser; +import com.transitPlatForm.common.core.domain.entity.reg.RegSeq; import com.transitPlatForm.interfaceCommon.mapper.ComLocalconfigMapper; import com.transitPlatForm.interfaceCommon.mapper.CommonMapper; +import com.transitPlatForm.interfaceCommon.mapper.RegSeqMapper; import com.transitPlatForm.interfaceCommon.mapper.SysUserCommMapper; import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -23,6 +26,9 @@ public class CommonUtil { SysUserCommMapper sysUserCommMapper; @Autowired ComLocalconfigMapper comLocalconfigMapper; + @Autowired + RegSeqMapper regSeqMapper; + //服务器时间方法 @@ -58,5 +64,50 @@ public class CommonUtil { return comLocalconfigMapper.getLocalconfigByIP(ip); } + /** + * 获取种子最大值 + * @return + */ + public synchronized String getMaxNo(String seqid) { + RegSeq seqOne = regSeqMapper.getSeqOne(seqid); + if (seqOne != null) return ""; + long maxno = seqOne.getMaxno() + 1; + seqOne.setMaxno(maxno); + regSeqMapper.update(seqOne); + return LisUtil.isBank(maxno); + } + + /** + * 获取固定位数的序列 + * @param seqName + * @param position + * @return + */ + public String getNextSeq_pro(String seqName,int position){ + String subMaxNo = ""; + String maxNo = getMaxNo(seqName); + int length = maxNo.length(); + if(length > position){ + subMaxNo = maxNo.substring(length - position); + }else{ + // int len = position - length ; + subMaxNo = String.format("%0" + position + "d", Integer.valueOf(maxNo)); + } + + return subMaxNo; + } + + public Map getFeeClass(List> feeClassList,String itemcode){ + Map map = new HashMap<>(); + List> collect = feeClassList.stream().filter(feeClass -> feeClass.get("itemcode").equals(itemcode)).collect(Collectors.toList()); + if(collect.size() > 0){ + map.put("itemclass",collect.get(0).get("itemclass")); + map.put("itemclass_yblx",collect.get(0).get("itemclass_yblx")); + map.put("itemclass_bkcolor",collect.get(0).get("itemclass_bkcolor")); + return map; + } + return map; + } + } diff --git a/pf_interfaceCommon/src/main/resources/mapper/CommonMapper.xml b/pf_interfaceCommon/src/main/resources/mapper/CommonMapper.xml index 189de1e..8575e1f 100644 --- a/pf_interfaceCommon/src/main/resources/mapper/CommonMapper.xml +++ b/pf_interfaceCommon/src/main/resources/mapper/CommonMapper.xml @@ -6,7 +6,9 @@ select getdate() - + diff --git a/pf_interfaceCommon/src/main/resources/mapper/RegApplyDetailMapper.xml b/pf_interfaceCommon/src/main/resources/mapper/RegApplyDetailMapper.xml new file mode 100644 index 0000000..804a3e2 --- /dev/null +++ b/pf_interfaceCommon/src/main/resources/mapper/RegApplyDetailMapper.xml @@ -0,0 +1,57 @@ + + + + + insert into reg_apply_detail(applyid, OrderItemSerial, OrderItemCode, OrderItemName, SampleTypeCode, + SampleTypeName, BodyCode, BodyName, create_by, create_time, update_by, update_time, + DataSource, amount) + values (#{applyid}, + #{OrderItemSerial}, + #{OrderItemCode}, + #{OrderItemName}, + #{SampleTypeCode}, + #{SampleTypeName}, + #{BodyCode}, + #{BodyName}, + #{create_by}, + #{create_time}, + #{update_by}, + #{update_time}, + #{DataSource}, + #{amount}) + + + + + + update reg_apply_detail + + OrderItemSerial = #{OrderItemSerial}, + OrderItemCode = #{OrderItemCode}, + OrderItemName = #{OrderItemName}, + SampleTypeCode = #{SampleTypeCode}, + SampleTypeName = #{SampleTypeName}, + BodyCode = #{BodyCode}, + BodyName = #{BodyName}, + DataSource = #{DataSource}, + amount = #{amount}, + applyDetailId = #{applyDetailId}, + bz1 = #{bz1}, + bz2 = #{bz2}, + update_by = #{update_by}, + update_time = #{update_time}, + applyid = #{applyid} + + where applyid = #{applyid} + + + + delete from reg_apply_detail where applyid = #{applyid} + + \ No newline at end of file diff --git a/pf_interfaceCommon/src/main/resources/mapper/RegApplyMapper.xml b/pf_interfaceCommon/src/main/resources/mapper/RegApplyMapper.xml new file mode 100644 index 0000000..7dbad7f --- /dev/null +++ b/pf_interfaceCommon/src/main/resources/mapper/RegApplyMapper.xml @@ -0,0 +1,113 @@ + + + + + insert into reg_apply(PatId, PatCardType, PatCardNo, PatType, RegNo, PatName, PatSex, PatAge, AgeUnit, + PatAgeShow, PatBirthday, PatIdentity, Phone, Address, PatFeeType, DepartCode, + DepartName, AreaCode, AreaName, PatBed, DiagnosisCode, DiagnosisName, ReciNumber, + DoctorCode, DoctorName, OrderTime, ExecDeptCode, ExecDeptName, SrcHospCode, SrcHospName, + Amount, ChargeState, PatInvoiceNum, UserCode, UserName, DataSource, applyid, Status) + values (#{PatId}, + #{PatCardType}, + #{PatCardNo}, + #{PatType}, + #{RegNo}, + #{PatName}, + #{PatSex}, + #{PatAge}, + #{AgeUnit}, + #{PatAgeShow}, + #{PatBirthday}, + #{PatIdentity}, + #{Phone}, + #{Address}, + #{PatFeeType}, + #{DepartCode}, + #{DepartName}, + #{AreaCode}, + #{AreaName}, + #{PatBed}, + #{DiagnosisCode}, + #{DiagnosisName}, + #{ReciNumber}, + #{DoctorCode}, + #{DoctorName}, + #{OrderTime}, + #{ExecDeptCode}, + #{ExecDeptName}, + #{SrcHospCode}, + #{SrcHospName}, + #{Amount}, + #{ChargeState}, + #{PatInvoiceNum}, + #{UserCode}, + #{UserName}, + #{DataSource}, + #{applyid}, + #{Status}) + + + + + + update reg_apply + + PatId = #{PatId}, + PatCardType = #{PatCardType}, + PatCardNo = #{PatCardNo}, + PatType = #{PatType}, + RegNo = #{RegNo}, + PatName = #{PatName}, + PatSex = #{PatSex}, + PatAge = #{PatAge}, + AgeUnit = #{AgeUnit}, + PatAgeShow = #{PatAgeShow}, + PatBirthday = #{PatBirthday}, + PatIdentity = #{PatIdentity}, + Phone = #{Phone}, + Address = #{Address}, + PatFeeType = #{PatFeeType}, + DepartCode = #{DepartCode}, + DepartName = #{DepartName}, + AreaCode = #{AreaCode}, + AreaName = #{AreaName}, + PatBed = #{PatBed}, + DiagnosisCode = #{DiagnosisCode}, + DiagnosisName = #{DiagnosisName}, + ReciNumber = #{ReciNumber}, + DoctorCode = #{DoctorCode}, + DoctorName = #{DoctorName}, + OrderTime = #{OrderTime}, + ExecDeptCode = #{ExecDeptCode}, + ExecDeptName = #{ExecDeptName}, + SrcHospCode = #{SrcHospCode}, + SrcHospName = #{SrcHospName}, + SrcHospName = #{SrcHospName}, + Amount = #{Amount}, + ChargeState = #{ChargeState}, + PatInvoiceNum = #{PatInvoiceNum}, + UserCode = #{UserCode}, + UserName = #{UserName}, + DataSource = #{DataSource}, + create_by = #{create_by}, + create_time = #{create_time}, + update_by = #{update_by}, + update_time = #{update_time}, + applyid = #{applyid}, + Status = #{Status}, + applyid = #{applyid} + + where applyid = #{applyid} + + + + delete from reg_apply where applyid = #{applyid} + + + \ No newline at end of file diff --git a/pf_interfaceCommon/src/main/resources/mapper/RegSeqMapper.xml b/pf_interfaceCommon/src/main/resources/mapper/RegSeqMapper.xml new file mode 100644 index 0000000..9cb0aba --- /dev/null +++ b/pf_interfaceCommon/src/main/resources/mapper/RegSeqMapper.xml @@ -0,0 +1,15 @@ + + + + + + + update reg_seq set maxno = #{maxno} where seqid = #{seqid} + + + + \ No newline at end of file diff --git a/pf_system/src/main/java/com/transitPlatForm/system/web/config/SwaggerConfig.java b/pf_system/src/main/java/com/transitPlatForm/system/web/config/SwaggerConfig.java index 35bd5cf..6446b90 100644 --- a/pf_system/src/main/java/com/transitPlatForm/system/web/config/SwaggerConfig.java +++ b/pf_system/src/main/java/com/transitPlatForm/system/web/config/SwaggerConfig.java @@ -115,7 +115,7 @@ public class SwaggerConfig { // 用ApiInfoBuilder进行定制 return new ApiInfoBuilder() // 设置标题 - .title("标题：检验lis8.0系统_接口文档") + .title("标题：区域流转平台_接口文档") // 描述 .description("描述：用于测试和管理后台接口") // 作者信息 diff --git a/pf_system/src/test/java/com/transitPlatForm/SpringbootTest.java b/pf_system/src/test/java/com/transitPlatForm/SpringbootTest.java new file mode 100644 index 0000000..d8c5177 --- /dev/null +++ b/pf_system/src/test/java/com/transitPlatForm/SpringbootTest.java @@ -0,0 +1,23 @@ +package com.transitPlatForm; + +import cn.hutool.core.date.DateUtil; +import com.transitPlatForm.interfaceCommon.utils.CommonUtil; +import com.transitPlatForm.system.TransitPlatFormApplication; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; + +import javax.annotation.Resource; + +@SpringBootTest(classes = TransitPlatFormApplication.class) +public class SpringbootTest { + + @Resource + CommonUtil commonUtil; + + @Test + public void test01(){ + String dateStr = DateUtil.format(commonUtil.getCurrentTime(), "yyyyMMdd"); + System.out.println(dateStr); + } +} diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegRequestInfoController.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegRequestInfoController.java index 4a97588..9a95f72 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegRequestInfoController.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegRequestInfoController.java @@ -3,14 +3,13 @@ package com.transitPlatForm.transitPF.controller; import com.transitPlatForm.common.core.controller.BaseController; import com.transitPlatForm.common.core.domain.Result; import com.transitPlatForm.transitPF.pojo.DTO.RegRequestInfoDTO; +import com.transitPlatForm.transitPF.pojo.DTO.ReqApplyInfoDTO; import com.transitPlatForm.transitPF.service.RegRequestInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * 自助开单界面 @@ -44,4 +43,11 @@ public class RegRequestInfoController extends BaseController { } + @ApiOperation("保存申请单信息") + @PostMapping("/saveReqInfo") + public Result saveReqInfo(@RequestBody ReqApplyInfoDTO reqApplyInfoDTO){ + return regRequestInfoService.saveReqInfo(reqApplyInfoDTO); + } + + } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java index a03bcfd..5210593 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java @@ -3,6 +3,7 @@ package com.transitPlatForm.transitPF.controller.dict; import com.transitPlatForm.common.annotation.Log; import com.transitPlatForm.common.core.controller.BaseController; import com.transitPlatForm.common.core.domain.AjaxResult; +import com.transitPlatForm.common.core.domain.Result; import com.transitPlatForm.common.core.page.TableDataInfo; import com.transitPlatForm.common.enums.BusinessType; import com.transitPlatForm.common.utils.poi.ExcelUtil; @@ -53,6 +54,12 @@ public class RegDictController extends BaseController { return success(regDictService.selectDictById(dictId)); } + @ApiOperation("获取字典信息") + @GetMapping("/getInfoOne") + public Result getInfoOne(String dict_type){ + return regDictService.getInfoOne(dict_type); + } + /** * 新增字典 */ diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDictMapper.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDictMapper.java index 49fd185..96c2d73 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDictMapper.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDictMapper.java @@ -78,4 +78,6 @@ public interface RegDictMapper { * @return 结果 */ RegDict checkDictCodeUnique(@Param("dictCode") String DictCode,@Param("dictType") String dictType); + + List getInfoOne(String dict_type); } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegRequestInfoMapper.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegRequestInfoMapper.java index 1887915..afec445 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegRequestInfoMapper.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegRequestInfoMapper.java @@ -6,11 +6,12 @@ import com.transitPlatForm.common.core.domain.entity.reg.RegItem; import com.transitPlatForm.transitPF.pojo.DTO.RegRequestInfoDTO; import java.util.List; +import java.util.Map; public interface RegRequestInfoMapper { List queryRegRequestInfo(RegRequestInfoDTO regRequestInfoDTO); List queryReqDetail(String applyId); - List getItemInfo(); + List> getItemInfo(); } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/ReqApplyInfoDTO.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/ReqApplyInfoDTO.java new file mode 100644 index 0000000..5759f4b --- /dev/null +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/ReqApplyInfoDTO.java @@ -0,0 +1,17 @@ +package com.transitPlatForm.transitPF.pojo.DTO; + +import com.transitPlatForm.common.core.domain.entity.reg.RegApply; +import com.transitPlatForm.common.core.domain.entity.reg.RegApplyDetail; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ReqApplyInfoDTO { + private RegApply regApply; + private List regApplyDetailList; +} diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegDictService.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegDictService.java index 2deb4a4..55f7f54 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegDictService.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegDictService.java @@ -1,5 +1,6 @@ package com.transitPlatForm.transitPF.service; +import com.transitPlatForm.common.core.domain.Result; import com.transitPlatForm.common.core.domain.entity.reg.RegDict; import java.util.List; @@ -84,4 +85,6 @@ public interface RegDictService { * @return 结果 */ int updateDict(RegDict Dict); + + Result getInfoOne(String dictType); } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegRequestInfoService.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegRequestInfoService.java index 25e2400..2ceb460 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegRequestInfoService.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegRequestInfoService.java @@ -2,6 +2,7 @@ package com.transitPlatForm.transitPF.service; import com.transitPlatForm.common.core.domain.Result; import com.transitPlatForm.transitPF.pojo.DTO.RegRequestInfoDTO; +import com.transitPlatForm.transitPF.pojo.DTO.ReqApplyInfoDTO; public interface RegRequestInfoService { Result queryRegRequestInfo(RegRequestInfoDTO regRequestInfoDTO); @@ -9,4 +10,6 @@ public interface RegRequestInfoService { Result queryReqDetail(String applyId); Result getItemInfo(); + + Result saveReqInfo(ReqApplyInfoDTO reqApplyInfoDTO); } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDictServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDictServiceImpl.java index 2903c04..fc4e18f 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDictServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDictServiceImpl.java @@ -1,6 +1,7 @@ package com.transitPlatForm.transitPF.service.impl; import com.transitPlatForm.common.constant.UserConstants; +import com.transitPlatForm.common.core.domain.Result; import com.transitPlatForm.common.exception.ServiceException; import com.transitPlatForm.common.utils.StringUtils; import com.transitPlatForm.transitPF.mapper.RegDictMapper; @@ -143,4 +144,10 @@ public class RegDictServiceImpl implements RegDictService { public int updateDict(RegDict Dict) { return dictMapper.updateDict(Dict); } + + @Override + public Result getInfoOne(String dictType) { + List regDictList = dictMapper.getInfoOne(dictType); + return new Result("0","获取数据成功！",regDictList); + } } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java index cb68274..bade4d6 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java @@ -1,17 +1,30 @@ package com.transitPlatForm.transitPF.service.impl; +import cn.hutool.core.date.DateUtil; import com.transitPlatForm.common.core.domain.Result; import com.transitPlatForm.common.core.domain.entity.reg.RegApply; import com.transitPlatForm.common.core.domain.entity.reg.RegApplyDetail; -import com.transitPlatForm.common.core.domain.entity.reg.RegItem; +import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample; +import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSampleDetail; +import com.transitPlatForm.interfaceCommon.mapper.CommonMapper; +import com.transitPlatForm.interfaceCommon.mapper.RegApplyDetailMapper; +import com.transitPlatForm.interfaceCommon.mapper.RegApplyMapper; +import com.transitPlatForm.interfaceCommon.utils.CommonUtil; +import com.transitPlatForm.interfaceCommon.utils.LisUtil; import com.transitPlatForm.transitPF.mapper.RegRequestInfoMapper; +import com.transitPlatForm.transitPF.mapper.RegTransitSampleMapper; import com.transitPlatForm.transitPF.pojo.DTO.RegRequestInfoDTO; +import com.transitPlatForm.transitPF.pojo.DTO.ReqApplyInfoDTO; import com.transitPlatForm.transitPF.service.RegRequestInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; -import java.util.List; +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.*; @Service @Slf4j @@ -19,6 +32,19 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService { @Autowired RegRequestInfoMapper regRequestInfoMapper; + @Autowired + private CommonUtil commonUtil; + @Autowired + private CommonMapper commonMapper; + @Autowired + private RegApplyMapper regApplyMapper; + @Autowired + private RegApplyDetailMapper regApplyDetailMapper; + @Resource + private ApplicationContext applicationContext; + @Resource + private RegTransitSampleMapper regTransitSampleMapper; + /** * 获取申请单列表 @@ -44,7 +70,267 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService { @Override public Result getItemInfo() { - List regItemList = regRequestInfoMapper.getItemInfo(); + List> regItemList = regRequestInfoMapper.getItemInfo(); return new Result("0","查询成功！",regItemList); } + + /** + * 保存申请单信息和条码信息 + * @param reqApplyInfoDTO + * @return + */ + @Override + public Result saveReqInfo(ReqApplyInfoDTO reqApplyInfoDTO) { + RegApply regApply = reqApplyInfoDTO.getRegApply(); + List regApplyDetailList = reqApplyInfoDTO.getRegApplyDetailList(); + String status = regApply.getStatus(); + if(status == null) status = ""; + //修改数据 + if(status.equals("")){ + applicationContext.getBean(RegRequestInfoServiceImpl.class).updateApply(regApply,regApplyDetailList); + } + + //申请单号 + String applyId = "PT"+regApply.getSrcHospCode()+DateUtil.format(commonUtil.getCurrentTime(),"yyyyMMdd")+commonUtil.getNextSeq_pro("applyno",4); + regApply.setApplyid(applyId); + regApply.setStatus("1"); + regApply.setCreate_by(regApply.getUserCode()); + regApply.setCreate_time(commonUtil.getCurrentTime()); + + + for (RegApplyDetail regApplyDetail : regApplyDetailList) { + regApplyDetail.setApplyid(applyId); + } + + //保存申请单信息 + applicationContext.getBean(RegRequestInfoServiceImpl.class).saveReqInfo(regApply,regApplyDetailList); + + //生成条码信息 + regApply = regApplyMapper.queryOne(regApply); + RegApplyDetail regApplyDetail = new RegApplyDetail(); + regApplyDetail.setApplyid(regApply.getApplyid()); + regApplyDetailList = regApplyDetailMapper.queryList(regApplyDetail); + Result result = createBarcode(regApply, regApplyDetailList); + if(!result.getCode().equals("0")) return result; + + return new Result("0","保存成功！"); + } + + @Transactional(rollbackFor = Exception.class) + public void saveReqInfo(RegApply regApply,List regApplyDetailList){ + regApplyMapper.insert(regApply); + for (RegApplyDetail regApplyDetail : regApplyDetailList) { + regApplyDetailMapper.insert(regApplyDetail); + } + } + + + public Result createBarcode(RegApply regApply,List regApplyDetailList){ + String ls_nopriceitems = ""; + + List regTransitSampleList = new ArrayList<>(); + List regTransitSampleDetailList = new ArrayList<>(); + List> reqSqdInfoList = new ArrayList<>(); + + + + //获取项目的对照信息列表 + List> feeClassList = commonMapper.getFeeClassList(); + for (RegApplyDetail regApplyDetail : regApplyDetailList) { + + String orderItemCode = regApplyDetail.getOrderItemCode(); + String orderItemName = regApplyDetail.getOrderItemName(); + //判断是否对照 + Map feeClass = commonUtil.getFeeClass(feeClassList,orderItemCode); + if(feeClass.size() <= 0) { + ls_nopriceitems += "~r~n"+orderItemCode + "|" + orderItemName; + continue; + } + + String itemClass = LisUtil.isBank(feeClass.get("itemclass")); + + + Map reqSqdInfo = new HashMap<>(); + reqSqdInfo.put("sample_PatId",regApply.getPatId()); + reqSqdInfo.put("sample_PatCardType",regApply.getPatCardType()); + reqSqdInfo.put("sample_PatCardNo",regApply.getPatCardNo()); + reqSqdInfo.put("sample_PatType",regApply.getPatType()); + reqSqdInfo.put("sample_RegNo",regApply.getRegNo()); + reqSqdInfo.put("sample_PatName",regApply.getPatName()); + reqSqdInfo.put("sample_PatSex",regApply.getPatSex()); + reqSqdInfo.put("sample_PatAge",regApply.getPatAge()); + reqSqdInfo.put("sample_AgeUnit",regApply.getAgeUnit()); + reqSqdInfo.put("sample_PatAgeShow",regApply.getPatAgeShow()); + reqSqdInfo.put("sample_PatBirthday",DateUtil.format(regApply.getPatBirthday(),"yyyy-MM-dd")); + reqSqdInfo.put("sample_PatIdentity",regApply.getPatIdentity()); + reqSqdInfo.put("sample_Phone",regApply.getPhone()); + reqSqdInfo.put("sample_Address",regApply.getAddress()); + reqSqdInfo.put("sample_PatFeeType",regApply.getPatFeeType()); + reqSqdInfo.put("sample_DepartCode",regApply.getDepartCode()); + reqSqdInfo.put("sample_DepartName",regApply.getDepartName()); + reqSqdInfo.put("sample_AreaCode",regApply.getAreaCode()); + reqSqdInfo.put("sample_AreaName",regApply.getAreaName()); + reqSqdInfo.put("sample_PatBed",regApply.getPatBed()); + reqSqdInfo.put("sample_DiagnosisCode",regApply.getDiagnosisCode()); + reqSqdInfo.put("sample_DiagnosisName",regApply.getDiagnosisName()); + reqSqdInfo.put("sample_OrderUserCode",regApply.getDoctorCode()); + reqSqdInfo.put("sample_OrderUserName",regApply.getDoctorName()); + reqSqdInfo.put("sample_OrderTime",regApply.getOrderTime()); + reqSqdInfo.put("sample_SrcHospCode",regApply.getSrcHospCode()); + reqSqdInfo.put("sample_SrcHospName",regApply.getSrcHospName()); + reqSqdInfo.put("sample_SampleTypeCode",regApplyDetail.getSampleTypeCode()); + reqSqdInfo.put("sample_SampleTypeName",regApplyDetail.getSampleTypeName()); + reqSqdInfo.put("sample_IsER","0"); //是否急查 + reqSqdInfo.put("sample_Status","10"); //开单状态 + reqSqdInfo.put("sample_SrcHospBarcode",itemClass); //条码类别 + reqSqdInfo.put("sample_UserCode",regApply.getUserCode()); + reqSqdInfo.put("sample_UserName",regApply.getUserName()); + + reqSqdInfo.put("detail_OrderItemCode",regApplyDetail.getOrderItemCode()); + reqSqdInfo.put("detail_OrderItemName",regApplyDetail.getOrderItemName()); + reqSqdInfo.put("detail_SrcOrderItemCode",regApplyDetail.getOrderItemCode()); + reqSqdInfo.put("detail_SrcOrderItemName",regApplyDetail.getOrderItemName()); + reqSqdInfo.put("detail_cost",regApplyDetail.getAmount()); + reqSqdInfo.put("detail_DataSource","1"); + reqSqdInfo.put("detail_applyid",regApply.getApplyid()); + reqSqdInfo.put("detail_applyDetailId",regApplyDetail.getUid()); + reqSqdInfoList.add(reqSqdInfo); + + } + + //排序 + reqSqdInfoList.sort(new Comparator>() { + @Override + public int compare(Map o1, Map o2) { + String itemClass1 = LisUtil.isBank(o1.get("sample_SrcHospBarcode").toString().trim()); + String itemClass2 = LisUtil.isBank(o2.get("sample_SrcHospBarcode").toString().trim()); + return itemClass1.compareTo(itemClass2); + } + }); + + String itemClassOne = "" ; + int xh = 0,k = -1; + String barcode = ""; + String jymd = ""; + RegTransitSample regTransitSample = null; + + for (Map stringObjectMap : reqSqdInfoList) { + String itemClass = LisUtil.isBank(stringObjectMap.get("sample_SrcHospBarcode")); + RegTransitSampleDetail regTransitSampleDetail = new RegTransitSampleDetail(); + if (itemClassOne.equals(itemClass)) { + xh++; + stringObjectMap.put("sample_Barcode", barcode); + stringObjectMap.put("detail_OrderItemSerial", xh); + jymd = LisUtil.isBank(stringObjectMap.get("detail_OrderItemName")); + regTransitSample.setCheckPUR(jymd); + regTransitSampleList.add(k, regTransitSample); + + //写条码明细表 + regTransitSampleDetail.setBarcode(barcode); + regTransitSampleDetail.setOrderItemSerial(new BigDecimal(xh)); + regTransitSampleDetail.setOrderItemCode(LisUtil.isBank(stringObjectMap.get("detail_OrderItemCode"))); + regTransitSampleDetail.setOrderItemName(LisUtil.isBank(stringObjectMap.get("detail_OrderItemName"))); + regTransitSampleDetail.setCost(new BigDecimal(stringObjectMap.get("detail_cost").toString())); + regTransitSampleDetail.setApplyid(LisUtil.isBank(stringObjectMap.get("detail_applyid"))); + regTransitSampleDetail.setApplyDetailId(String.valueOf(xh)); + regTransitSampleDetailList.add(regTransitSampleDetail); + continue; + } else { + xh = 1; + //条码号 + barcode = regApply.getSrcHospCode() + DateUtil.format(commonUtil.getCurrentTime(), "yyyyMMdd") + commonUtil.getNextSeq_pro("barcode", 4); + itemClassOne = itemClass; + } + + stringObjectMap.put("sample_Barcode", barcode); + stringObjectMap.put("detail_OrderItemSerial", xh); + + //写条码明细表 + regTransitSampleDetail.setBarcode(barcode); + regTransitSampleDetail.setOrderItemSerial(new BigDecimal(xh)); + regTransitSampleDetail.setOrderItemCode(LisUtil.isBank(stringObjectMap.get("detail_OrderItemCode"))); + regTransitSampleDetail.setOrderItemName(LisUtil.isBank(stringObjectMap.get("detail_OrderItemName"))); + regTransitSampleDetail.setCost(new BigDecimal(stringObjectMap.get("detail_cost").toString())); + regTransitSampleDetail.setApplyid(LisUtil.isBank(stringObjectMap.get("detail_applyid"))); + regTransitSampleDetail.setApplyDetailId(String.valueOf(xh)); + regTransitSampleDetailList.add(regTransitSampleDetail); + + jymd = stringObjectMap.get("detail_OrderItemName").toString(); + + //写条码主表 + regTransitSample = new RegTransitSample(); + k++; + regTransitSample.setPatId(LisUtil.isBank(stringObjectMap.get("sample_PatId"))); + regTransitSample.setPatCardType(LisUtil.isBank(stringObjectMap.get("sample_PatCardType"))); + regTransitSample.setPatCardNo(LisUtil.isBank(stringObjectMap.get("sample_PatCardNo"))); + regTransitSample.setPatType(LisUtil.isBank(stringObjectMap.get("sample_PatType"))); + regTransitSample.setRegNo(LisUtil.isBank(stringObjectMap.get("sample_RegNo"))); + regTransitSample.setPatName(LisUtil.isBank(stringObjectMap.get("sample_PatName"))); + regTransitSample.setPatSex(LisUtil.isBank(stringObjectMap.get("sample_PatSex"))); + regTransitSample.setPatAge(LisUtil.isBank(stringObjectMap.get("sample_PatAge"))); + regTransitSample.setAgeUnit(LisUtil.isBank(stringObjectMap.get("sample_AgeUnit"))); + regTransitSample.setPatAgeShow(LisUtil.isBank(stringObjectMap.get("sample_PatAgeShow"))); + regTransitSample.setPatBirthday(DateUtil.parse(LisUtil.isBank(stringObjectMap.get("sample_PatBirthday")), "yyyy-MM-dd HH:mm:ss")); + regTransitSample.setPatIdentity(LisUtil.isBank(stringObjectMap.get("sample_PatIdentity"))); + regTransitSample.setPhone(LisUtil.isBank(stringObjectMap.get("sample_Phone"))); + regTransitSample.setAddress(LisUtil.isBank(stringObjectMap.get("sample_Address"))); + regTransitSample.setPatFeeType(LisUtil.isBank(stringObjectMap.get("sample_PatFeeType"))); + regTransitSample.setDepartCode(LisUtil.isBank(stringObjectMap.get("sample_DepartCode"))); + regTransitSample.setDepartName(LisUtil.isBank(stringObjectMap.get("sample_DepartName"))); + regTransitSample.setAreaCode(LisUtil.isBank(stringObjectMap.get("sample_AreaCode"))); + regTransitSample.setAreaName(LisUtil.isBank(stringObjectMap.get("sample_AreaName"))); + regTransitSample.setPatBed(LisUtil.isBank(stringObjectMap.get("sample_PatBed"))); + regTransitSample.setDiagnosisCode(LisUtil.isBank(stringObjectMap.get("sample_DiagnosisCode"))); + regTransitSample.setOrderUserCode(LisUtil.isBank(stringObjectMap.get("sample_OrderUserCode"))); + regTransitSample.setOrderUserName(LisUtil.isBank(stringObjectMap.get("sample_OrderUserName"))); + regTransitSample.setOrderTime(DateUtil.parse(LisUtil.isBank(stringObjectMap.get("sample_OrderTime")), "yyyy-MM-dd HH:mm:ss")); + regTransitSample.setSrcHospCode(LisUtil.isBank(stringObjectMap.get("sample_SrcHospCode"))); + regTransitSample.setSrcHospName(LisUtil.isBank(stringObjectMap.get("sample_SrcHospName"))); + regTransitSample.setSampleTypeCode(LisUtil.isBank(stringObjectMap.get("sample_SampleTypeCode"))); + regTransitSample.setSampleTypeName(LisUtil.isBank(stringObjectMap.get("sample_SampleTypeName"))); + regTransitSample.setIsER(LisUtil.isBank(stringObjectMap.get("sample_IsER"))); + regTransitSample.setStatus(LisUtil.isBank(stringObjectMap.get("sample_Status"))); + regTransitSample.setSrcHospBarcode(LisUtil.isBank(stringObjectMap.get("sample_SrcHospBarcode"))); + regTransitSample.setBarcode(barcode); + regTransitSample.setCheckPUR(jymd); + regTransitSample.setCreate_by(LisUtil.isBank(stringObjectMap.get("sample_UserCode"))); + regTransitSample.setCreate_time(commonUtil.getCurrentTime()); + regTransitSampleList.add(regTransitSample); + } + + //保存数据 + applicationContext.getBean(RegRequestInfoServiceImpl.class).saveTransitSample(regTransitSampleList, regTransitSampleDetailList); + + + if(!ls_nopriceitems.equals("")){ + return new Result("-1","有如下项目未分类无法生成条码，请先分类："+ls_nopriceitems); + } + + return new Result("0","生成条码成功！"); + + + + } + + @Transactional(rollbackFor = Exception.class) + public void saveTransitSample(List regTransitSampleList, List regTransitSampleDetailList) { + for (RegTransitSample regTransitSample : regTransitSampleList) { + regTransitSampleMapper.addRegTransitSample(regTransitSample); + } + for (RegTransitSampleDetail regTransitSampleDetail : regTransitSampleDetailList) { + regTransitSampleMapper.addRegTransitSampleDetail(regTransitSampleDetail); + } + } + + + @Transactional(rollbackFor = Exception.class) + public void updateApply(RegApply regApply, List regApplyDetailList){ + regApplyMapper.delete(regApply.getApplyid()); + regApplyMapper.insert(regApply); + for (RegApplyDetail regApplyDetail : regApplyDetailList) { + regApplyDetailMapper.delete(regApplyDetail.getApplyid()); + regApplyDetailMapper.insert(regApplyDetail); + } + } + } diff --git a/pf_transitPF/src/main/resources/mapper/RegDictMapper.xml b/pf_transitPF/src/main/resources/mapper/RegDictMapper.xml index d9aba1b..d005496 100644 --- a/pf_transitPF/src/main/resources/mapper/RegDictMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegDictMapper.xml @@ -118,5 +118,9 @@ + + \ No newline at end of file diff --git a/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml b/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml index aa7bc11..0db1174 100644 --- a/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml @@ -14,8 +14,8 @@ select * from reg_apply_detail where applyid = #{applyId} - + select b.classid, a.* from reg_item a,reg_itemclass b where a.itemclass = b.itemclass_code and a.status = '0' \ No newline at end of file diff --git a/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml b/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml index 842bd04..7785e17 100644 --- a/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml @@ -204,6 +204,34 @@ update reg_TransitSample + PatId = #{PatId}, + PatCardType = #{PatCardType}, + PatCardNo = #{PatCardNo}, + PatType = #{PatType}, + PatName = #{PatName}, + PatSex = #{PatSex}, + PatAge = #{PatAge}, + AgeUnit = #{AgeUnit}, + PatAgeShow = #{PatAgeShow}, + PatBirthday = #{PatBirthday}, + PatIdentity = #{PatIdentity}, + Phone = #{Phone}, + Address = #{Address}, + PatFeeType = #{PatFeeType}, + DepartCode = #{DepartCode}, + DepartName = #{DepartName}, + AreaCode = #{AreaCode}, + AreaName = #{AreaName}, + PatBed = #{PatBed}, + DiagnosisCode = #{DiagnosisCode}, + DiagnosisName = #{DiagnosisName}, + OrderPatId = #{OrderPatId}, + OrderUserCode = #{OrderUserCode}, + OrderUserName = #{OrderUserName}, + OrderTime = #{OrderTime}, + SampleTypeCode = #{SampleTypeCode}, + SampleTypeName = #{SampleTypeName}, + RegNo = #{RegNo}, Status = #{Status}, BackReasons = #{BackReasons}, SignInTime = #{SignInTime},