From f7e4fcb4bea3791de4e123e68a215357bcd14d12 Mon Sep 17 00:00:00 2001 From: lidongliang Date: Tue, 11 May 2021 16:40:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=9D=E8=AF=8A=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E7=8E=B0=E7=97=85=E5=8F=B2=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/pojo/BabyPsychologistModel.java | 26 +++++++++++++++++----- .../operate/web/facade/BabyPsychologistFacade.java | 1 + .../operate/web/facade/BookbuildingFacade.java | 23 ++++++------------- .../web/request/BabyPsychologistRequest.java | 11 +++++++++ 4 files changed, 40 insertions(+), 21 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java index 4cffeab..4084a0e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java @@ -33,7 +33,7 @@ public class BabyPsychologistModel extends BaseModel { /*母亲信息*/ //母亲姓名 - private String mname; + private String mname; //母亲证件号 private String mcertNo; //母亲手机号码 @@ -41,15 +41,15 @@ public class BabyPsychologistModel extends BaseModel { /*儿童信息*/ //儿童姓名 - private String name; + private String name; // 儿童编码格式20200721001 private String encoded; //儿童证件号 - private String certNo; + private String certNo; //儿童性别 - private Integer sex; + private Integer sex; //儿童就诊卡号 - private String vcCardNo; + private String vcCardNo; //儿童社保卡 private String sINCard; //儿童生日 @@ -187,6 +187,9 @@ public class BabyPsychologistModel extends BaseModel { //刺激过低或过高反应 private String cjfy; + //初诊页面的现病史 + private String presentIllness; + public String getCjfy() { return cjfy; } @@ -819,6 +822,19 @@ public class BabyPsychologistModel extends BaseModel { public void setPdyyjl(String pdyyjl) { this.pdyyjl = pdyyjl; } + + public String getPresentIllness() { + return presentIllness; + } + + public void setPresentIllness(String presentIllness) { + this.presentIllness = presentIllness; + } + + public static long getSerialVersionUID() { + return serialVersionUID; + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java index 8fa9fa7..e222746 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java @@ -157,6 +157,7 @@ public class BabyPsychologistFacade extends BaseServiceImpl { model.setAso(request.getAso()); model.setFzOther(request.getFzOther()); model.setCjfy(request.getCjfy()); + model.setPresentIllness(request.getPresentIllness()); return model; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index e47ac69..97cb0df 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -26,8 +26,6 @@ import com.lyms.platform.operate.web.service.ITrackDownService; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.JdbcUtil; import com.lyms.platform.operate.web.worker.BatchUpdateLymsPatient; -import com.lyms.platform.operate.web.worker.CorrectDataWorker; -import com.lyms.platform.operate.web.worker.SyncV2HistoryWorkerx; import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.dao.master.MasterOrganizationMapper; import com.lyms.platform.permission.model.*; @@ -36,11 +34,7 @@ import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; -import com.mongodb.WriteResult; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.dbutils.QueryRunner; -import org.apache.commons.dbutils.handlers.BeanListHandler; -import org.apache.lucene.util.CollectionUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -49,13 +43,8 @@ import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; -import org.springframework.data.mongodb.core.query.Update; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.client.RestTemplate; import org.springframework.web.multipart.MultipartFile; @@ -64,13 +53,15 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.io.OutputStream; -import java.sql.*; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; import java.text.SimpleDateFormat; import java.util.*; -import java.util.Date; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicLong; -import java.util.regex.Pattern; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPsychologistRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPsychologistRequest.java index 38e8e93..bee547c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPsychologistRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPsychologistRequest.java @@ -180,6 +180,9 @@ public class BabyPsychologistRequest { //刺激过低或过高反应 private String cjfy; + //初诊页面的现病史 + private String presentIllness; + public String getCjfy() { return cjfy; } @@ -795,4 +798,12 @@ public class BabyPsychologistRequest { public void setHandlingOpinions(String handlingOpinions) { this.handlingOpinions = handlingOpinions; } + + public String getPresentIllness() { + return presentIllness; + } + + public void setPresentIllness(String presentIllness) { + this.presentIllness = presentIllness; + } } -- 1.8.3.1