Browse Source

Merge branch 'master' of https://172.16.32.165/lighter/web-server

lighter 3 năm trước cách đây
mục cha
commit
a343289ff8

+ 2 - 2
src/main/java/thyyxxk/webserver/controller/jiekou/DuiWaiJieKouController.java

@@ -11,8 +11,8 @@ import thyyxxk.webserver.config.auth.PassToken;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.datamodify.MzChargeDetail;
+import thyyxxk.webserver.entity.jiekou.GetPatientInformationParam;
 import thyyxxk.webserver.entity.jiekou.PatientInformation;
-import thyyxxk.webserver.entity.jiekou.getPatientInformationParam;
 import thyyxxk.webserver.entity.login.UserInfo;
 import thyyxxk.webserver.service.PublicServer;
 import thyyxxk.webserver.service.jiekou.DuiWaiJieKouService;
@@ -50,7 +50,7 @@ public class DuiWaiJieKouController {
 
     @PassToken
     @PostMapping("/getPatientInformation")
-    public ResultVo<List<PatientInformation>> getPatientInformation(@RequestBody getPatientInformationParam param) {
+    public ResultVo<List<PatientInformation>> getPatientInformation(@RequestBody GetPatientInformationParam param) {
         return service.getPatientInformation(param);
     }
 

+ 4 - 4
src/main/java/thyyxxk/webserver/dao/his/yibao/XiangMuLuRuDao.java

@@ -31,7 +31,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "       dept_code = (select name from zd_unit_code where code = a.ward_code) ,  " +
             "       self_flag=isnull(a.self_flag,0), suppress_flag=a.suppress_flag, group_no='00',  " +
             "       separate_flag=a.separate_flag, ope_flag=a.ope_flag, drugname=c.name, isnull(a.ori_detail_sn,0) ori_detail_sn  " +
-            "    FROM  (select top ${pageSize} * from (select ROW_NUMBER() OVER (order by charge_date ) as RowNumber,* from zy_detail_charge a " +
+            "    FROM  (select top ${pageSize} * from (select ROW_NUMBER() OVER (order by charge_date ${riQiPaiXu} ) as RowNumber,* from zy_detail_charge a " +
             "where  a.charge_code  " +
             "like 'BILL%' and a.ledger_sn = #{ledgerSn}  and trans_flag_yb &lt;&gt; 2 and a.order_no &lt;&gt; 6 and inpatient_no = #{inpatientNo}  " +
             "and admiss_times = #{admissTimes} and a.infant_flag = #{infantFlag} " +
@@ -59,7 +59,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "<if test=\"tuiFeiFlag != null and tuiFeiFlag == 2  \">" +
             "and (ori_detail_sn = -1 )" +
             "</if>" +
-            ") temp where RowNumber > ${pageSize} * (${currentPage} - 1 ) order by charge_date ${riQiPaiXu} ) a  " +
+            ") temp where RowNumber > ${pageSize} * (${currentPage} - 1 )) a  " +
             "        left join zd_charge_item b on (a.charge_code = b.code)  " +
             "        left join  yp_zd_dict c on (a.serial = c.serial and c.code= a.charge_code_mx)  " +
             "        left join a_employee_mi d on (d.code = a.op_id_code)  " +
@@ -151,7 +151,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "                   ope_flag=a.ope_flag,    " +
             "                   drugname=b.name,    " +
             "                   isnull(a.ori_detail_sn,0) ori_detail_sn    " +
-            "                   FROM  (select top ${pageSize} * from (select ROW_NUMBER() OVER (order by charge_date ) as RowNumber,*  from zy_detail_charge where inpatient_no= #{inpatientNo} and " +
+            "                   FROM  (select top ${pageSize} * from (select ROW_NUMBER() OVER (order by charge_date ${riQiPaiXu} ) as RowNumber,*  from zy_detail_charge where inpatient_no= #{inpatientNo} and " +
             "admiss_times= #{admissTimes}  and ledger_sn = #{ledgerSn} and infant_flag = #{infantFlag} and   trans_flag_yb &lt;&gt; 2 AND charge_code not like 'BILL%' and  order_no &lt;&gt; 6" +
             "<if test=\"chargeCode != null and chargeCode != '' \">" +
             "and charge_code_mx = #{chargeCode} " +
@@ -177,7 +177,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "<if test=\"tuiFeiFlag != null and tuiFeiFlag == 2  \">" +
             "and (ori_detail_sn = -1 )" +
             "</if>" +
-            ") temp where RowNumber > ${pageSize} * (${currentPage}-1) order by charge_date ${riQiPaiXu})  a " +
+            ") temp where RowNumber > ${pageSize} * (${currentPage}-1) )  a " +
             "  left join  zd_charge_item b on (a.charge_code=b.code) " +
             "  left join a_employee_mi c on (c.code = a.op_id_code)" +
             "</script>")

+ 3 - 2
src/main/java/thyyxxk/webserver/entity/datamodify/MzChargeDetail.java

@@ -544,15 +544,16 @@ public class MzChargeDetail implements Serializable {
     private BigDecimal je;
     private String execDeptName;
     private String confirmIdName;
+
     private Integer xiangMuZhuangTai;
 
 
     private List<MzChargeDetail> list;
 
     private List<Integer> reqNos;
-    
+
     /**
-     * 来源
+     * 来源 对外接口时 使用
      */
     private String source;
 }

+ 1 - 1
src/main/java/thyyxxk/webserver/entity/jiekou/getPatientInformationParam.java → src/main/java/thyyxxk/webserver/entity/jiekou/GetPatientInformationParam.java

@@ -11,7 +11,7 @@ import lombok.Data;
  * @date 2021-07-13 08:12
  */
 @Data
-public class getPatientInformationParam {
+public class GetPatientInformationParam {
     private String source;
     private Integer flag;
     private String patient;

+ 2 - 2
src/main/java/thyyxxk/webserver/service/jiekou/DuiWaiJieKouService.java

@@ -5,8 +5,8 @@ import org.springframework.stereotype.Service;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.dao.his.jiekou.DuiWaiJieKouDao;
 import thyyxxk.webserver.entity.ResultVo;
+import thyyxxk.webserver.entity.jiekou.GetPatientInformationParam;
 import thyyxxk.webserver.entity.jiekou.PatientInformation;
-import thyyxxk.webserver.entity.jiekou.getPatientInformationParam;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.StringUtil;
 
@@ -31,7 +31,7 @@ public class DuiWaiJieKouService {
         this.dao = dao;
     }
 
-    public ResultVo<List<PatientInformation>> getPatientInformation(getPatientInformationParam param) {
+    public ResultVo<List<PatientInformation>> getPatientInformation(GetPatientInformationParam param) {
         log.info("查询:{}", param);
         if (StringUtil.notBlank(param.getSource()) && param.getSource().equals("SZBY")) {
             List<PatientInformation> list = new ArrayList<>();

+ 1 - 2
src/main/java/thyyxxk/webserver/service/zhuyuanyiji/QueRenYiZhuShouFeiServer.java

@@ -52,12 +52,11 @@ public class QueRenYiZhuShouFeiServer {
      */
     public ResultVo<IPage<YzActOrder>> getXuQueFeiYiZhu(YzActOrder yzActOrder) {
         IPage<YzActOrder> page = new Page<>(yzActOrder.getCurrentPage(), yzActOrder.getPageSize(), false);
-
         List<String> execUnitList = publicServer.getKeShiLieBiaoList(yzActOrder.getExecUnit());
         if (StringUtil.isBlank(yzActOrder.getExecUnit())) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "科室信息为空 [・_・?]");
         }
-
+        // 查看历史 等于 3 就是查看 没有被确认的 不等于 3 就是查看历史
         String liShi = "=";
 
         if (yzActOrder.getLiShi() == 1) {