develop/lyx_20241225_zycfdp

1.住院医嘱点评调整：只查询出院患者、增加医嘱类型、同组号、停止医嘱时间、皮试结果

WEB-INF/conf/sysds_his_mzsf.xml

@@ -2726,7 +2726,8 @@ where JGID=?  and jzlx=? and (cxzt='1' and OLD_SETL_ID is not null)  order by zd
                 WHERE a.jzlx='Z'  and b.YZSHZT=1 and a.JGID=? 
                 and (YZLX='0' or YZLX='1') 
                 and (b.yzlb='01' or b.yzlb='02' or b.yzlb='03')
-                and a.JJRQ between ? and ?
+                and a.CYRQ between ? and ?
+                and a.JZZT='C'
                 #select#
                 order by a.isjz desc,a.ZYNO,a.JJRQ desc) where nvl(yzjzpkey,0) != 0
          ]]></sql>

WEB-INF/src/com/his/mz/cfdp/manage/ZyCfdpWindow.xml

@@ -192,6 +192,8 @@
 											            <DxDataGrid ds="zysfHzYzInfoCFDPDao" id="dbgrid2" showfoot="true" size="100,100" unit="%,%">
 												                <column   calc="true" fieldname="no"  cellcolor="true" type="SERIALNUMBER_CELL" align="center" width="30">序号</column>
 												                <column   sort="false" fieldname="CFH" cellcolor="true" type="LABEL_CELL"  align="center"  width="125">处方</column>
+												                <column   fieldname="YZCL"  cellcolor="true"  align="center"   width="40"   type="DICTIONARYLABEL_CELL"  mapjson="{1:长,2:临,3:出院带药}"   >长临</column>  
+												                <column   fieldname="YZTZH"  cellcolor="true"  align="center"  width="100">医嘱同组号</column> 
 												                <column   fieldname="yzxpkey"  cellcolor="true"  align="center"  width="100">医嘱编码</column> 
 												                <column   calc="true" fieldname="yzxshow"  cellcolor="true" type="HTMLDISPLAY_CELL"    width="550">医嘱</column>
 												                <column   sort="false" fieldname="YZDJ" cellcolor="true" type="LABEL_CELL"   align="right"    width="60">单价</column>
@@ -199,9 +201,11 @@
 												                <column   sort="false" fieldname="YZDW" cellcolor="true" type="DICTIONARYLABEL_CELL" cellenabled="true" beginpop="false" popbutton="true" onlyoneautoset="false" inputautoinvalue="false" chinese="true" typewriting="true" showdetail="false" instantsearch="true"    names="编码,名称" values="BH,MC" lds="MC:BH@dwyppopdao" dic="MC:BH@dwdicdao"  align="center" width="65">数量单位</column>
 												                <column   sort="false" fieldname="YZJE"  cellcolor="true"   align="right" footexp1="$sum(YZJE)"  width="80">金额</column>
 												                <column   fieldname="YZBZ"  cellcolor="true"   width="100">医嘱备注</column>  
+												                <column   fieldname="PSJG"  cellcolor="true"  align="center"  width="100" type="DICTIONARYLABEL_CELL"   dic="MC:BH@psjgdic">皮试结果</column>  
 												                <column   fieldname="ISGJJBYW"  cellcolor="true"  align="center"   width="40"   type="DICTIONARYLABEL_CELL"  mapjson="{1:是,0:否}"   >基药</column>  
 												                <column   fieldname="ISKJY"  cellcolor="true"  align="center"   width="40" type="DICTIONARYLABEL_CELL"  mapjson="{1:是,0:否}"  >抗生素</column>  
 												                <column   fieldname="YZXZSJ"  cellcolor="true"  align="center"  width="100"  type="DATETIMESHOW_CELL" datetimetype="datetime"   >开嘱时间</column>  
+												                <column   fieldname="YZTZSJ"  cellcolor="true"  align="center"  width="100"  type="DATETIMESHOW_CELL" datetimetype="datetime"   >停嘱时间</column>  
 												                <column   fieldname="YZXZKS"  cellcolor="true"  align="center"  width="100" type="DICTIONARYLABEL_CELL"   dic="DPTNAME:DPTID@ksdic">开单科室</column>  
 												                <column   fieldname="YZXZYS"  cellcolor="true"  align="center"  width="100" type="DICTIONARYLABEL_CELL"   dic="NAME:USERACCOUNT@jgrydicdao">开单医生</column>  
 											            </DxDataGrid>			

release/20241225_1153.text

@@ -57,6 +57,9 @@ develop/lyx_20241225_zfjsd
 ...........................................................................................................................................
 
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+develop/lyx_20241225_zycfdp
+
+1.住院医嘱点评调整：只查询出院患者、增加医嘱类型、同组号、停止医嘱时间、皮试结果
 ...........................................................................................................................................
 
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<