Merge branch 'dev' of wujunjie/patient-co-management into dev

patient-co/patient-co-doctor-assistant/pom.xml

@@ -438,7 +438,7 @@
        </dependency>
    </dependencies>
    <build>
        <finalName>wlyy</finalName>
        <finalName>assistant</finalName>
        <plugins>
            <!--打成war包需要的配置-->

patient-co/patient-co-doctor-assistant/src/main/java/com/yihu/wlyy/service/app/scheme/DoctorSchemeService.java

@@ -340,7 +340,7 @@ public class DoctorSchemeService {
                    patientSchemeListObj.setSchemecode(schemecode);
                    patientSchemeListObj.setDoctorcode(doctorcode);
                    Short _type = new Short(type);
                    patientSchemeListObj.setType(_type);
                    patientSchemeListObj.setType(Integer.parseInt(type));
                    patientSchemeListObj.setCreateTime(DateUtil.getNowTimestamp());
                    patientSchemeListDao.save(patientSchemeListObj);
                }