六安版本接口与当前版本接口的程序区别(2025年7月到12月PacsController版本差异),如何通过git查看当时的版本 #29

Closed
opened 2025-12-09 23:11:26 +08:00 by bigtran · 4 comments
Owner

image.png
image.png
image.png
image.png

updateCheck
postXmlPatientInfo
getPacsPatientInfo

这几个方法都是新增的

![image.png](/attachments/831e8352-97d3-47ea-86bb-17772a534c48) ![image.png](/attachments/495e7a9b-46c0-4792-8562-8d24c701b7c7) ![image.png](/attachments/5e340a85-c92f-4be0-9e2b-d35fea0117b2) ![image.png](/attachments/8fd83cb8-7945-4c13-986e-789aa2e34875) updateCheck postXmlPatientInfo getPacsPatientInfo 这几个方法都是新增的
Author
Owner

image.png

![image.png](/attachments/8b45307b-7933-4f4c-bff2-2f5a655e76d4)
230 KiB
Author
Owner

image.png

![image.png](/attachments/e3945021-3f65-47e8-b337-dc35c90b813a)
454 KiB
Author
Owner

commit 479fc31dab8b04cd2fb452c644659c1ce3eab8e7
Author: bigtran bigtran@opmonitor.com
Date: Thu May 29 12:15:51 2025 +0800

fix 台州刷卡bug

diff --git a/app/controller/PacsController.php b/app/controller/PacsController.php
index 1ee21a5..f1fd66b 100644
--- a/app/controller/PacsController.php
+++ b/app/controller/PacsController.php
@@ -104,7 +104,7 @@ class PacsController
case '手工洗':
case '手工洗(晨洗)':
case '手工洗(加强)':

  •                    $sql_end_right = "select process_name from ect_actions where action_type !=0 and endoscope_name='".$data['endoscope_name']."' order by op_starttime desc limit 1;";
    
  •                    $sql_end_right = "select process_name from ect_actions where action_type !=0 and action_type !=7 and endoscope_name='".$data['endoscope_name']."' order by op_starttime desc limit 1;";
                       $end_right = sqlbig::get_var($sql_end_right);
    
                       echo $sql_end_right;
    

@@ -177,7 +177,7 @@ class PacsController
case '机洗':
case '机洗(晨洗)':
case '机洗(加强)':

  •                    $sql_end_right = "select process_name from ect_actions where action_type !=0 and endoscope_name='".$data['endoscope_name']."' order by op_starttime desc limit 1;";
    
  •                    $sql_end_right = "select process_name from ect_actions where action_type !=0 and action_type !=7 and endoscope_name='".$data['endoscope_name']."' order by op_starttime desc limit 1;";
                       $end_right = sqlbig::get_var($sql_end_right);
    
                       if($end_right=="结束"){
    

这个版本是对应当时部署的版本

commit 479fc31dab8b04cd2fb452c644659c1ce3eab8e7 Author: bigtran <bigtran@opmonitor.com> Date: Thu May 29 12:15:51 2025 +0800 fix 台州刷卡bug diff --git a/app/controller/PacsController.php b/app/controller/PacsController.php index 1ee21a5..f1fd66b 100644 --- a/app/controller/PacsController.php +++ b/app/controller/PacsController.php @@ -104,7 +104,7 @@ class PacsController case '手工洗': case '手工洗(晨洗)': case '手工洗(加强)': - $sql_end_right = "select process_name from ect_actions where action_type !=0 and endoscope_name='".$data['endoscope_name']."' order by op_starttime desc limit 1;"; + $sql_end_right = "select process_name from ect_actions where action_type !=0 and action_type !=7 and endoscope_name='".$data['endoscope_name']."' order by op_starttime desc limit 1;"; $end_right = sqlbig::get_var($sql_end_right); echo $sql_end_right; @@ -177,7 +177,7 @@ class PacsController case '机洗': case '机洗(晨洗)': case '机洗(加强)': - $sql_end_right = "select process_name from ect_actions where action_type !=0 and endoscope_name='".$data['endoscope_name']."' order by op_starttime desc limit 1;"; + $sql_end_right = "select process_name from ect_actions where action_type !=0 and action_type !=7 and endoscope_name='".$data['endoscope_name']."' order by op_starttime desc limit 1;"; $end_right = sqlbig::get_var($sql_end_right); if($end_right=="结束"){ 这个版本是对应当时部署的版本
Author
Owner

查看历史修改内容

git log -p --follow -- app/controller/PacsController.php

获取当时推送的版本

git show 479fc31dab8b04cd2fb452c644659c1ce3eab8e7:app/controller/PacsController.php > PacsController_479fc31.php

# 查看历史修改内容 git log -p --follow -- app/controller/PacsController.php # 获取当时推送的版本 git show 479fc31dab8b04cd2fb452c644659c1ce3eab8e7:app/controller/PacsController.php > PacsController_479fc31.php
bigtran changed title from 六安版本接口与当前版本接口的程序区别(2025年7月到12月PacsController版本差异) to 六安版本接口与当前版本接口的程序区别(2025年7月到12月PacsController版本差异),如何通过git查看当时的版本 2025-12-09 23:50:27 +08:00
Sign in to join this conversation.