diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java index 032657f..9d7ba23 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java @@ -6,6 +6,7 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.mapper.EntityWrapper; diff --git a/parent/center.manager/src/main/resources/rebel.xml b/parent/center.manager/src/main/resources/rebel.xml deleted file mode 100644 index 61021dd..0000000 --- a/parent/center.manager/src/main/resources/rebel.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/parent/hospital.mac/pom.xml b/parent/hospital.mac/pom.xml index 8b4f8c6..0644e4d 100644 --- a/parent/hospital.mac/pom.xml +++ b/parent/hospital.mac/pom.xml @@ -16,6 +16,11 @@ com.lyms + base.common + 1.0 + + + com.lyms core.sdk 1.0 diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.java index a6bed49..f8b7afe 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.java @@ -1,9 +1,11 @@ package com.lyms.hospital.dao.diagnose; +import com.lyms.base.common.entity.conf.HighriskConf; import com.lyms.hospital.entity.diagnose.DiagnoseInfo; import com.baomidou.mybatisplus.mapper.BaseMapper; import org.springframework.stereotype.Repository; import java.io.Serializable; +import java.util.List; /** *

* Mapper接口 @@ -16,5 +18,7 @@ import java.io.Serializable; public interface DiagnoseInfoMapper extends BaseMapper { public Integer deleteLogicById(Serializable id); + + public List getLastHighrisk(Serializable personId); } \ No newline at end of file diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.xml b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.xml index 87d3b9b..278a789 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.xml +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.xml @@ -43,9 +43,24 @@ - + ID AS id, WOMAN_ID AS womanId, TYPE AS type, YUN_NUM AS yunNum, CHAN_NUM AS chanNum, SHUN_NUM AS shunNum, PAO_NUM AS paoNum, LIU_NUM AS liuNum, ZIRAN_NUM AS ziranNum, RENGONG_NUM AS rengongNum, SITAI_NUM AS sitaiNum, SICHAN_NUM AS sichanNum, CHILDDIE_NUM AS childdieNum, BIRTHDEFECT_NUM AS birthdefectNum, HEIGHT AS height, WEIGHT AS weight, HEIGHT_AGO AS heightAgo, WEIGHT_INDEX AS weightIndex, BLOOD_SHRINK AS bloodShrink, BLOOD_DIASTOLE AS bloodDiastole, HEART AS heart, LUNG AS lung, WAIYIN_WOMAN AS waiyinWoman, YINDAO_WOMAN AS yindaoWoman, GONGJING_WOMAN AS gongjingWoman, ZIGONG_WOMAN AS zigongWoman, FUJIAN_WOMAN AS fujianWoman, GONGGAO_OBSTETRICS AS gonggaoObstetrics, FUWEI_OBSTETRICS AS fuweiObstetrics, FUZHONG_OBSTETRICS AS fuzhongObstetrics, TAISHU_OBSTETRICS AS taishuObstetrics, DISPOSE_SUGGEST AS disposeSuggest, GUIDE_SUGGEST AS guideSuggest, NEXTINSPECT_NUM AS nextinspectNum, NEXTINSPECT_TIME AS nextinspectTime, DOCTOR_ID AS doctorId, ORG_ID AS orgId, DIAGNOSE_TIME AS diagnoseTime + + + diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/diagnose/DiagnoseInfo.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/diagnose/DiagnoseInfo.java index 501568e..d2d8527 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/diagnose/DiagnoseInfo.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/diagnose/DiagnoseInfo.java @@ -25,6 +25,8 @@ public class DiagnoseInfo implements Serializable { */ @TableId(value = "ID") private String id; + @TableField(value = "PERSON_ID") + private String persionId; /** * */ @@ -175,6 +177,19 @@ public class DiagnoseInfo implements Serializable { */ @TableField(value = "TAISHU_OBSTETRICS") private Integer taishuObstetrics; + + @TableField(value = "HAS_HIGHRISK") + private Integer hasHighrisk; + @TableField(value = "CUS_HR_COLORCODE") + private String cusHrColorcode; + @TableField(value = "CUS_HR_COLORTEXT") + private String cusHrColortext; + @TableField(value = "CUS_HR_NAME") + private String cusHrName; + @TableField(value = "CUS_HR_GRADE") + private String cusHrGrade; + @TableField(value = "HAS_DIAGNOSE") + private Integer hasDiagnose; /** * 处理意见 */ @@ -515,4 +530,63 @@ public class DiagnoseInfo implements Serializable { this.diagnoseTime = diagnoseTime; } + public String getPersionId() { + return persionId; + } + + public void setPersionId(String persionId) { + this.persionId = persionId; + } + + public Integer getHasHighrisk() { + return hasHighrisk; + } + + public void setHasHighrisk(Integer hasHighrisk) { + this.hasHighrisk = hasHighrisk; + } + + public Integer getHasDiagnose() { + return hasDiagnose; + } + + public void setHasDiagnose(Integer hasDiagnose) { + this.hasDiagnose = hasDiagnose; + } + + public String getCusHrColorcode() { + return cusHrColorcode; + } + + public void setCusHrColorcode(String cusHrColorcode) { + this.cusHrColorcode = cusHrColorcode; + } + + public String getCusHrColortext() { + return cusHrColortext; + } + + public void setCusHrColortext(String cusHrColortext) { + this.cusHrColortext = cusHrColortext; + } + + public String getCusHrName() { + return cusHrName; + } + + public void setCusHrName(String cusHrName) { + this.cusHrName = cusHrName; + } + + public String getCusHrGrade() { + return cusHrGrade; + } + + public void setCusHrGrade(String cusHrGrade) { + this.cusHrGrade = cusHrGrade; + } + + + + } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java index 0a3be46..1cbfb8d 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java @@ -1,8 +1,10 @@ package com.lyms.hospital.service.diagnose; +import com.lyms.base.common.entity.conf.HighriskConf; import com.lyms.hospital.entity.diagnose.DiagnoseInfo; import com.lyms.web.service.BaseService; import java.io.Serializable; +import java.util.List; /** *

@@ -14,11 +16,22 @@ import java.io.Serializable; */ public interface DiagnoseInfoService extends BaseService { - /** + /** *

  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 *
  • @param id 删除主键id *
  • @return 大于0修改成功，否则为失败 */ - public Integer deleteLogicById(Serializable id); - + public Integer deleteLogicById(Serializable id); + + /** + *
  • @Description:根据居民ID获取末次高危 + *
  • @param personId 居民ID + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年4月25日 + *
  • 修改人： + *
  • 修改时间： + */ + public List getLastHighrisk(Serializable personId); + } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java index 11ceb01..e04aea5 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.lyms.base.common.entity.conf.HighriskConf; import com.lyms.hospital.dao.diagnose.DiagnoseInfoMapper; import com.lyms.hospital.entity.assist.DiagnoseAssit; import com.lyms.hospital.entity.diagnose.DiagnoseInfo; @@ -102,4 +103,9 @@ public class DiagnoseInfoServiceImpl extends ServiceImpl getLastHighrisk(Serializable personId) { + return baseMapper.getLastHighrisk(personId); + } } \ No newline at end of file diff --git a/parent/hospital.web/src/test/java/test/hospital/diagnose/DiagnoseMapsTest.java b/parent/hospital.web/src/test/java/test/hospital/diagnose/DiagnoseMapsTest.java index c6e5eee..1ffa032 100644 --- a/parent/hospital.web/src/test/java/test/hospital/diagnose/DiagnoseMapsTest.java +++ b/parent/hospital.web/src/test/java/test/hospital/diagnose/DiagnoseMapsTest.java @@ -5,6 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.lyms.base.common.entity.conf.DiagnoseMaps; import com.lyms.base.common.service.conf.DiagnoseMapsService; +import com.lyms.hospital.service.diagnose.DiagnoseInfoService; import com.lyms.util.StrUtils; import test.hospital.BaseServiceTest; @@ -14,6 +15,9 @@ public class DiagnoseMapsTest extends BaseServiceTest{ @Autowired private DiagnoseMapsService diagnoseMapsService; + @Autowired + private DiagnoseInfoService diagnoseInfoService; + /** *
  • @Description:根据诊断id获取所有诊断项 *
  • @@ -35,4 +39,9 @@ public class DiagnoseMapsTest extends BaseServiceTest{ entity.setSourceId("123"); diagnoseMapsService.insert(entity); } + + @Test + public void getLastHighrisk(){ + outJson(diagnoseInfoService.getLastHighrisk("1")); + } } diff --git a/parent/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java b/parent/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java index 633e6e4..9043173 100644 --- a/parent/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java +++ b/parent/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java @@ -44,16 +44,16 @@ public class MysqlGenerator { private static void customSet(GlobalConfig gc, StrategyConfig strategy, PackageConfig pc) { gc.setOutputDir("D://mybatis-plus-generate"); - gc.setAuthor("xujiahong"); + gc.setAuthor("fangcheng"); // strategy.setInclude(new String[] { // "SYS_USERS","SYS_USER_ROLE_MAPS","SYS_ROLES" }); // 需要生成的表 - strategy.setInclude(new String[] { "WOMAN_FOLIC_ACID"}); // 需要生成的表 - pc.setParent("com.lyms.hospital"); -// pc.setParent("com.lyms.base.common"); + strategy.setInclude(new String[] { "SYS_USER_DATA_PERMISSIONS"}); // 需要生成的表 +// pc.setParent("com.lyms.hospital"); + pc.setParent("com.lyms.base.common"); // 加在controller后面 - pc.setFunctionName("woman"); // com.lyms.hospital.web.controller.sys + pc.setFunctionName("user"); // com.lyms.hospital.web.controller.sys // pc.setModuleName("sys"); //com.lyms.hospital.sys.controller // 加在controller前面 @@ -103,9 +103,9 @@ public class MysqlGenerator { DataSourceConfig dsc = new DataSourceConfig(); dsc.setDbType(DbType.MYSQL); dsc.setDriverName("com.mysql.jdbc.Driver"); - dsc.setUsername("hospital"); + dsc.setUsername("center"); dsc.setPassword("lyms2015"); - dsc.setUrl("jdbc:mysql://119.90.57.26:3306/hospital?characterEncoding=utf8"); + dsc.setUrl("jdbc:mysql://119.90.57.26:3306/center?characterEncoding=utf8"); mpg.setDataSource(dsc); // 策略配置