Merge remote-tracking branch 'origin/master'

liusheng

8 天以前 42fb200e5c378ab7090e3aa4627faee8912eb67d

 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java

@@ -682,6 +682,8 @@
        serviceSubtask.setSex(patArchive.getSex());
        serviceSubtask.setAge(patArchive.getAge());
        serviceSubtask.setSendstate(2L);
        serviceSubtask.setManagementDoctor(patMedInhosp1.getManagementDoctor());
        serviceSubtask.setManagementDoctorCode(patMedInhosp1.getManagementDoctorCode());
        serviceSubtask.setStarttime(patMedInhosp1.getStarttime());
        serviceSubtask.setEndtime(patMedInhosp1.getEndtime());
        serviceSubtask.setServiceType(serviceTask.getServiceType());