From 404fa9ff4331d6bb5037dbec466022fade5e82bc Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期三, 18 十二月 2024 18:11:46 +0800 Subject: [PATCH] zjh202412018 --- ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java | 85 ++++++++-------- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 10 +- ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java | 11 ++ ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 4 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 2 ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java | 11 ++ ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 62 +++++++----- ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHybgd.java | 10 ++ ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHysqd.java | 11 ++ ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 69 +++++++++++-- ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java | 2 11 files changed, 188 insertions(+), 89 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java index 11b12db..8a4043e 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java @@ -96,22 +96,27 @@ List<String> jc = orderService.getDingShiTongBuJianChaTjNum(); + if(null !=jy && !jy.isEmpty()){ + log.info("鍚屾妫�楠屼汉鍛� 鎵ц鏁伴噺->{}", jy.size()); for (String s : jy) { - TjOrder order = orderService.getOrderByTjNum(s); - extractedjianyan(s,order); +// TjOrder order = orderService.getOrderByTjNum(s); + extractedjianyan(s); } } + if(null !=jc && !jc.isEmpty()){ + log.info("鍚屾妫�鏌ヤ汉鍛� 鎵ц鏁伴噺->{}", jc.size()); for (String s : jc) { - TjOrder order = orderService.getOrderByTjNum(s); - extractedjiancha(s,order); +// TjOrder order = orderService.getOrderByTjNum(s); + extractedjiancha(s); } } Map<String,Object> map=new HashMap<>(); testMapper.tjplUpdateDetatilByVi(map); Integer object = (Integer) map.get("total"); + log.info("鎵ц瀛樺偍杩囩▼鍚庡嚭鍙�->{}",object); if(null !=object && object.equals(1)){ long end = System.currentTimeMillis(); log.info("鍚屾缁撴潫 鑰楁椂锛歿}绉�", (end - start) / 1000); @@ -123,6 +128,7 @@ } } } catch (Exception e) { + log.error("瀹氭椂鍣ㄦ墽琛屾姤閿�"); e.printStackTrace(); } finally { scheduleNextTask(Long.parseLong(dsrwsjjg)); @@ -130,50 +136,47 @@ } } - private void extractedjianyan(String s,TjOrder order) { - List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber()); - if(null != hysqdList && !hysqdList.isEmpty()){ - for (LtkjHysqd hysqd : hysqdList) { - LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(),hysqd.getTmh()); - if (null != jybgid) { - ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(hysqd.getTjh(),hysqd.getTmh()); - ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(hysqd.getTmh()); + private void extractedjianyan(String s) { + try { + List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s); + if(null != hysqdList && !hysqdList.isEmpty()){ + for (LtkjHysqd hysqd : hysqdList) { + LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(),hysqd.getTmh()); + if (null != jybgid) { + ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(hysqd.getTjh(),hysqd.getTmh()); + ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(hysqd.getTmh()); + } + if (ltkjHysqdService.save(hysqd)) { + List<LtkjHybgd> hybgdList = testMapper.getCcXZxYyLtkjHybgdByLisVi(hysqd.getTmh()); + ltkjHybgdService.saveBatch(hybgdList); + } } - if (ltkjHysqdService.save(hysqd)) { - List<LtkjHybgd> hybgdList = testMapper.getCcXZxYyLtkjHybgdByLisVi(hysqd.getTmh()); - ltkjHybgdService.saveBatch(hybgdList); - } + DynamicDataSourceContextHolder.clearDataSourceType(); } - DynamicDataSourceContextHolder.clearDataSourceType(); + } catch (Exception e) { + log.info("鍚屾妫�楠屾暟鎹け璐�"); + throw new RuntimeException(e); } -// String tjNumber1 = order.getTjNumber(); -// log.info("鏌ヨ鍑烘潵鐨勪綋妫�鍙锋槸: " + tjNumber1); -// log.info("浼犺繃鏉ョ殑鐨勪綋妫�鍙锋槸: "+ s); -// Map<String,Object> map=new HashMap<>(); -// map.put("tjnum", s); -// testMapper.tjUpdateDetatilByVi(map); -// asyncService.tjUpdateDetatilByVi(s); -// log.info("瀹氭椂浠诲姟瀛樺偍杩囩▼宸叉墽琛�!!!"); } - private void extractedjiancha(String s,TjOrder order) { + private void extractedjiancha(String s) { - List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(order.getTjNumber()); - if(null !=jcsqdList && !jcsqdList.isEmpty()){ - jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId()); - jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId()); - jcsqdService.saveBatch(jcsqdList); - List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(order.getCardId()); - if(null != jcbgdList && !jcbgdList.isEmpty())jcbgdService.saveBatch(jcbgdList); - DynamicDataSourceContextHolder.clearDataSourceType(); + try { + List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s); + if(null !=jcsqdList && !jcsqdList.isEmpty()){ + DynamicDataSourceContextHolder.clearDataSourceType(); + jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s); + jcbgdService.deletedLtkjJcbgdByTjhAndTmh(s); + jcsqdService.saveBatch(jcsqdList); + List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s); + DynamicDataSourceContextHolder.clearDataSourceType(); + if(null != jcbgdList && !jcbgdList.isEmpty())jcbgdService.saveBatch(jcbgdList); + DynamicDataSourceContextHolder.clearDataSourceType(); + } + } catch (Exception e) { + log.info("鍚屾妫�鏌ユ暟鎹け璐�"); + throw new RuntimeException(e); } -// String tjNumber1 = order.getTjNumber(); -// log.info("鏌ヨ鍑烘潵鐨勪綋妫�鍙锋槸: " + tjNumber1); -// log.info("浼犺繃鏉ョ殑鐨勪綋妫�鍙锋槸: "+ s); -// Map<String,Object> map=new HashMap<>(); -// map.put("tjnum", s); -// testMapper.tjUpdateDetatilByVi(map); -// log.info("瀹氭椂浠诲姟瀛樺偍杩囩▼宸叉墽琛�!!!"); } } diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java index bd296ab..8b4b1ff 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java @@ -128,43 +128,51 @@ @ApiOperation (value = "娴嬭瘯璋冪敤瀛樺偍杩囩▼鑰楁椂鎺ュ彛") @RepeatSubmit // @Transactional - public AjaxResult ceshicc(String s) { + public AjaxResult ceshicc() { - Map<String,Object> map=new HashMap<>(); - List<List<?>> tjpled = testMapper.tjplUpdateDetatilByVi(map); - log.info(tjpled.toString()); - Integer object = (Integer) map.get("total"); - return AjaxResult.success(object); + List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd1("8003241206085556"); + if(null !=jcsqdList && !jcsqdList.isEmpty()){ + jcsqdService.deletedLtkjJcsqdByTjhAndTmh("8003241206085556"); + jcbgdService.deletedLtkjJcbgdByTjhAndTmh("8003241206085556"); + jcsqdService.saveBatch(jcsqdList); + List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd1("8003241206085556"); + if(null != jcbgdList && !jcbgdList.isEmpty())jcbgdService.saveBatch(jcbgdList); + DynamicDataSourceContextHolder.clearDataSourceType(); + } + return AjaxResult.success(); } - @GetMapping ("/ceshi") - @ApiOperation (value = "娴嬭瘯璋冪敤lis瑙嗗浘鏁版嵁鎺ュ彛") - @RepeatSubmit -// @Transactional - public AjaxResult ceshi() { - List<Map<String, Object>> ccXZxYyLisJgSt = testMapper.getCcXZxYyLisJgSt(); - return AjaxResult.success(ccXZxYyLisJgSt); - } +// @GetMapping ("/ceshi") +// @ApiOperation (value = "娴嬭瘯璋冪敤lis瑙嗗浘鏁版嵁鎺ュ彛") +// @RepeatSubmit +//// @Transactional +// public AjaxResult ceshi() { +// List<Map<String, Object>> ccXZxYyLisJgSt = testMapper.getCcXZxYyLisJgSt(); +// return AjaxResult.success(ccXZxYyLisJgSt); +// } - @GetMapping ("/pacs") - @ApiOperation (value = "娴嬭瘯璋冪敤pacs瑙嗗浘鏁版嵁鎺ュ彛") - @RepeatSubmit - public AjaxResult pacs() { - List<Map<String, Object>> ccXZxYyPacsJgSt = testMapper.getCcXZxYyPacsJgSt(); +// @GetMapping ("/pacs") +// @ApiOperation (value = "娴嬭瘯璋冪敤pacs瑙嗗浘鏁版嵁鎺ュ彛") +// @RepeatSubmit +// public AjaxResult pacs() { +// List<Map<String, Object>> ccXZxYyPacsJgSt = testMapper.getCcXZxYyPacsJgSt(); +// +// List<LtkjExamJcsqd> list = testMapper.getCcXZxYyPacsLtkjExamJcsqd(""); +// +// log.info(list.toString()); +// +// List<LtkjExamJcbgd> list1 = testMapper.getCcXZxYyPacsLtkjExamJcbgd(""); +// +// log.info(list1.toString()); +// +// return AjaxResult.success(ccXZxYyPacsJgSt); +// } - List<LtkjExamJcsqd> list = testMapper.getCcXZxYyPacsLtkjExamJcsqd(""); - log.info(list.toString()); - List<LtkjExamJcbgd> list1 = testMapper.getCcXZxYyPacsLtkjExamJcbgd(""); - - log.info(list1.toString()); - - return AjaxResult.success(ccXZxYyPacsJgSt); - } @GetMapping ("/getOperationPermissionsByTjNum") @ApiOperation (value = "(鍒濆椤甸潰 鍜� 鍖荤敓椤甸潰)鏍规嵁浣撴鍙疯幏鍙栨槸鍚﹀彲鎿嶄綔鏉冮檺鎺ュ彛 true鍙搷浣� 鍙嶄箣涓嶅彲") diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java index 72aaeed..dc4ea1c 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java @@ -3230,7 +3230,7 @@ wq.eq(TjOrderRemark::getTjNumber, tjNUm); wq.eq(TjOrderRemark::getProId, proId); TjOrderRemark remark = remarkService.getOne(wq); - remark.setType(1); + remark.setType(2); remarkService.updateById(remark); return AjaxResult.success("鎿嶄綔鎴愬姛!"); } diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java index 8d98769..1295071 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java @@ -326,11 +326,11 @@ wqa.eq(TjReport::getType, "浣撴鎶ュ憡"); Integer count = tjReportService.getSelectCount(wqa); if (tjOrder.getReportTime() !=null || count != 0 ) { - tjOrder.setReportTime(null); - tjOrder.setCheckTime(null); - tjOrder.setCheckStatus(0); - tjOrder.setPrintLastTime(null); - tjOrderService.updateById(tjOrder); +// tjOrder.setReportTime(null); +// tjOrder.setCheckTime(null); +// tjOrder.setCheckStatus(0); +// tjOrder.setPrintLastTime(null); +// tjOrderService.updateById(tjOrder); return AjaxResult.error("璇ュ鎴锋姤鍛婂凡鐢熸垚锛佷笉鑳介噸澶嶇敓鎴愶紒鍙洿鎺ラ瑙堟垨鎵撳嵃锛�"); } diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java index d6f599f..8d4ebe0 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java @@ -254,7 +254,8 @@ " a.SENDDOCTOR sqrxm,\n" + " '8001' sqrdm,\n" + " a.AUDITDOCTOR shrxm,\n" + - " '宸插' jybgjg\n" + + " '宸插' jybgjg,\n" + + " SYSDATE() create_time\n" + " \n" + "FROM\n" + " vi_his_patientinfo a\n" + @@ -279,7 +280,8 @@ " NULL shys,\n" + " b.AUDITDOCTOR shysmc,\n" + " NULL tpurl,\n" + - " a.JUDGE ycbz\n" + + " a.JUDGE ycbz,\n" + + " SYSDATE() create_time\n" + "FROM\n" + " vi_his_patientresult a JOIN vi_his_patientinfo b ON b.SAMPLEID=a.SAMPLEID\n" + "WHERE b.HOSPITALID='chkwyy' AND b.PATIENTTYPE=3 AND\n" + @@ -294,8 +296,8 @@ @DataSource(value = DataSourceType.SLAVE_PACS) @Select("SELECT\n" + - " a.HIS_ID tjh,\n" + - " a.HIS_ID tmh,\n" + + " trim(a.HIS_ID) tjh,\n" + + " trim(a.HIS_ID) tmh,\n" + " a.JCLX jclx,\n" + " NULL jczlx,\n" + " a.BGYS bgys,\n" + @@ -303,21 +305,22 @@ " a.SQRJ sqsj,\n" + " a.BGSJ jgsj,\n" + " REPLACE(a.JCMC,'tj_','') jcxmmc,\n" + - " a.JCMCID jcxmid,\n" + + " trim(a.JCMID) jcxmid,\n" + " a.JCBW bw,\n" + " TRIM(a.JCJL) jgzt,\n" + - " TRIM(a.JCSJ) jgbx\n" + + " TRIM(a.JCSJ) jgbx,\n" + + " SYSDATE create_time\n" + " \n" + "FROM\n" + - " ris.V_TJ_JCBGXX_NEWTJ a WHERE a.HIS_ID=#{tjNum}") + " ris.V_TJ_JCBGXX_NEWTJ a WHERE trim(a.HIS_ID)=#{tjNum}") List<LtkjExamJcsqd> getCcXZxYyPacsLtkjExamJcsqd(String tjNum); @DataSource(value = DataSourceType.SLAVE_PACS) @Select(" SELECT\n" + - " a.HIS_ID tjh,\n" + - " a.HIS_ID tmh,\n" + - " a.JCMCID xmdm,\n" + + " trim(a.HIS_ID) tjh,\n" + + " trim(a.HIS_ID) tmh,\n" + + " trim(a.JCMID) xmdm,\n" + " a.JCMC xmmc,\n" + " NULL bg_mig,\n" + " NULL bg_url,\n" + @@ -327,11 +330,55 @@ " TRIM(a.JCJL) yxbx,\n" + " a.BGSJ zdsj,\n" + " a.SQRJ sqsj,\n" + - " a.JCBW jcbw\n" + + " a.JCBW jcbw,\n" + + " SYSDATE create_time\n" + "FROM\n" + " ris.V_TJ_JCBGXX_NEWTJ a WHERE a.HIS_ID=#{tjNum}") List<LtkjExamJcbgd> getCcXZxYyPacsLtkjExamJcbgd(String tjNum); List<List<?>> tjplUpdateDetatilByVi(Map<String,Object> map); + + + @DataSource(value = DataSourceType.SLAVE_PACS) + @Select("SELECT\n" + + " trim(a.HIS_ID) tjh,\n" + + " trim(a.HIS_ID) tmh,\n" + + " a.JCLX jclx,\n" + + " NULL jczlx,\n" + + " a.BGYS bgys,\n" + + " NULL bgysid,\n" + + " a.SQRJ sqsj,\n" + + " a.BGSJ jgsj,\n" + + " REPLACE(a.JCMC,'tj_','') jcxmmc,\n" + + " trim(a.JCMID) jcxmid,\n" + + " a.JCBW bw,\n" + + " TRIM(a.JCJL) jgzt,\n" + + " TRIM(a.JCSJ) jgbx,\n" + + " SYSDATE create_time \n" + + " \n" + + "FROM\n" + + " LTEMR.V_TJ_JCBGXX_NEWTJ a WHERE trim(a.HIS_ID)=#{tjNum}") + List<LtkjExamJcsqd> getCcXZxYyPacsLtkjExamJcsqd1(String tjNum); + + + @DataSource(value = DataSourceType.SLAVE_PACS) + @Select(" SELECT\n" + + " trim(a.HIS_ID) tjh,\n" + + " trim(a.HIS_ID) tmh,\n" + + " trim(a.JCMID) xmdm,\n" + + " a.JCMC xmmc,\n" + + " NULL bg_mig,\n" + + " NULL bg_url,\n" + + " TRIM(a.JCSJ) bg_nr,\n" + + " a.SHYS shysdm,\n" + + " a.SHYS shysxm,\n" + + " TRIM(a.JCJL) yxbx,\n" + + " a.BGSJ zdsj,\n" + + " a.SQRJ sqsj,\n" + + " a.JCBW jcbw,\n" + + " SYSDATE create_time\n" + + "FROM\n" + + " LTEMR.V_TJ_JCBGXX_NEWTJ a WHERE trim(a.HIS_ID)=#{tjNum}") + List<LtkjExamJcbgd> getCcXZxYyPacsLtkjExamJcbgd1(String tjNum); } diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java index fa03a5b..1ef62e1 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java @@ -319,7 +319,7 @@ "WHERE\n" + " a.deleted = 0 \n" + " AND b.org_type = 2 \n" + - " AND a.type !=1") + " AND a.type =0") List<String> getDingShiTongBuJianChaTjNum(); diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java index 2aabdba..637d437 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java @@ -129,8 +129,8 @@ " LEFT JOIN tj_project pro ON re.pro_id = pro.pro_id\n" + " LEFT JOIN sys_user us ON us.user_id = re.doctor_name\n" + " WHERE\n" + - " re.type != 2\n" + - " AND re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%'" + +// " re.type != 2 AND\n" + + " re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%'" + " <when test='sfzpacs == true'> " + " AND dep.org_type = 2"+ " </when>"+ diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java index 12fed30..a317b4c 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java @@ -1,10 +1,17 @@ package com.ltkj.hosp.sqlDomain; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃 @@ -31,4 +38,8 @@ private String zdsj; private String sqsj; private String jcbw; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + private Date createTime; } diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java index 9278fbe..bda5750 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java @@ -1,6 +1,13 @@ package com.ltkj.hosp.sqlDomain; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃 @@ -22,4 +29,8 @@ private String jgzt; private String jgbx; private String jgsj; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + private Date createTime; } diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHybgd.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHybgd.java index b9b289a..d00d6fd 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHybgd.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHybgd.java @@ -1,8 +1,14 @@ package com.ltkj.hosp.sqlDomain; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃 @@ -45,4 +51,8 @@ private String tpurl; @ApiModelProperty(value = "ycbz") private String ycbz; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + private Date createTime; } diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHysqd.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHysqd.java index f4586c2..ccd1881 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHysqd.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHysqd.java @@ -1,8 +1,14 @@ package com.ltkj.hosp.sqlDomain; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃 @@ -41,7 +47,10 @@ private String shrxm; @ApiModelProperty(value = "妫�楠屾姤鍛婄粨鏋�") private String jybgjg; - + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + private Date createTime; } -- Gitblit v1.8.0