DESKTOP-0GD05B0\Administrator 2 éve
szülő
commit
5d7106173b

+ 5 - 5
src/main/java/thyyxxk/webserver/dao/his/api/forpowersi/drgdip/DrgDipDao.java

@@ -300,7 +300,7 @@ public interface DrgDipDao {
             "dagnsWayId=1,icd_text as diseaseName, " +
             "icd_code from zy_in_diag_yb " +
             "where inpatient_no=#{patNo} and admiss_times=#{times} " +
-            "order by diag_no" )
+            "order by diag_no")
     List<HisPatientDagns> selectHisPatientAdmDagns(String patNo, int times);
 
     @Select("select " +
@@ -494,10 +494,10 @@ public interface DrgDipDao {
 
     @Select("select oprn_oprt_type,oprn_oprt_name,oprn_oprt_code,anst_way, " +
             "oper_dr_code,oper_dr_name,anst_dr_code,anst_dr_name," +
-            "oprnOprtBegntime=convert(varchar(19), oprn_oprt_begntime, 21), " +
-            "oprnOprtEndtime=convert(varchar(19), oprn_oprt_endtime, 21), " +
-            "anstBegntime=convert(varchar(19), anst_begntime, 21), " +
-            "anstEndtime=convert(varchar(19), anst_endtime, 21), " +
+            "oprnOprtBegntime=convert(varchar(19), isnull(oprn_oprt_begntime,oprn_oprt_date), 21), " +
+            "oprnOprtEndtime=convert(varchar(19),isnull(oprn_oprt_endtime,oprn_oprt_date) , 21), " +
+            "anstBegntime=convert(varchar(19),isnull(anst_begntime,oprn_oprt_date) , 21), " +
+            "anstEndtime=convert(varchar(19), isnull(anst_endtime,oprn_oprt_date) , 21), " +
             "'${visitId}' as visit_id, " +
             "subscript as sort_no," +
             "oprt_date=convert(varchar(19), oprn_oprt_begntime, 21) " +