Merge branch 'dev' of humingfen/wlyy2.0 into dev

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/specialist/PatientSignInfoVO.java

@@ -20,6 +20,10 @@ public class PatientSignInfoVO {
    private String patient;
    @ApiModelProperty("居民")
    private String patientName;
    @ApiModelProperty("居民身份证")
    private String idcard;
    @ApiModelProperty("居民社保卡号")
    private String ssc;
    @ApiModelProperty("医生code")
    private String doctor;
    @ApiModelProperty("医生")
@@ -195,4 +199,20 @@ public class PatientSignInfoVO {
    public void setHealthAssistantName(String healthAssistantName) {
        this.healthAssistantName = healthAssistantName;
    }
    public String getIdcard() {
        return idcard;
    }
    public void setIdcard(String idcard) {
        this.idcard = idcard;
    }
    public String getSsc() {
        return ssc;
    }
    public void setSsc(String ssc) {
        this.ssc = ssc;
    }
}

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/ActiveRecordService.java

@@ -26,7 +26,7 @@ import java.util.Map;
 **/
@Service
@Transactional
public class ActiveRecordService extends BaseJpaService<ActiveRecordDO,ActiveRecordDO> {
public class ActiveRecordService extends BaseJpaService<ActiveRecordDO, ActiveRecordDao> {
    @Autowired
    private TaskDao taskDao;

svr/svr-wlyy-specialist/pom.xml

@@ -121,6 +121,12 @@
            <artifactId>jxl</artifactId>
            <version>2.6</version>
        </dependency>
        <!--<dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-util</artifactId>
            <version>1.1.0</version>
            <scope>compile</scope>
        </dependency>-->
    </dependencies>
    <build>

svr/svr-wlyy-specialist/src/main/resources/application.yml

@@ -86,6 +86,9 @@ neiwang:
  enable: true
  wlyy: http://localhost:10051/
base:
  url: http://172.17.110.212:10020/
---
spring:
  profiles: jwtest
@@ -104,6 +107,9 @@ fast-dfs:
neiwang:
  enable: false
  wlyy: http://59.61.92.90:10051/
base:
  url: http://172.17.110.212:10020/
---
spring:
  profiles: jwdevtest
@@ -122,6 +128,9 @@ fast-dfs:
neiwang:
  enable: true
  wlyy: http://172.19.103.88:10051/svr-slyy-specialist/
base:
  url: http://172.17.110.212:10020/
---
spring:
  profiles: prod