From c27e4ce95a0489907ba3848851f14ac7cca1caca Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 07 十一月 2025 17:43:31 +0800
Subject: [PATCH] 代码提交

---
 /dev/null                                                                               |  251 -----------------------------------------
 smartor/src/main/java/com/smartor/domain/PatBabyGrowth.java                             |   10 +
 smartor/src/main/resources/mapper/smartor/PatBabyGrowthMapper.xml                       |   14 ++
 smartor/src/main/java/com/smartor/service/impl/ExternalInfoServiceImpl.java             |    1 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatBabyGrowthController.java |   40 +++---
 5 files changed, 47 insertions(+), 269 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatBabyGrowthController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatBabyGrowthController.java
index 5ec70ff..a1b247f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatBabyGrowthController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatBabyGrowthController.java
@@ -1,9 +1,16 @@
 package com.ruoyi.web.controller.smartor;
 
+import java.util.Date;
 import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,8 +39,7 @@
 @Api("濠村効鎴愰暱璁板綍")
 @RestController
 @RequestMapping("/smartor/growth")
-public class PatBabyGrowthController extends BaseController
-{
+public class PatBabyGrowthController extends BaseController {
     @Autowired
     private IPatBabyGrowthService patBabyGrowthService;
 
@@ -43,8 +49,7 @@
     @ApiOperation("鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�")
     //@PreAuthorize("@ss.hasPermi('smartor:growth:list')")
     @PostMapping("/list")
-    public TableDataInfo list(@RequestBody PatBabyGrowth patBabyGrowth)
-    {
+    public TableDataInfo list(@RequestBody PatBabyGrowth patBabyGrowth) {
         startPage();
         List<PatBabyGrowth> list = patBabyGrowthService.selectPatBabyGrowthList(patBabyGrowth);
         return getDataTable(list);
@@ -57,8 +62,7 @@
     @ApiOperation("鏌ヨ濠村効鎴愰暱璁板綍鍙�")
     //@PreAuthorize("@ss.hasPermi('smartor:growth:list')")
     @PostMapping("/dateLine")
-    public TableDataInfo dateLine(@RequestBody PatBabyGrowth patBabyGrowth)
-    {
+    public TableDataInfo dateLine(@RequestBody PatBabyGrowth patBabyGrowth) {
         List<PatBabyGrowth> list = patBabyGrowthService.selectPatBabyGrowthList(patBabyGrowth);
         return getDataTable(list);
     }
@@ -70,8 +74,7 @@
     //@PreAuthorize("@ss.hasPermi('smartor:growth:export')")
     @Log(title = "銆愬鍑恒��", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, PatBabyGrowth patBabyGrowth)
-    {
+    public void export(HttpServletResponse response, PatBabyGrowth patBabyGrowth) {
         List<PatBabyGrowth> list = patBabyGrowthService.selectPatBabyGrowthList(patBabyGrowth);
         ExcelUtil<PatBabyGrowth> util = new ExcelUtil<PatBabyGrowth>(PatBabyGrowth.class);
         util.exportExcel(response, list, "濠村効鎴愰暱璁板綍鏁版嵁");
@@ -83,8 +86,7 @@
     @ApiOperation("鑾峰彇濠村効鎴愰暱璁板綍璇︾粏淇℃伅")
     //@PreAuthorize("@ss.hasPermi('smartor:growth:query')")
     @GetMapping(value = "/getInfo/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(patBabyGrowthService.selectPatBabyGrowthById(id));
     }
 
@@ -95,8 +97,10 @@
     //@PreAuthorize("@ss.hasPermi('smartor:growth:add')")
     @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody PatBabyGrowth patBabyGrowth)
-    {
+    public AjaxResult add(@RequestBody PatBabyGrowth patBabyGrowth) {
+        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+        patBabyGrowth.setDoctor(sysUser.getNickName());
+        patBabyGrowth.setDoctorCode(sysUser.getUserName());
         return toAjax(patBabyGrowthService.insertPatBabyGrowth(patBabyGrowth));
     }
 
@@ -107,8 +111,9 @@
     //@PreAuthorize("@ss.hasPermi('smartor:growth:edit')")
     @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody PatBabyGrowth patBabyGrowth)
-    {
+    public AjaxResult edit(@RequestBody PatBabyGrowth patBabyGrowth) {
+        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+        patBabyGrowth.setUpdateBy(sysUser.getNickName());
         return toAjax(patBabyGrowthService.updatePatBabyGrowth(patBabyGrowth));
     }
 
@@ -118,9 +123,8 @@
     @ApiOperation("鍒犻櫎濠村効鎴愰暱璁板綍")
     //@PreAuthorize("@ss.hasPermi('smartor:growth:remove')")
     @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
-	@GetMapping("/remove/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(patBabyGrowthService.deletePatBabyGrowthByIds(ids));
+    @GetMapping("/remove/{id}")
+    public AjaxResult remove(@PathVariable("id") Long id) {
+        return toAjax(patBabyGrowthService.deletePatBabyGrowthById(id));
     }
 }
diff --git a/ruoyi-admin/src/main/resources/application-local.yml b/ruoyi-admin/src/main/resources/application-local.yml
deleted file mode 100644
index fb8579c..0000000
--- a/ruoyi-admin/src/main/resources/application-local.yml
+++ /dev/null
@@ -1,251 +0,0 @@
-# 鏁版嵁婧愰厤缃�
-spring:
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    #    driverClassName: com.mysql.cj.jdbc.Driver
-    druid:
-      # 涓诲簱鏁版嵁婧�
-      master:
-        #        鍏徃
-        #        url: jdbc:mysql://192.168.2.9:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        #        鏂板崕
-        #        url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        #        username: smartor
-        #        password: Smartor.2023
-        #        driverClassName: com.mysql.cj.jdbc.Driver
-        #      鍏徃楂樻柉
-        #        url: jdbc:postgresql://192.168.2.202:15400/smartorwx2
-        #        username: csbsbxt
-        #        password: csbsbxt@123
-        #        driver-class-name: org.postgresql.Driver
-        #      鏈湴楂樻柉
-        url: jdbc:postgresql://127.0.0.1:5432/postgres
-        username: gaussdb
-        password: Ls@123456
-        driver-class-name: org.postgresql.Driver
-        #      楂樻柉鏁版嵁搴撻摼鎺�
-      #        url: jdbc:postgresql://172.20.32.115:15400/smartorwx?prepareThreshold=0
-      #        username: shuifang
-      #        password: Shuifang@51868
-      #        driver-class-name: org.postgresql.Driver
-
-      #        鍏徃浜�
-      #        url: jdbc:mysql://116.62.18.175:6002/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-      #        username: hxsoft
-      #        password: Hxerp2000
-      #        driverClassName: com.mysql.cj.jdbc.Driver
-      # 浠庡簱鏁版嵁婧�
-      slave:
-        # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴(鍏徃)
-        enabled: true
-        #        url: jdbc:oracle:thin:@//172.20.63.110:1521/dbrac
-        url: jdbc:oracle:thin:@//172.20.63.168:1521/dbrac?useUnicode=true&characterEncoding=GBK
-        username: ewell
-        password: ewell
-        driver-class-name: oracle.jdbc.OracleDriver
-      # 鍒濆杩炴帴鏁�
-      initialSize: 5
-      # 鏈�灏忚繛鎺ユ睜鏁伴噺
-      minIdle: 10
-      # 鏈�澶ц繛鎺ユ睜鏁伴噺
-      maxActive: 20
-      # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
-      maxWait: 60000
-      # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
-      timeBetweenEvictionRunsMillis: 60000
-      # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
-      minEvictableIdleTimeMillis: 300000
-      # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
-      maxEvictableIdleTimeMillis: 900000
-      # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
-      #        validationQuery: SELECT 1 FROM DUAL
-      validationQuery:
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      webStatFilter:
-        enabled: true
-      statViewServlet:
-        enabled: false
-        # 璁剧疆鐧藉悕鍗曪紝涓嶅~鍒欏厑璁告墍鏈夎闂�
-        allow:
-        url-pattern: /druid/*
-        # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
-        login-username: lihu
-        login-password: Lihu@1363419#$
-      filter:
-        stat:
-          enabled: true
-          # 鎱QL璁板綍
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
-  # redis 閰嶇疆
-  redis:
-    #    # 鍦板潃锛堟棤閿′汉姘戝尰闄級
-    #    host: 127.0.0.1
-    #    port: 6020
-
-    # 鍦板潃锛堝叕鍙革級
-    host: 127.0.0.1
-    port: 6020
-    # 鏁版嵁搴撶储寮�
-    database: 0
-    # 瀵嗙爜
-    password: Smartor
-    # 杩炴帴瓒呮椂鏃堕棿
-    timeout: 10s
-    lettuce:
-      pool:
-        # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
-        min-idle: 0
-        # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
-        max-idle: 8
-        # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
-        max-active: 8
-        # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
-        max-wait: -1ms
-
-# Swagger閰嶇疆
-swagger:
-  # 鏄惁寮�鍚痵wagger
-  enabled: true
-  # 璇锋眰鍓嶇紑
-  pathMapping: /dev-api
-
-magic-api:
-  web: /magic/web
-  resource:
-    type: database   # 閰嶇疆瀛樺偍鍦ㄦ暟鎹簱涓�
-    tableName: magic_config  # 鏁版嵁搴撲腑鐨勮〃鍚�
-    prefix: /api
-    readonly: false
-  sql-column-case: camel
-  show-sql: true #閰嶇疆鎵撳嵃SQL
-  page-config:
-    size: size
-    page: page
-    default-page: 1
-    default-size: 10
-
-  #寰俊鍏紬鍙风殑瀵嗛挜
-appid: wx1c5243d2337753f4
-appSecret: 84a2186a0d175e88345267c716516cd3
-#绗笁鏂瑰井淇″叕浼楀彿鍙戦�佸湴鍧�锛堟柊鍗庡尰闄級
-thirdWXUrl: http://192.16.4.220:8103/api
-
-#閽夐拤鐨勫瘑閽�
-dingAppid: dingn8iip5ubj7clrrsv
-dingAppSecret: qlEK8D3oOVwGPOTiBQIBYTqQVlAfy9S_qQizEQFjJdSScwemWFryg4gbneu-NqWD
-
-# websocket瓒呮椂鏃堕棿
-server:
-  websocket:
-    timeout=60000:
-
-
-accessKeyId: LTAI5tPfc1VJzz7VuhzcBwug
-accessKeySecret: gG1srKxPFDBNWe2oHfqmK1qsSQkf1e
-signName: 鏉窞鍒╂箹绉戞妧
-
-#鏅鸿兘鍛煎彨(涓婃捣)
-phoneIP: http://124.220.50.51
-phonePort: 8001
-#鏉窞
-hzphoneIP: http://121.43.112.160
-hzphonePort: 8088
-#鐢佃瘽绾胯矾锛�1 涓婃捣锛�2 鏉窞锛�
-phonePath: 2
-#鑷繁鐨勭數璇濆彿鐮�
-phoneMySelf: 83234089
-##鎺堟潈 id(鏉窞)
-#app_id: hzgs
-##鎺堟潈 key(宸插姞瀵嗚繃鐨� key)(鏉窞)
-#app_key: 605453540c4a0a692fe07e1cae1162f3
-#鎺堟潈 id(鏉窞)
-app_id: hz_ali
-#鎺堟潈 key(宸插姞瀵嗚繃鐨� key)(鏉窞)
-app_key: a2f3b5799d635216aa280362fafd8c35
-
-
-pub_key: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALQzqW1EIXBKGMu+2oEYSB5gM7Ox/ihyYTeeoE0yPX1qtt4++5yNOeTBVd6EEM4iKzVEzWj6REIWVwaSNPn/SvUCAwEAAQ==
-#杩欎釜鏄悗绔殑绉侀挜锛岀敤涓嶅埌
-pri_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEAtDOpbUQhcEoYy77agRhIHmAzs7H+KHJhN56gTTI9fWq23j77nI055MFV3oQQziIrNUTNaPpEQhZXBpI0+f9K9QIDAQABAkB3n0fcWfrcoMN/FU3VnrnZOEF6CzFNxkgU9P8y36QECWKZ9JhYQkNpKrMC9oXlN3VSaRigV7B+L/I/a0Rs1W+tAiEA4jx7xcXJ4y4BNwAmVHt6NNiEkzIwWnwC/0qsEu8NsOsCIQDL6MMn1D2uznC6OuOWpxDCkBh1JL1NzZTZeH2G+hj7nwIgKGAC9tjFnvWm4dn0/T7MIIJDpsFeP8fCAS2iZ/6hwuECIAS/eLvWr1EAsZNEh8QcQ8GkBU3E+ztyjAK8UX/xFt/VAiBf79/1tDErX4/DChecM8w3c3DhbBcjuE3fHZn7p6/UKg==
-#鍓嶇绉侀挜锛堢敤涓嶅埌浜嗭級
-#pri_key: MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEApHTIe/StslZAT5Jzv8XClbrqox32pfaTrP5IOCRJ3FaH/UZsGgA/tsNBBEXq9eagqwPbJrjYfpdEtINcChrK4wIDAQABAkEAilDujdKshGGmlUZHs/NQRT6AOdDpsYxBiC4V76IVvQpw0IW6c4HGEvH4T+xRufika7/48L0eu0f06H+YtL5lgQIhANUd0a6oSsVxWifAjtKwMZcXD3OaIxQIQSCN4NT4VFY3AiEAxYxYrIhkIyg+UVw3WOSvBpXKxM4/WL9HRzkxDLvp2rUCIQCK23P8tgCJ5xJT5l3onw6goFDcBKkoazxsBqVgfjENPwIgWbuTd+OIYPPhwsE5ntZZrosSDO2GlsBkFzUiU59z7VUCIA0LL+9IFb+FWCl3DGTwIQ9SZYbv61T83LKjebUcSOfe
-
-#浜岀淮鐮佽矾寰�
-qrpath: D:\qrcode
-
-#鏃犻敗鍐呭閾捐姹侷P鍜岀鍙e彿
-req_path: 8093
-localIP: 127.0.0.1
-#req_path: 8092
-#localIP: http://61.160.111.174
-
-##鏂板崕鍖婚櫌澶栭摼璇锋眰IP鍜岀鍙e彿
-#req_path: 8093
-#localIP: http://218.108.11.22
-
-#鑾峰彇鎮h�呬俊鎭疷RL(鍗庡崜鎻愪緵)
-hosp_info_url: http://esb-core-rest.wowjoy.cn/esb/exchange
-
-# 0浠h〃璧伴粯璁ょ殑涓婁紶    1 浠g爜璧版柊鍗庡尰闄㈢殑涓婁紶
-uploadSwitch: 1
-
-#  鎸囧畾asr鍥炶皟鐨剈rl璺緞(鏈湴)
-ASRCallBackPath: http://192.168.2.13:8095/smartor/serviceSubtask/phoneCallBackYQ
-#鎸傛柇IP(鏈湴)
-hangup: http://192.168.2.13:8091/hangup
-#fs鎵�浣跨敤鐨勯樋閲岀殑app_key(鏈湴)
-app_key_yq: ZurNHpaQLq6P55YS
-
-##  鎸囧畾asr鍥炶皟鐨剈rl璺緞(鏂板崕)
-#ASRCallBackPath: http://192.168.101.135:8095/smartor/serviceSubtask/phoneCallBackYQ
-##鎸傛柇IP(鏂板崕)
-#hangup: http://192.16.4.220:8091/hangup
-##fs鎵�浣跨敤鐨勯樋閲岀殑app_key(鏂板崕)
-#app_key_yq: ZurNHpaQLq6P55YS
-
-#鏈� 鍦� 鐭俊璇锋眰鍦板潃(杩欎釜鏈嶅姟鏄垜浠嚜宸卞啓鐨�)
-#xhsmsPath: http://192.168.2.13:8092/sendSms
-#鏃犻敗鐭俊璇锋眰鍦板潃
-xhsmsPath: http://192.168.144.237/sms/ydsmsend
-##甯愬彿
-xhsmsAccount: 911124
-#鎺ュ彛瀵嗙爜
-xhsmsPwd: zW5eXe
-#铏氭嫙鎺ュ叆鐮�
-xhsmsjrm: 1069055
-
-#鏈湴FTP杩炴帴
-FTP_SERVER: "192.168.2.13"
-FTP_USERNAME: voice
-FTP_PASSWORD: xh@2023
-
-##鏂板崕FTP杩炴帴
-#FTP_SERVER: "192.16.4.220"
-#FTP_USERNAME: voice
-#FTP_PASSWORD: xh@2023
-
-#璇煶鍦板潃璁块棶鍓嶇紑(鏂板崕)
-#voicePathPrefix: http://192.168.191.181:8095/profile/upload/vadio/
-#璇煶鍦板潃璁块棶鍓嶇紑(鍏徃)
-voicePathPrefix: http://192.168.2.13:8095/profile/upload/vadio/
-
-#鍏佽鑷姩鐢熸垚浠诲姟
-createTaskServiceType: 2
-
-#绗釜灏忔椂鐢佃瘽鎷ㄦ墦鐨勪笂闄�
-phoneUpEveryHour: 12
-#鐢佃瘽姣忓ぉ缁撴潫鏃堕棿
-phoneEndHour: 20
-
-#鏂板憳宸ラ粯璁ゅ瘑鐮�
-defaultPwd: 123456
-
-#鏄惁闇�瑕佹牴鎹柧鐥呭缓绔嬪嚭闄㈡偅鑰呴殢璁�
-createIcd10Visit: false
diff --git a/smartor/src/main/java/com/smartor/domain/PatBabyGrowth.java b/smartor/src/main/java/com/smartor/domain/PatBabyGrowth.java
index a56dade..06ecca3 100644
--- a/smartor/src/main/java/com/smartor/domain/PatBabyGrowth.java
+++ b/smartor/src/main/java/com/smartor/domain/PatBabyGrowth.java
@@ -1,10 +1,13 @@
 package com.smartor.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 銆愯濉啓鍔熻兘鍚嶇О銆戝璞� pat_baby_growth
@@ -129,5 +132,12 @@
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String sex;
 
+    /**
+     * 鏂扮敓鍎挎暟鎹棩鏈熸椂闂�
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date generatedTime;
+
+
 }
 
diff --git a/smartor/src/main/java/com/smartor/service/impl/ExternalInfoServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ExternalInfoServiceImpl.java
index dd8f3d2..dcf173e 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ExternalInfoServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ExternalInfoServiceImpl.java
@@ -242,6 +242,7 @@
             patMedInhosp.setInhospno(externalInHospPatientInfo.getZyhm());
             List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList2(patMedInhosp);
             if (CollectionUtils.isNotEmpty(patMedInhospList) && patMedInhospList.size() > 0) {
+                log.error("****patMedInhospList鐨勫�间负锛歿}",patMedInhospList.get(0).getInhospid());
                 continue;
             }
 
diff --git a/smartor/src/main/resources/mapper/smartor/PatBabyGrowthMapper.xml b/smartor/src/main/resources/mapper/smartor/PatBabyGrowthMapper.xml
index 705a150..bb4d206 100644
--- a/smartor/src/main/resources/mapper/smartor/PatBabyGrowthMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatBabyGrowthMapper.xml
@@ -23,12 +23,14 @@
         <result property="updateTime" column="update_time"/>
         <result property="createTime" column="create_time"/>
         <result property="sex" column="sex"/>
+        <result property="generatedTime" column="generated_time"/>
     </resultMap>
 
     <sql id="selectPatBabyGrowthVo">
         select id,
                pat_id,
                height,
+               generated_time,
                sex,
                head_cir,
                weight,
@@ -57,6 +59,9 @@
             </if>
             <if test="sex != null ">
                 and sex = #{sex}
+            </if>
+            <if test="generatedTime != null ">
+                and generated_time = #{generatedTime}
             </if>
             <if test="height != null  and height != ''">
                 and height = #{height}
@@ -146,6 +151,9 @@
             </if>
             <if test="sex != null">sex,
             </if>
+            <if test="generatedTime != null ">
+                generated_time,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},
@@ -183,6 +191,9 @@
             <if test="createTime != null">#{createTime},
             </if>
             <if test="sex != null">#{sex},
+            </if>
+            <if test="generatedTime != null ">
+                #{generatedTime},
             </if>
         </trim>
     </insert>
@@ -241,6 +252,9 @@
             <if test="sex != null">sex =
                 #{sex},
             </if>
+            <if test="generatedTime != null ">
+                generated_time = #{generatedTime},
+            </if>
         </trim>
         where id = #{id}
     </update>

--
Gitblit v1.9.3