Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

common-lib/pom.xml

@@ -16,31 +16,6 @@
    <modules>
        <!--<module>../jolokia-admin</module>&lt;!&ndash;springBoot性能分析项目&ndash;&gt;-->
        <module>../patient-co/patient-co-wlyy</module> <!--i健康-->
        <module>../patient-co/patient-co-wlyy-job</module> <!--i健康 job工程-->
        <module>../patient-co/patient-co-statistics</module> <!--i健康 mysql 版本统计-->
        <!--<module>../patient-co/patient-co-statistics-es</module> &lt;!&ndash;i健康 es 版本统计&ndash;&gt;-->
        <!--<module>../patient-co-figure</module>-->
        <!--对外同步数据的项目-->
        <module>../patient-co-service/wlyy_service</module> <!--其他业务同步-->
        <module>../patient-co-service/wlyy_sign</module> <!--签约同步-->
        <module>../patient-co-service/wlyy_device</module> <!--设备-->
        <!--wlyy后台管理-->
        <module>../patient-co-manage/wlyy-manage</module> <!--i健康后台管理系统-->
        <!--定制化的项目-->
        <module>../patient-co-customization/patient-co-modern-medicine</module><!--中医项目-->
        <!--公共的model-->
        <module>../common/common-entity</module>
    </modules>

patient-co-customization/patient-co-modern-medicine/pom.xml

@@ -4,10 +4,10 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <artifactId>common-lib</artifactId>
        <artifactId>patient-co-lib</artifactId>
        <groupId>com.yihu</groupId>
        <version>1.0.0</version>
        <relativePath>../../common-lib/pom.xml</relativePath>
        <relativePath>../../patient-co-lib/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>

patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/entity/IdEntity.java

@@ -3,7 +3,7 @@
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.mm.entity;
package com.yihu.mm.entity.medicine;
import org.hibernate.annotations.GenericGenerator;
@@ -26,16 +26,16 @@ import java.io.Serializable;
public abstract class IdEntity implements Serializable {
	private static final long serialVersionUID = 3673803562328635206L;
	protected Long id;  // 非业务主键
	protected String id;  // 非业务主键
	@Id
	@GeneratedValue(generator = "uuid")
	@GenericGenerator(name = "uuid", strategy = "uuid")
	public Long getId() {
	public String getId() {
		return id;
	}
	public void setId(Long id) {
	public void setId(String id) {
		this.id = id;
	}
}

patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/entity/medicine/MedicineExaminationAnwser.java

@@ -1,91 +0,0 @@
package com.yihu.mm.entity.medicine;
import com.yihu.mm.entity.IdEntity;
/**
 * Created by Administrator on 2017/8/9.
 */
public class MedicineExaminationAnwser extends IdEntity{
    private String tpId;    //试卷编号
    private String tpName;  //试卷名称
    private Integer tpType; //'问卷类型',1：初筛问卷，2：助理问卷，4：现场问卷
    private String pbId;    //因素编号
    private String pbTitle; //因素题目
    private String pbAlternative;   //备选答案
    private String tpsId;    //试卷因素编号
    private Integer tpsSort;  //排序编号
    private Integer iMultiselect;   //是否多选，1：单选，2：多选
    public String getTpId() {
        return tpId;
    }
    public void setTpId(String tpId) {
        this.tpId = tpId;
    }
    public String getTpName() {
        return tpName;
    }
    public void setTpName(String tpName) {
        this.tpName = tpName;
    }
    public Integer getTpType() {
        return tpType;
    }
    public void setTpType(Integer tpType) {
        this.tpType = tpType;
    }
    public String getPbId() {
        return pbId;
    }
    public void setPbId(String pbId) {
        this.pbId = pbId;
    }
    public String getPbTitle() {
        return pbTitle;
    }
    public void setPbTitle(String pbTitle) {
        this.pbTitle = pbTitle;
    }
    public String getPbAlternative() {
        return pbAlternative;
    }
    public void setPbAlternative(String pbAlternative) {
        this.pbAlternative = pbAlternative;
    }
    public String getTpsId() {
        return tpsId;
    }
    public void setTpsId(String tpsId) {
        this.tpsId = tpsId;
    }
    public Integer getTpsSort() {
        return tpsSort;
    }
    public void setTpsSort(Integer tpsSort) {
        this.tpsSort = tpsSort;
    }
    public Integer getiMultiselect() {
        return iMultiselect;
    }
    public void setiMultiselect(Integer iMultiselect) {
        this.iMultiselect = iMultiselect;
    }
}

patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/entity/medicine/Test.java

@@ -1,22 +0,0 @@
package com.yihu.mm.entity.medicine;
import javax.persistence.*;
/**
 * Created by chenweida on 2017/8/8.
 */
@Entity
@Table(name = "test")
public class Test {
    private Long id;
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
}

patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/entity/medicine/MedicineAnswerLog.java

@@ -1,20 +1,24 @@
package com.yihu.mm.entity.medicine;
package com.yihu.mm.entity.medicine.questionnaire;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.mm.entity.IdEntity;
import com.yihu.mm.entity.medicine.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by Administrator on 2017/8/9.
 */
public class MedicineAnswerLog extends IdEntity{
@Entity
@Table(name = "wlyy_medicine_anwser_log")
public class MedicineAnswerLog extends IdEntity {
    private String patientCode; //客户code
    private String tpId;    //试卷编号
    private String tpName; //试卷名称
    private String pbType;  //问卷类型
    private Date createTime;    //创建时间
    private String remark;      //备注
    private String problems;    //问题的集合
    public String getPatientCode() {
@@ -50,14 +54,6 @@ public class MedicineAnswerLog extends IdEntity{
        this.createTime = createTime;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public String getProblems() {
        return problems;
    }
@@ -65,4 +61,12 @@ public class MedicineAnswerLog extends IdEntity{
    public void setProblems(String problems) {
        this.problems = problems;
    }
    public String getPbType() {
        return pbType;
    }
    public void setPbType(String pbType) {
        this.pbType = pbType;
    }
}

patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/repository/medicine/TestDao.java

@@ -1,10 +0,0 @@
package com.yihu.mm.repository.medicine;
import com.yihu.mm.entity.medicine.Test;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/8/8.
 */
public interface TestDao extends PagingAndSortingRepository<Test, Long> {
}

patient-co-customization/patient-co-modern-medicine/src/main/resources/application.yml

@@ -7,6 +7,9 @@ security:
    username: jkzl
    password: jkzlehr
fastDFS:
  fastdfs_file_url: http://www.xmtyw.cn/
spring:
  datasource:
    medicine:
@@ -86,7 +89,16 @@ spring:
      username: root
      password: 123456
#越人的登录key值
yueren:
  login_key:  aa
  url:  aa
server:
  server_url: http://weixin.xmtyw.cn/wlyy-dev/
---
##开发连测试用这个版本的配置
spring:
  profiles: dev_test
  profiles: dev_test

patient-co-lib/pom.xml

@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <artifactId>wlyy</artifactId>
        <groupId>com.yihu</groupId>
        <version>1.0.0</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>patient-co-lib</artifactId>
    <packaging>pom</packaging>
    <modules>
        <!--<module>../jolokia-admin</module>&lt;!&ndash;springBoot性能分析项目&ndash;&gt;-->
        <module>../patient-co/patient-co-wlyy</module> <!--i健康-->
        <module>../patient-co/patient-co-wlyy-job</module> <!--i健康 job工程-->
        <module>../patient-co/patient-co-statistics</module> <!--i健康 mysql 版本统计-->
        <!--<module>../patient-co/patient-co-statistics-es</module> &lt;!&ndash;i健康 es 版本统计&ndash;&gt;-->
        <!--<module>../patient-co-figure</module>-->
        <!--对外同步数据的项目-->
        <module>../patient-co-service/wlyy_service</module> <!--其他业务同步-->
        <module>../patient-co-service/wlyy_sign</module> <!--签约同步-->
        <module>../patient-co-service/wlyy_device</module> <!--设备-->
        <!--wlyy后台管理-->
        <module>../patient-co-manage/wlyy-manage</module> <!--i健康后台管理系统-->
        <!--定制化的项目-->
        <module>../patient-co-customization/patient-co-modern-medicine</module><!--中医项目-->
    </modules>
</project>

patient-co/patient-co-statistics-es/pom.xml

@@ -2,12 +2,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <parent>
        <artifactId>common-lib</artifactId>
        <artifactId>patient-co-lib</artifactId>
        <groupId>com.yihu</groupId>
        <version>1.0.0</version>
        <relativePath>../../common-lib/pom.xml</relativePath>
        <relativePath>../../patient-co-lib/pom.xml</relativePath>
    </parent>
    <artifactId>patient-co-statistics-es</artifactId>
    <version>1.0.0</version>

patient-co/patient-co-statistics/pom.xml

@@ -2,10 +2,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <parent>
        <artifactId>common-lib</artifactId>
        <artifactId>patient-co-lib</artifactId>
        <groupId>com.yihu</groupId>
        <version>1.0.0</version>
        <relativePath>../../common-lib/pom.xml</relativePath>
        <relativePath>../../patient-co-lib/pom.xml</relativePath>
    </parent>
    <artifactId>patient-co-statistics</artifactId>

patient-co/patient-co-wlyy-job/pom.xml

@@ -4,10 +4,10 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <artifactId>common-lib</artifactId>
        <artifactId>patient-co-lib</artifactId>
        <groupId>com.yihu</groupId>
        <version>1.0.0</version>
        <relativePath>../../common-lib/pom.xml</relativePath>
        <relativePath>../../patient-co-lib/pom.xml</relativePath>
    </parent>

patient-co/patient-co-wlyy/pom.xml

@@ -4,10 +4,10 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <artifactId>common-lib</artifactId>
        <artifactId>patient-co-lib</artifactId>
        <groupId>com.yihu</groupId>
        <version>1.0.0</version>
        <relativePath>../../common-lib/pom.xml</relativePath>
        <relativePath>../../patient-co-lib/pom.xml</relativePath>
    </parent>

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionInfoService.java

@@ -690,6 +690,11 @@ public class PrescriptionInfoService extends BaseService {
        List<Map<String,Object>> states = new ArrayList<>();
        Map<String,Object> map0 = new HashMap<>();
        map0.put("name","续方申请通过");
        map0.put("code",PrescriptionLog.PrescriptionLogStatus.wait_pay.getValue());
        states.add(map0);
        Map<String,Object> map1 = new HashMap<>();
        map1.put("name","订单已支付");
        map1.put("code",PrescriptionLog.PrescriptionLogStatus.pay_success.getValue());
@@ -711,9 +716,9 @@ public class PrescriptionInfoService extends BaseService {
        states.add(map4);
        Map<String,Object> map5 = new HashMap<>();
        map2.put("name","配药完成");
        map2.put("code",PrescriptionLog.PrescriptionLogStatus.finish.getValue());
        states.add(map2);
        map5.put("name","配送完成");
        map5.put("code",PrescriptionLog.PrescriptionLogStatus.finish.getValue());
        states.add(map5);
        //设置配送状态下拉框
        rs.put("states",states);
@@ -778,8 +783,8 @@ public class PrescriptionInfoService extends BaseService {
            param.add("%"+nameKey+"%");
        }
        if(StringUtils.isNotBlank(teamCode)){
            pre_sql.append(" AND p.admin_team_id = ? ");
            param.add("%"+teamCode+"%");
            pre_sql.append(" AND pr.admin_team_id = ? ");
            param.add(teamCode);
        }
        if(StringUtils.isNotBlank(startDate)){
            pre_sql.append(" AND pr.create_time >= ? ");
@@ -815,12 +820,15 @@ public class PrescriptionInfoService extends BaseService {
    }
    public JSONObject getCountExpressage(String teamCode){
        StringBuffer pre_sql = new StringBuffer("SELECT　count(1) AS count FROM  " +
                "  wlyy_prescription pr " +
                "  JOIN wlyy_prescription_expressage e ON pr.code = e.prescription_code " +
                "  WHERE pr.admin_team_id = ? "+
                "  AND pr.dispensary_type =3" +
                "  AND e.expressage_code IS NULL");
        StringBuffer pre_sql = new StringBuffer("SELECT " +
                " count(1) AS count  " +
                " FROM " +
                " wlyy_prescription pr " +
                " JOIN wlyy_prescription_expressage e ON pr. CODE = e.prescription_code  " +
                " WHERE " +
                " pr.admin_team_id = ? " +
                " AND pr.dispensary_type = 3 " +
                " AND e.expressage_code IS NULL");
        List<Map<String,Object>> list = jdbcTemplate.queryForList(pre_sql.toString(),new Object[]{teamCode});
        if(list!=null&&list.size()>0){

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionInfoController.java

@@ -230,7 +230,7 @@ public class PrescriptionInfoController extends BaseController{
                                                  @RequestParam(required = false) @ApiParam(value = "机构", name = "hospital")String hospital,
                                                  @RequestParam(required = false) @ApiParam(value = "配送状态", name = "state")String state,
                                                  @RequestParam(required = false) @ApiParam(value = "配送方式:1 自取 2快递配送 3健管师配送", name = "dispensaryType")String dispensaryType,
                                                  @RequestParam(required = false) @ApiParam(value = "未分配健管师", name = "传1为未分配健管师")String AllocationType,
                                                  @RequestParam(required = false) @ApiParam(value = "传1为未分配健管师", name = "AllocationType")String AllocationType,
                                                  @RequestParam(required = false) @ApiParam(value = "起始页", name = "page")Integer page,
                                                  @RequestParam(required = false) @ApiParam(value = "每页大小", name = "size")Integer size){
        try {
@@ -290,7 +290,7 @@ public class PrescriptionInfoController extends BaseController{
        }
    }
    @RequestMapping(value = "/distributionHealthDoctor", method = RequestMethod.GET)
    @RequestMapping(value = "/distributionHealthDoctor", method = RequestMethod.POST)
    @ApiOperation(value = "配置建管师")
    public String distributionHealthDoctor(@RequestParam(required = true) @ApiParam(value = "续方Code字符串用','分割", name = "codes") String codes,
                                           @RequestParam(required = true) @ApiParam(value = "健康管理师Code", name = "healthDoctor")String healthDoctor){

readme.MD

@@ -1,11 +1,24 @@
common
**根目录的pom是负责放项目中用到的包和版本的**
        
**common-lib**
    公共的模块父类包,maven主要的包在根目录的 pom.xml中
    
**common**
    
    common-entity   i健康公共的实体类
    
jolokia-admin
**patient-co-lib**
    业务模块的公共maven
    
   
**jolokia-admin**
     监控springboot项目的性能
        
patient-co  i健康相关的业务
**patient-co  i健康相关的业务**
   
    patient-co-analysis  数据采集分析项目
        主要功能是监听kafka解析日志并且入库到mongodb
@@ -20,12 +33,9 @@ patient-co  i健康相关的业务
    patient-co-wlyy
        i健康后台项目 包括医生端与患者端
        
        
common-lib
    公共的maven父类包,maven主要的包在根目录的 pom.xml中
    
    
patient-co-service   i健康和外部项目对接的项目
**patient-co-service   i健康和外部项目对接的项目**
    
    wlyy_device  设备数据上传的项目 
    
@@ -33,6 +43,6 @@ patient-co-service   i健康和外部项目对接的项目
    
    wlyy_service 和基卫对接其他业务
 
patient-co-customization  定制化的项目
**patient-co-customization  定制化的项目**
    patient-co-modern-medicine  集美区中医