src/main/java/com/syjiaer/clinic/server/common/config/ControllerAspect.java

@@ -35,13 +35,6 @@ public class ControllerAspect {
             result.setData(null);
             result.setCode(301);
             return result;
-        } catch (Exception e){
-            Result<Object> result = new Result<>();
-            result.setMessage("系统异常");
-            result.setData(null);
-            result.setCode(101);
-            e.printStackTrace();
-            return result;
         }
     }
 }

src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java

@@ -1,6 +1,5 @@
 package com.syjiaer.clinic.server.controller.social;
 
-import com.syjiaer.clinic.server.common.constants.Constants;
 import com.syjiaer.clinic.server.common.util.DictoryUtil;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
@@ -131,19 +130,7 @@ public class SocialDirectoryController extends BaseController {
 
 
     }
-    @RequestMapping("itemSearch")
+
-    public Result<Page<SocialItem>> itemSearch() {
-        String keyword = parmsUtil.getString("keyword","请输入搜索关键词");
-        Integer pageNum = parmsUtil.getInteger("pageNum");
-        Integer pageSize =  parmsUtil.getInteger("pageSize");
-        if (pageNum == null||pageNum <=0 ){
-            pageNum=1;
-        }
-        if (pageSize == null||pageSize <=0){
-            pageSize= Constants.DetailPageSize;
-        }
-        return success(socialItemService.pageList(pageNum,pageSize,keyword));
-    }
 
 
 

src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/GoodsRetailDto.java

@@ -107,7 +107,7 @@ public class GoodsRetailDto {
     @ApiModelProperty("到期预警天数")
     private Integer expiryWarnDays;
     @ApiModelProperty("选择的数量")
-    private Integer selectedNum;
+    private Integer selectNum;
     @ApiModelProperty("选择的单位")
     private String selectedUnit;
     @ApiModelProperty("选择的价格")

src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/ItemRetailDto.java

@@ -1,51 +0,0 @@
-package com.syjiaer.clinic.server.entity.diagnosis.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Getter
-@Setter
-public class ItemRetailDto {
-
-    @ApiModelProperty("自增主键")
-    private Integer id;
-
-    @ApiModelProperty("项目创建时间")
-    private LocalDateTime createDatetime;
-
-    @ApiModelProperty("项目创建人")
-    private String createBy;
-
-    @ApiModelProperty("项目修改时间")
-    private LocalDateTime updateDatetime;
-
-    @ApiModelProperty("项目修改人")
-    private String updateBy;
-
-    @ApiModelProperty("项目名称")
-    private String itemName;
-
-    @ApiModelProperty("项目医保目录编码")
-    private String itemSocialCode;
-
-    @ApiModelProperty("单位")
-    private String unit;
-
-    @ApiModelProperty("售价")
-    private BigDecimal unitPrice;
-
-    @ApiModelProperty("进货价")
-    private BigDecimal purchaseUnitPrice;
-
-    @ApiModelProperty("逻辑删除")
-    private Integer delFlag;
-
-    @ApiModelProperty("数量")
-    private Integer selectedNum;
-
-
-}

src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/MedicalRecordSaveDto.java

@@ -27,7 +27,7 @@ public class MedicalRecordSaveDto {
     @ApiModelProperty
     private DiagnosisMedicalRecord diagnosisMedicalRecord;
     @ApiModelProperty("服务项目列表")
-    private List<ItemRetailDto> itemList;
+    private List<Item> itemList;
     @ApiModelProperty("药品耗材列表")
     private List<GoodsRetailDto> goodsList;
 }

src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java

@@ -13,7 +13,6 @@ import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo;
 import com.syjiaer.clinic.server.entity.diagnosis.Diagnosis;
 import com.syjiaer.clinic.server.entity.diagnosis.dto.ChargeQueueQuery;
-import com.syjiaer.clinic.server.entity.diagnosis.dto.ItemRetailDto;
 import com.syjiaer.clinic.server.entity.goods.Goods;
 import com.syjiaer.clinic.server.entity.item.Item;
 import com.syjiaer.clinic.server.entity.manager.ManagerUser;
@@ -125,7 +124,7 @@ public class MedicalRecordService extends BaseService {
         Integer medicalRecordId = diagnosisMedicalRecord.getId();
         List<DiagnosisMedicalItemList> itemLists = new ArrayList<>();
 
-        for (ItemRetailDto item : saveDto.getItemList()) {
+        for (Item item : saveDto.getItemList()) {
             Item dbItem = itemMapper.selectById(item.getId());
             DiagnosisMedicalItemList itemDetail = new DiagnosisMedicalItemList();
             itemDetail.setDiagnosisCode(code);
@@ -134,10 +133,7 @@ public class MedicalRecordService extends BaseService {
             itemDetail.setSocialCode(dbItem.getItemSocialCode());
             itemDetail.setUnit(dbItem.getUnit());
             itemDetail.setUnitPrice(dbItem.getUnitPrice());
-            if (item.getSelectedNum() == null ||item.getSelectedNum() <= 0){
+            itemDetail.setNumber(1);
-                throw  new MessageException("["+item.getItemName()+"]数量为0");
-            }
-            itemDetail.setNumber(item.getSelectedNum());
             itemLists.add(itemDetail);
 
         }
@@ -153,10 +149,7 @@ public class MedicalRecordService extends BaseService {
             goodsDetail.setSocialCode(dbGoods.getHilistCode());
             goodsDetail.setUnit(goodsRetailDto.getSelectedUnit());
             goodsDetail.setUnitPrice(goodsRetailDto.getSelectedPrice());
-            goodsDetail.setNumber(goodsRetailDto.getSelectedNum());
+            goodsDetail.setNumber(goodsRetailDto.getSelectNum());
-            if (goodsRetailDto.getSelectedNum() == null ||goodsRetailDto.getSelectedNum() <= 0){
-                throw  new MessageException("["+goodsRetailDto.getName()+"]数量为0");
-            }
             goodsLists.add(goodsDetail);
         }
 

src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java

@@ -115,10 +115,7 @@ public class InventoryService extends BaseService {
     public List<Inventory> getListByGoodsId(int goodsId) {
         QueryWrapper<Inventory> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("good_id", goodsId);
-        queryWrapper.ne("whole_number",0);
-        queryWrapper.ne("fragment_number",0);
         queryWrapper.orderByDesc("create_datetime");
-
         return inventoryMapper.selectList(queryWrapper);
     }
 

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

@@ -287,11 +287,16 @@ public class PatientRegistrationService extends BaseService {
      */
     public void changeStatus(Integer regisId, Integer status) {
         RegistrationStatusEnum statusEnum = RegistrationStatusEnum.getByType(status);
-
+        if (statusEnum == null || statusEnum.equals(RegistrationStatusEnum.complete)){
+            throw new MessageException("状态不存在");
+        }
         PatientRegistration patientRegistration = patientRegistrationMapper.selectById(regisId);
         if (patientRegistration == null){
             throw new MessageException("挂号单不存在");
         }
+        if (statusEnum.equals(RegistrationStatusEnum.inProgress) && !patientRegistration.getStatus().equals(RegistrationStatusEnum.waiting.getType())){
+            throw new MessageException("初始状态不对");
+        }
         if (statusEnum.equals(RegistrationStatusEnum.waiting) && !patientRegistration.getStatus().equals(RegistrationStatusEnum.inProgress.getType())){
             throw new MessageException("初始状态不对");
         }

src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java

@@ -99,12 +99,4 @@ public class SocialItemService extends BaseService {
         return resultPage;
 
     }
-
-
-    public Page<SocialItem> pageList(Integer pageNum, Integer pageSize,String keyword) {
-        QueryWrapper<SocialItem> codeqw = new QueryWrapper<>();
-        codeqw.like("name", keyword);
-        codeqw.or().like("code", keyword);
-        return pageHelper(pageNum,  pageSize, codeqw, socialItemMapper, "id", false);
-    }
 }