项目录入

src/main/java/thyyxxk/webserver/controller/inpatient/XiangMuLuRuController.java

@@ -6,16 +6,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import thyyxxk.webserver.aop.interfaces.NeedYbCode;
-import thyyxxk.webserver.aop.interfaces.NoNeedRule;
 import thyyxxk.webserver.config.auth.PassToken;
-import thyyxxk.webserver.config.exception.BizException;
-import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
 import thyyxxk.webserver.entity.datamodify.ZyDetailCharge;
 import thyyxxk.webserver.entity.inpatient.ZyActpatient;
 import thyyxxk.webserver.service.inpatient.XiangMuLuRuService;
-import thyyxxk.webserver.utils.ResultVoUtil;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;

src/main/java/thyyxxk/webserver/dao/his/inpatient/XiangMuLuRuDao.java

@@ -458,10 +458,10 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "                    when '1' then 'i'\n" +
             "                    else\n" +
             "                        (case\n" +
-            "                             when code &gt;= '30000' and code &lt; '50000' then 'j'\n" +
-            "                             else 'd' end) end\n" +
+            "                             when code &gt;= '30000' and code &lt; '50000' then 'd'\n" +
+            "                             else 'j' end) end\n" +
             "         from yp_zd_dict\n" +
-            "         where rtrim(code) + rtrim(serial) = '${item.chargeCodeMx} + ${item.serial}'), #{item.detailSn}, getdate(), 0, #{item.serial}, #{groupNo},\n" +
+            "         where rtrim(code) + rtrim(serial) = '${item.chargeCodeMx}${item.serial}'), #{item.detailSn}, getdate(), 0, #{item.serial}, #{groupNo},\n" +
             "        #{item.doctorCode}, #{pageNo}, null,#{ledgerSn})" +
             "</foreach>" +
             "</script>")

src/main/java/thyyxxk/webserver/service/inpatient/XiangMuLuRuService.java

@@ -185,6 +185,7 @@ public class XiangMuLuRuService {
                 maxDetailSn = setRefund(xiangMu, tuiFeiList, updateItemTags, maxDetailSn, item);
             } else {
                 if (item.getOrderNo().equals(new BigDecimal(3))) {
+                    // todo 口服药不能退
                     if (!zhiXinKeShi.contains(item.getExecUnit())) {
                         return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号：【%s】，此药品为医技科室录入，请对应的医技科室退费。", item.getDetailSn()));
                     } else {