From c2b8f4bf2eb62370a0ba2ed87797da31c6c49fac Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sun, 4 Aug 2024 10:35:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=84=E6=96=B9=E5=88=86=E9=85=8D?= =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicSkPrescribeController.java | 14 ++++++++++++-- .../api/req/basic/PrescribeBindWorkRequest.java | 13 +++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/basic/PrescribeBindWorkRequest.java diff --git a/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java b/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java index b5d22adb1..84ba089c8 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java @@ -45,7 +45,6 @@ public class BasicSkPrescribeController extends BaseController { @Resource BasicSkPrescribeItemService basicSkPrescribeItemService; - @GetMapping("/udiwms/basic/sk/prescribe/filter") public BaseResponse filterSicker(BasicSkPrescribeRequest basicSkPrescribeRequest) { List basicSkPrescribeResponses = basicSkPrescribeService.filterList(basicSkPrescribeRequest); @@ -94,7 +93,7 @@ public class BasicSkPrescribeController extends BaseController { @PostMapping("/udiwms/basic/sk/prescribe/deleteDataByCode") public BaseResponse deleteDataByCode(@RequestBody GetSickPrescribeRequest getSickPrescribeRequest, BindingResult bindingResult) { String code = getSickPrescribeRequest.getCode(); - if (StrUtil.isBlank(code)){ + if (StrUtil.isBlank(code)) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } basicSkPrescribeService.removeById(code); @@ -112,4 +111,15 @@ public class BasicSkPrescribeController extends BaseController { basicSkPrescribeService.saveOrUpdateBatch(list); return ResultVOUtils.success(); } + + + @PostMapping("/udiwms/basic/sk/prescribe/bindWork") + public BaseResponse bindWork(@RequestBody PrescribeBindWorkRequest bindWorkRequest, BindingResult bindingResult) { + + for (BasicSkPrescribeEntity prescribe : bindWorkRequest.getPrescribeList()) { + prescribe.setWorkPlaceCode(bindWorkRequest.getWorkplaceCode()); + } + basicSkPrescribeService.updateBatchById(bindWorkRequest.getPrescribeList()); + return ResultVOUtils.success("绑定成功"); + } } diff --git a/src/main/java/com/glxp/api/req/basic/PrescribeBindWorkRequest.java b/src/main/java/com/glxp/api/req/basic/PrescribeBindWorkRequest.java new file mode 100644 index 000000000..1b2b50378 --- /dev/null +++ b/src/main/java/com/glxp/api/req/basic/PrescribeBindWorkRequest.java @@ -0,0 +1,13 @@ +package com.glxp.api.req.basic; + +import com.glxp.api.entity.basic.BasicSkPrescribeEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class PrescribeBindWorkRequest { + + List prescribeList; + String workplaceCode; +} From 274aefa91198524f1c1f73f4955c7079fed80c8c Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 6 Aug 2024 13:59:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=84=E6=96=B9=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/BasicSkPrescribeController.java | 2 +- .../glxp/api/controller/inout/IoSplitController.java | 2 +- .../glxp/api/entity/basic/BasicSkPrescribeEntity.java | 5 ++--- .../glxp/api/res/basic/BasicSkPrescribeResponse.java | 2 ++ .../glxp/api/res/inout/IoSplitCodeDetailResponse.java | 10 ++++++++++ .../api/service/basic/BasicSkPrescribeService.java | 8 ++++++++ src/main/resources/schemas/schema_v2.4.sql | 7 +++++++ 7 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java b/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java index 84ba089c8..da1cc9861 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java @@ -60,7 +60,7 @@ public class BasicSkPrescribeController extends BaseController { if (StrUtil.isBlank(prescribeCode)) { return ResultVOUtils.error(500, "缺少请求标识"); } - BasicSkPrescribeEntity prescribe = basicSkPrescribeService.getById(prescribeCode); + BasicSkPrescribeEntity prescribe = basicSkPrescribeService.getByCode(prescribeCode); if (prescribe == null) { return ResultVOUtils.error(500, "未找到处方"); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java index e2872dd69..f79816fe2 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java @@ -77,7 +77,7 @@ public class IoSplitController extends BaseController { */ @GetMapping("/udiwms/ioSplit/material/tagCode/filter") public BaseResponse filterByTagCode(IoSplitDetailCodeRequest splitDetailCodeRequest, - BindingResult bindingResult) { + BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeEntity.java index 5f3687ce5..a19970b6e 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeEntity.java @@ -28,12 +28,11 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @TableName(value = "basic_sk_prescribe") public class BasicSkPrescribeEntity { - - + @TableId(value = "id", type = IdType.AUTO) + private Integer id; /** * 处方编码 */ - @TableId(value = "code") @ApiModelProperty(value = "处方编码") private String code; diff --git a/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java index d443379d8..c1e38b7f0 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java @@ -12,6 +12,8 @@ import java.util.List; @Data public class BasicSkPrescribeResponse { + + private Integer id; /** * 处方编码 */ diff --git a/src/main/java/com/glxp/api/res/inout/IoSplitCodeDetailResponse.java b/src/main/java/com/glxp/api/res/inout/IoSplitCodeDetailResponse.java index bc4518c29..b71f0c301 100644 --- a/src/main/java/com/glxp/api/res/inout/IoSplitCodeDetailResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoSplitCodeDetailResponse.java @@ -84,4 +84,14 @@ public class IoSplitCodeDetailResponse { private String price; private String amount; private String ggxh; + + + /** + * 扫码数量 + */ + private Integer scanCount; + /** + * 扫码实际数量 + */ + private Integer scanRelCount; } diff --git a/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java index 146d9db33..fc47d47c4 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java @@ -3,6 +3,7 @@ package com.glxp.api.service.basic; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; @@ -40,6 +41,13 @@ public class BasicSkPrescribeService extends ServiceImpl().eq(BasicSkPrescribeEntity::getCode, code).last("limit 1")); + } public List filterList(BasicSkPrescribeRequest basicSkPrescribeRequest) { if (basicSkPrescribeRequest == null) { diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index e2fa3b3b3..ea233b33b 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4123,3 +4123,10 @@ CALL Pro_Temp_ColumnWork('basic_sk_prescribe_item_detail', 'tagStatus', CALL Pro_Temp_ColumnWork('basic_sk_prescribe_item_detail', 'tagMsg', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''处方赋码错误信息''', 1); + + +CALL Pro_Temp_ColumnWork('basic_sk_prescribe', 'id', + 'int NOT NULL AUTO_INCREMENT', + 1); + +