diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganizationsService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganizationsService.java
index 695d39f..3c66a75 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganizationsService.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganizationsService.java
@@ -1,6 +1,7 @@
package com.lyms.base.common.service.organ;
import java.io.Serializable;
+import java.util.List;
import com.baomidou.mybatisplus.plugins.Page;
import com.lyms.base.common.entity.organ.Organizations;
@@ -83,5 +84,16 @@ public interface OrganizationsService extends BaseService {
* 修改时间:
*/
public String getNameById(String id);
+
+ /**
+ * @Description:通过名称模糊查询医院列表
+ * @param name
+ * @return
+ * 创建人:xujiahong
+ * 创建时间:2017年5月15日
+ * 修改人:
+ * 修改时间:
+ */
+ public List selectListByName(String name);
}
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganizationsServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganizationsServiceImpl.java
index f809f31..baaeef1 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganizationsServiceImpl.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganizationsServiceImpl.java
@@ -1,11 +1,14 @@
package com.lyms.base.common.service.organ.impl;
import java.io.Serializable;
+import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.lyms.base.common.dao.organ.OrganizationsMapper;
@@ -84,4 +87,15 @@ public class OrganizationsServiceImpl extends ServiceImpl selectListByName(String name) {
+ if(StringUtils.isEmpty(name)){
+ return null;
+ }
+ EntityWrapper ew = new EntityWrapper();
+ ew.where("1=1");
+ ew.like("NAME", name);
+ return this.selectList(ew);
+ }
+
}
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/childbirth/impl/ChildbirthNewbornServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/childbirth/impl/ChildbirthNewbornServiceImpl.java
index 5b69ea1..f6e337d 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/childbirth/impl/ChildbirthNewbornServiceImpl.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/childbirth/impl/ChildbirthNewbornServiceImpl.java
@@ -71,8 +71,8 @@ public class ChildbirthNewbornServiceImpl extends ServiceImpl listByCid(String cid) {
EntityWrapper wrapper = new EntityWrapper();
- wrapper.eq("CID", cid);
- wrapper.eq("IF_DEL", IfdelEnum.NO.getStatus());//只查询没有被软删除的项目
+ wrapper.where("CID={0}", cid);
+ wrapper.and("IF_DEL={0}", IfdelEnum.NO.getStatus());//只查询没有被软删除的项目
return baseMapper.selectList(wrapper);
}
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/childbirth/impl/ChildbirthTaiServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/childbirth/impl/ChildbirthTaiServiceImpl.java
index d5ab516..bcda60c 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/childbirth/impl/ChildbirthTaiServiceImpl.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/childbirth/impl/ChildbirthTaiServiceImpl.java
@@ -49,8 +49,8 @@ public class ChildbirthTaiServiceImpl extends ServiceImpl listByCid(String cid) {
EntityWrapper wrapper = new EntityWrapper<>();
- wrapper.eq("CID", cid);
- wrapper.eq("IF_DEL", IfdelEnum.NO.getStatus());//只查询没有被软删除的项目
+ wrapper.where("CID={0}", cid);
+ wrapper.and("IF_DEL={0}", IfdelEnum.NO.getStatus());//只查询没有被软删除的项目
return baseMapper.selectList(wrapper);
}
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/childbirth/impl/ChildbirthTaipanServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/childbirth/impl/ChildbirthTaipanServiceImpl.java
index 45b62d1..5d29805 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/childbirth/impl/ChildbirthTaipanServiceImpl.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/childbirth/impl/ChildbirthTaipanServiceImpl.java
@@ -49,8 +49,8 @@ public class ChildbirthTaipanServiceImpl extends ServiceImpl listByCid(String cid) {
EntityWrapper wrapper = new EntityWrapper<>();
- wrapper.eq("CID", cid);
- wrapper.eq("IF_DEL", IfdelEnum.NO.getStatus());//只查询没有被软删除的项目
+ wrapper.where("CID={0}", cid);
+ wrapper.and("IF_DEL={0}", IfdelEnum.NO.getStatus());//只查询没有被软删除的项目
return baseMapper.selectList(wrapper);
}
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/impl/WomanFetationRecordServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/impl/WomanFetationRecordServiceImpl.java
index 091df1c..509234a 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/impl/WomanFetationRecordServiceImpl.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/impl/WomanFetationRecordServiceImpl.java
@@ -323,21 +323,21 @@ public class WomanFetationRecordServiceImpl extends ServiceImpl highriskConfList = diagnoseInfoService.getLastHighrisk(dbFetationRecord.getWomanPersonId());
-// if(highriskConfList!=null && !highriskConfList.isEmpty()){
-// for(HighriskConf hc : highriskConfList){
-// Map map = new HashMap<>();
-// map.put("id", hc.getId());
-// map.put("name", hc.getName());
-// map.put("color", hc.getColortext());
-// map.put("code", hc.getColorcode());
-// riskFactor.add(map);
-// if(hc.getGrade()!=null){
-// BigDecimal big = new BigDecimal(hc.getGrade());
-// riskScore = riskScore.add(big);
-// }
-// }
-// }
+ List highriskConfList = diagnoseInfoService.getLastHighrisk(dbFetationRecord.getWomanPersonId());
+ if(highriskConfList!=null && !highriskConfList.isEmpty()){
+ for(HighriskConf hc : highriskConfList){
+ Map map = new HashMap<>();
+ map.put("id", hc.getId());
+ map.put("name", hc.getName());
+ map.put("color", hc.getColortext());
+ map.put("code", hc.getColorcode());
+ riskFactor.add(map);
+ if(hc.getGrade()!=null){
+ BigDecimal big = new BigDecimal(hc.getGrade());
+ riskScore = riskScore.add(big);
+ }
+ }
+ }
dataMap.put("riskFactor", riskFactor);//高危因素列表
dataMap.put("riskScore", riskScore.toString());// 高危评分
diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/CommonApiController.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/CommonApiController.java
index 6f8562a..e957d1f 100644
--- a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/CommonApiController.java
+++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/CommonApiController.java
@@ -12,7 +12,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
+import com.lyms.base.common.entity.organ.Organizations;
import com.lyms.base.common.entity.region.Regions;
+import com.lyms.base.common.service.organ.OrganizationsService;
import com.lyms.base.common.service.region.RegionsService;
import com.lyms.hospital.entity.history.HistorySource;
import com.lyms.hospital.enums.business.ServiceStatusEnums;
@@ -27,10 +29,11 @@ import com.lyms.web.controller.BaseController;
* 公用接口-前端控制器
*
*
- * []查询病史配置
- * 查询省市区数据
- * 查询字典数据
+ * []查询病史配置
+ * 查询省市区数据
+ * 查询字典数据
* []获取当前服务器时间
+ * []获取医院数据
*
* @author xujiahong
* @since 2017-04-21
@@ -43,6 +46,33 @@ public class CommonApiController extends BaseController {
private RegionsService regionService;
@Autowired
private HistorySourceService historySourceService;
+ @Autowired
+ private OrganizationsService orgService;
+
+ /**
+ * @Description:获取医院数据
+ * @param name
+ * @return
+ * 创建人:xujiahong
+ * 创建时间:2017年5月15日
+ * 修改人:
+ * 修改时间:
+ */
+ @RequestMapping(value = "/queryHospitals", method = RequestMethod.GET)
+ @ResponseBody
+ public AjaxResult queryHospital(String name) {
+ List list = orgService.selectListByName(name);
+ List