jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 035e13520e7d6546ad88a421651673bf298d8783

Authored by liquanyu
2 parents 427385497f 54461f2718
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyHisService.java View file @ 035e135
... ... @@ -4,6 +4,7 @@
4 4 import com.lyms.platform.common.utils.DateUtil;
5 5 import com.lyms.platform.common.utils.ExceptionUtils;
6 6 import com.lyms.platform.pojo.LisReport;
  7 +import com.lyms.platform.permission.model.LisReportModel;
7 8 import com.lyms.platform.pojo.LisReportItem;
8 9 import org.apache.commons.collections.CollectionUtils;
9 10 import org.apache.commons.dbutils.DbUtils;
10 11  
11 12  
12 13  
13 14  
14 15  
15 16  
16 17  
... ... @@ -237,30 +238,31 @@
237 238 Connection conn = com.lyms.hospitalapi.dzfy.ConnTools.makeHisConnection();
238 239 QueryRunner queryRunner = new QueryRunner(true);
239 240 try {
240   - String sql = "select TYPE as classifyName,NAME as name,LIS_ID as hospitalId,BHNUM as patientHid,VCCARDNO as vcCardNo,SEX as sex,to_number(replace(AGE,'岁') ) as age,APPLY_DEPT as deptName,APPLY_DOCTOR as applyDoctorName,CHECKER as checkDoctorName,PUBLISH_TIME as publishTime from zlhis.lis_report_info where VCCARDNO ='"+cardNo+"' order by LIS_ID desc";
  241 + String sql = "select LIS_ID as lisId,TITLE as title,TYPE as type,VCCARDNO as vcCardNo, NAME as name,BHNUM as bhnum,SEX as sex,to_number(replace(AGE,'岁') ) as age,APPLY_TIME as applyTime,CHECK_TIME as checkTime,PUBLISH_TIME as publishTime,APPLY_DOCTOR as applyDoctor,APPLY_DEPT as applyDept,CHECKER as checker,MODIFIED as modified,CREATED as created from zlhis.lis_report_info where VCCARDNO ='"+cardNo+"' order by LIS_ID desc";
241 242 String subSql = "select LIS_ID as id,CODE as code,NAME as name,RESULT as result,RESULT_FLAG as flag,REF as ref,UNIT as unit,RESULT_TYPE as resultType from zlhis.lis_report_item where LIS_ID='";
242   - List<LisReport> lisReportList = queryRunner.query(conn, sql, new BeanListHandler<LisReport>(LisReport.class));
  243 + List<LisReportModel> lisReportList = queryRunner.query(conn, sql, new BeanListHandler<LisReportModel>(LisReportModel.class));
243 244 List<LisCheckInfo> list = new ArrayList<>();
244 245 if (lisReportList.size() > 0) {
245   - for (LisReport lisReport:lisReportList) {
  246 + for (LisReportModel lisReportModel:lisReportList) {
246 247 // hospitalId为申请号
247   - if (StringUtils.isNotBlank(lisReport.getHospitalId())) {
248   - List<LisReportItem> lisReportItemList = queryRunner.query(conn, subSql+lisReport.getHospitalId()+"'", new BeanListHandler<LisReportItem>(LisReportItem.class));
  248 + if (StringUtils.isNotBlank(lisReportModel.getLisId())) {
  249 + List<LisReportItem> lisReportItemList = queryRunner.query(conn, subSql+lisReportModel.getLisId()+"'", new BeanListHandler<LisReportItem>(LisReportItem.class));
249 250 if (lisReportItemList != null && lisReportItemList.size() > 0) {
250 251 CheckResponse check = new CheckResponse();
251   - check.setModified(lisReport.getPublishTime());
  252 + check.setModified(lisReportModel.getPublishTime());
252 253 check.setType(1);
253   - check.setName(lisReport.getName());
254   - check.setTitle(lisReport.getClassifyName());
  254 + check.setName(lisReportModel.getName());
  255 + check.setTitle(lisReportModel.getTitle());
255 256 check.setHospitalName("德州市妇幼保健院");//新增医院名称字段赋值
256   - if (lisReport.getAge() != null) {
257   - check.setAge(lisReport.getAge().toString());
  257 + if (lisReportModel.getAge() != null) {
  258 + check.setAge(lisReportModel.getAge());
258 259 }
259   - check.setApplyDate(lisReport.getPublishTime());
260   - check.setApplyDateStr(DateUtil.getyyyy_MM_dd(lisReport.getPublishTime()));
261   - check.setCheckDept(lisReport.getDeptName());
262   - check.setDoctor(lisReport.getApplyDoctorName());
263   - check.setSex(lisReport.getSex());
  260 + check.setApplyDate(lisReportModel.getApplyTime());
  261 + check.setApplyDateStr(DateUtil.getyyyy_MM_dd(lisReportModel.getApplyTime()));
  262 + check.setCheckDept(lisReportModel.getApplyDept());
  263 + check.setDoctor(lisReportModel.getApplyDoctor());
  264 + check.setSex(lisReportModel.getSex());
  265 + check.setModified(lisReportModel.getModified());
264 266 List<CheckItemResponse> itemList = new ArrayList<>();
265 267 check.setItemList(itemList);
266 268 for (LisReportItem checkItem:lisReportItemList) {